From 4cf1f032ba2fdb26f8419f8c5ae4762214e0da6c Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: [PATCH] Move single `LAYOUT`s to data driven (#20365) --- keyboards/25keys/aleth42/info.json | 47 -- keyboards/25keys/aleth42/rev0/info.json | 53 +- keyboards/25keys/aleth42/rev0/rev0.h | 54 -- keyboards/25keys/aleth42/rev1/info.json | 53 +- keyboards/25keys/aleth42/rev1/rev1.h | 54 -- keyboards/30wer/30wer.h | 14 - keyboards/30wer/info.json | 78 +- keyboards/3w6/info.json | 49 -- keyboards/3w6/rev1/info.json | 51 +- keyboards/3w6/rev1/rev1.h | 44 -- keyboards/3w6/rev2/info.json | 51 +- keyboards/3w6/rev2/rev2.c | 2 +- keyboards/3w6/rev2/rev2.h | 44 -- .../40percentclub/half_n_half/half_n_half.h | 26 - keyboards/40percentclub/half_n_half/info.json | 94 +-- .../4pplet/eagle_viper_rep/rev_b/info.json | 74 +- .../4pplet/eagle_viper_rep/rev_b/rev_b.h | 20 - keyboards/4pplet/waffling60/rev_a/info.json | 73 +- keyboards/4pplet/waffling60/rev_a/rev_a.h | 36 - keyboards/4pplet/waffling60/rev_b/info.json | 73 +- keyboards/4pplet/waffling60/rev_b/rev_b.h | 15 - keyboards/4pplet/waffling60/rev_c/info.json | 73 +- keyboards/4pplet/waffling60/rev_c/rev_c.h | 15 - keyboards/4pplet/waffling60/rev_d/info.json | 74 +- keyboards/4pplet/waffling60/rev_d/rev_d.h | 15 - .../4pplet/waffling60/rev_d_ansi/info.json | 71 +- .../4pplet/waffling60/rev_d_ansi/rev_d_ansi.c | 17 - .../4pplet/waffling60/rev_d_ansi/rev_d_ansi.h | 35 - .../4pplet/waffling60/rev_d_iso/info.json | 72 +- .../4pplet/waffling60/rev_d_iso/rev_d_iso.c | 17 - .../4pplet/waffling60/rev_d_iso/rev_d_iso.h | 35 - keyboards/abacus/abacus.h | 41 -- keyboards/abacus/info.json | 90 +-- keyboards/acheron/elongate/beta/beta.h | 44 -- keyboards/acheron/elongate/beta/info.json | 117 +-- keyboards/ada/ada1800mini/ada1800mini.h | 38 - keyboards/ada/ada1800mini/info.json | 153 ++-- keyboards/ada/infinity81/infinity81.h | 30 - keyboards/ada/infinity81/info.json | 168 ++--- keyboards/adelheid/adelheid.h | 45 -- keyboards/adelheid/info.json | 169 ++--- keyboards/adm42/adm42.h | 31 - keyboards/adm42/info.json | 88 +-- keyboards/adpenrose/kintsugi/info.json | 130 ++-- keyboards/adpenrose/kintsugi/kintsugi.c | 2 +- keyboards/adpenrose/kintsugi/kintsugi.h | 46 -- keyboards/afternoonlabs/breeze/rev0/info.json | 141 ++-- keyboards/afternoonlabs/breeze/rev0/rev0.h | 39 - keyboards/afternoonlabs/breeze/rev1/info.json | 141 ++-- keyboards/afternoonlabs/breeze/rev1/rev1.h | 39 - .../afternoonlabs/oceanbreeze/rev1/info.json | 147 ++-- .../afternoonlabs/oceanbreeze/rev1/rev1.h | 42 -- .../southern_breeze/rev1/info.json | 141 ++-- .../afternoonlabs/southern_breeze/rev1/rev1.h | 39 - .../summer_breeze/rev1/info.json | 173 ++--- .../afternoonlabs/summer_breeze/rev1/rev1.h | 39 - keyboards/ai03/jp60/info.json | 399 ++--------- keyboards/ai03/jp60/jp60.h | 42 -- keyboards/ai03/lunar/info.json | 144 ++-- keyboards/ai03/lunar/lunar.h | 41 -- keyboards/ai03/orbit/info.json | 138 ++-- keyboards/ai03/orbit/orbit.h | 29 - keyboards/ai03/orbit_x/info.json | 103 +-- keyboards/ai03/orbit_x/orbit_x.h | 44 -- keyboards/ai03/quasar/info.json | 183 ++--- keyboards/ai03/quasar/quasar.h | 45 -- keyboards/ai03/voyager60_alps/info.json | 73 +- .../ai03/voyager60_alps/voyager60_alps.h | 32 - keyboards/akb/eb46/eb46.h | 40 -- keyboards/akb/eb46/info.json | 99 +-- keyboards/akb/raine/info.json | 159 +++-- keyboards/akb/raine/raine.h | 33 - keyboards/aleblazer/zodiark/info.json | 151 ++-- keyboards/aleblazer/zodiark/zodiark.c | 2 +- keyboards/aleblazer/zodiark/zodiark.h | 38 - keyboards/alf/x11/info.json | 179 ++--- keyboards/alf/x11/x11.h | 43 -- keyboards/alpha/alpha.h | 15 - keyboards/alpha/info.json | 33 +- keyboards/alpine65/alpine65.h | 36 - keyboards/alpine65/info.json | 138 ++-- keyboards/amjkeyboard/amj84/amj84.h | 30 - keyboards/amjkeyboard/amj84/info.json | 177 ++--- keyboards/arabica37/rev1/info.json | 89 +-- keyboards/arabica37/rev1/rev1.h | 21 - keyboards/arisu/arisu.h | 42 -- keyboards/arisu/info.json | 143 ++-- keyboards/at_at/660m/660m.c | 2 +- keyboards/at_at/660m/660m.h | 19 - keyboards/at_at/660m/info.json | 77 +- keyboards/atlantis/ak81_ve/ak81_ve.c | 2 +- keyboards/atlantis/ak81_ve/ak81_ve.h | 34 - keyboards/atlantis/ak81_ve/info.json | 177 ++--- keyboards/atlas_65/atlas_65.h | 50 -- keyboards/atlas_65/info.json | 142 ++-- keyboards/atreus62/atreus62.h | 21 - keyboards/atreus62/info.json | 74 +- keyboards/atreyu/rev1/info.json | 129 ++-- keyboards/atreyu/rev1/rev1.c | 2 +- keyboards/atreyu/rev1/rev1.h | 40 -- keyboards/atreyu/rev2/info.json | 129 ++-- keyboards/atreyu/rev2/rev2.c | 2 +- keyboards/atreyu/rev2/rev2.h | 40 -- keyboards/avalanche/v1/info.json | 129 ++-- keyboards/avalanche/v1/v1.h | 29 - keyboards/avalanche/v2/info.json | 133 ++-- keyboards/avalanche/v2/v2.h | 29 - keyboards/avalanche/v3/info.json | 133 ++-- keyboards/avalanche/v3/v3.h | 29 - keyboards/avalanche/v4/info.json | 133 ++-- keyboards/avalanche/v4/v4.c | 2 +- keyboards/avalanche/v4/v4.h | 29 - keyboards/axolstudio/yeti/hotswap/hotswap.c | 2 +- keyboards/axolstudio/yeti/hotswap/hotswap.h | 35 - keyboards/axolstudio/yeti/hotswap/info.json | 132 ++-- keyboards/aya/aya.h | 39 - keyboards/aya/info.json | 77 +- keyboards/b_sides/rev41lp/info.json | 82 +-- keyboards/b_sides/rev41lp/rev41lp.h | 35 - keyboards/bandominedoni/bandominedoni.h | 40 -- keyboards/bandominedoni/info.json | 154 ++-- keyboards/bantam44/bantam44.h | 21 - keyboards/bantam44/info.json | 50 +- keyboards/basekeys/trifecta/info.json | 88 ++- keyboards/basekeys/trifecta/trifecta.c | 2 +- keyboards/basekeys/trifecta/trifecta.h | 48 -- keyboards/bastardkb/charybdis/3x5/3x5.c | 2 +- keyboards/bastardkb/charybdis/3x5/3x5.h | 40 -- keyboards/bastardkb/charybdis/3x5/info.json | 77 +- keyboards/bastardkb/charybdis/3x6/3x6.c | 2 +- keyboards/bastardkb/charybdis/3x6/3x6.h | 39 - keyboards/bastardkb/charybdis/3x6/info.json | 91 +-- keyboards/bastardkb/charybdis/4x6/4x6.c | 2 +- keyboards/bastardkb/charybdis/4x6/4x6.h | 44 -- keyboards/bastardkb/charybdis/4x6/info.json | 123 ++-- keyboards/bastardkb/charybdis/charybdis.h | 12 - keyboards/blank_tehnologii/manibus/info.json | 124 ++-- keyboards/blank_tehnologii/manibus/manibus.h | 47 -- keyboards/blockboy/ac980mini/ac980mini.c | 2 +- keyboards/blockboy/ac980mini/ac980mini.h | 35 - keyboards/blockboy/ac980mini/info.json | 177 ++--- .../ac980mini/keymaps/default/keymap.c | 8 +- .../blockboy/ac980mini/keymaps/via/keymap.c | 10 +- keyboards/blockey/blockey.h | 45 -- keyboards/blockey/info.json | 69 +- keyboards/bop/bop.h | 35 - keyboards/bop/info.json | 248 +++---- keyboards/box75/box75.h | 38 - keyboards/box75/info.json | 189 ++--- keyboards/bpiphany/hid_liber/hid_liber.h | 70 -- keyboards/bpiphany/hid_liber/info.json | 189 ++--- keyboards/bubble75/hotswap/hotswap.c | 3 +- keyboards/bubble75/hotswap/hotswap.h | 35 - keyboards/bubble75/hotswap/info.json | 173 ++--- keyboards/canary/canary60rgb/canary60rgb.c | 2 +- keyboards/canary/canary60rgb/canary60rgb.h | 34 - keyboards/canary/canary60rgb/info.json | 126 ++-- keyboards/cannonkeys/crin/crin.h | 33 - keyboards/cannonkeys/crin/info.json | 86 ++- keyboards/chocofly/v1/info.json | 130 ++-- keyboards/chocofly/v1/v1.h | 26 - keyboards/chromatonemini/chromatonemini.h | 23 - keyboards/chromatonemini/info.json | 94 +-- keyboards/ck60i/ck60i.c | 18 - keyboards/ck60i/ck60i.h | 36 - keyboards/ck60i/info.json | 130 ++-- keyboards/clawsome/hatchback/hatchback.h | 43 -- keyboards/clawsome/hatchback/info.json | 191 ++--- keyboards/clawsome/roadster/info.json | 91 +-- keyboards/clawsome/roadster/roadster.h | 30 - keyboards/clawsome/suv/info.json | 230 +++--- keyboards/clawsome/suv/suv.h | 41 -- keyboards/clickety_split/leeloo/info.json | 116 +-- keyboards/clickety_split/leeloo/rev1/rev1.h | 40 -- keyboards/cmm_studio/fuji65/fuji65.h | 38 - keyboards/cmm_studio/fuji65/info.json | 139 ++-- keyboards/compound/compound.h | 38 - keyboards/compound/info.json | 124 ++-- keyboards/converter/hp_46010a/hp_46010a.h | 60 -- keyboards/converter/hp_46010a/info.json | 232 +++--- keyboards/converter/modelm101/info.json | 124 +++- keyboards/converter/modelm101/modelm101.c | 2 +- keyboards/converter/modelm101/modelm101.h | 45 -- .../converter/modelm101_teensy2/info.json | 124 +++- .../modelm101_teensy2/modelm101_teensy2.h | 45 -- .../converter/palm_usb/stowaway/info.json | 156 ++-- .../converter/palm_usb/stowaway/stowaway.h | 53 -- keyboards/converter/periboard_512/info.json | 230 +++--- .../converter/periboard_512/periboard_512.h | 39 - .../converter/siemens_tastatur/info.json | 146 ++-- .../siemens_tastatur/siemens_tastatur.h | 41 -- keyboards/converter/sun_usb/type3/info.json | 215 +++--- keyboards/converter/sun_usb/type3/type3.h | 63 -- keyboards/cool836a/cool836a.h | 42 -- keyboards/cool836a/info.json | 47 +- keyboards/coseyfannitutti/mullet/info.json | 75 +- keyboards/coseyfannitutti/mullet/mullet.h | 42 -- keyboards/cosmo65/cosmo65.h | 31 - keyboards/cosmo65/info.json | 137 ++-- keyboards/cozykeys/bloomer/v2/info.json | 190 ++--- keyboards/cozykeys/bloomer/v2/v2.h | 38 - keyboards/cozykeys/bloomer/v3/info.json | 195 ++--- keyboards/cozykeys/bloomer/v3/v3.h | 36 - keyboards/cozykeys/speedo/v2/info.json | 146 ++-- keyboards/cozykeys/speedo/v2/v2.h | 35 - keyboards/cozykeys/speedo/v3/info.json | 144 ++-- keyboards/cozykeys/speedo/v3/v3.h | 36 - keyboards/custommk/evo70/evo70.c | 2 +- keyboards/custommk/evo70/evo70.h | 34 - keyboards/custommk/evo70/info.json | 165 +++-- keyboards/dailycraft/bat43/info.json | 66 +- keyboards/dailycraft/bat43/rev1/info.json | 56 ++ keyboards/dailycraft/bat43/rev1/rev1.h | 46 -- keyboards/dailycraft/bat43/rev2/info.json | 66 ++ keyboards/dailycraft/bat43/rev2/rev2.h | 46 -- keyboards/dailycraft/claw44/rev1/info.json | 96 +-- keyboards/dailycraft/claw44/rev1/rev1.h | 20 - .../dailycraft/wings42/rev1_extkeys/info.json | 98 +-- .../wings42/rev1_extkeys/rev1_extkeys.h | 48 -- keyboards/db/db63/db63.h | 49 -- keyboards/db/db63/info.json | 72 +- keyboards/delikeeb/vanana/info.json | 7 +- keyboards/delikeeb/vanana/rev1/info.json | 77 ++ keyboards/delikeeb/vanana/rev1/rev1.h | 40 -- keyboards/delikeeb/vanana/rev2/info.json | 77 ++ keyboards/delikeeb/vanana/rev2/rev2.h | 41 -- keyboards/deng/djam/djam.c | 2 +- keyboards/deng/djam/djam.h | 28 - keyboards/deng/djam/info.json | 49 +- keyboards/dichotomy/dichotomy.h | 19 - keyboards/dichotomy/info.json | 62 +- keyboards/dk60/dk60.h | 16 - keyboards/dk60/info.json | 120 ++-- keyboards/dm9records/ergoinu/ergoinu.h | 39 - keyboards/dm9records/ergoinu/info.json | 128 ++-- keyboards/dm9records/lain/info.json | 105 +-- keyboards/dm9records/lain/lain.h | 22 - keyboards/doppelganger/doppelganger.c | 2 +- keyboards/doppelganger/doppelganger.h | 46 -- keyboards/doppelganger/info.json | 103 ++- keyboards/draculad/draculad.h | 40 -- keyboards/draculad/info.json | 77 +- keyboards/drhigsby/dubba175/dubba175.h | 30 - keyboards/drhigsby/dubba175/info.json | 46 +- keyboards/dtisaac/cg108/cg108.h | 49 -- keyboards/dtisaac/cg108/info.json | 257 +++---- keyboards/dtisaac/dosa40rgb/dosa40rgb.c | 2 +- keyboards/dtisaac/dosa40rgb/dosa40rgb.h | 40 -- keyboards/dtisaac/dosa40rgb/info.json | 87 +-- keyboards/dtisaac/dtisaac01/dtisaac01.h | 49 -- keyboards/dtisaac/dtisaac01/info.json | 187 ++--- keyboards/duck/lightsaver/info.json | 108 ++- keyboards/duck/lightsaver/lightsaver.c | 2 +- keyboards/duck/lightsaver/lightsaver.h | 38 - keyboards/dztech/dz60rgb/dz60rgb.c | 2 +- keyboards/dztech/dz60rgb/dz60rgb.h | 19 - keyboards/dztech/dz60rgb/info.json | 126 ++-- keyboards/eason/aeroboard/aeroboard.h | 30 - keyboards/eason/aeroboard/info.json | 156 ++-- keyboards/eco/info.json | 7 +- keyboards/eco/rev1/info.json | 67 +- keyboards/eco/rev1/rev1.h | 15 - keyboards/eco/rev2/info.json | 67 +- keyboards/eco/rev2/rev2.h | 15 - keyboards/edc40/edc40.h | 32 - keyboards/edc40/info.json | 76 +- keyboards/edinburgh41/edinburgh41.h | 42 -- keyboards/edinburgh41/info.json | 82 +-- keyboards/ein_60/ein_60.c | 2 +- keyboards/ein_60/ein_60.h | 38 - keyboards/ein_60/info.json | 106 +-- keyboards/elephant42/elephant42.c | 2 +- keyboards/elephant42/elephant42.h | 35 - keyboards/elephant42/info.json | 86 +-- keyboards/emajesty/eiri/eiri.h | 40 -- keyboards/emajesty/eiri/info.json | 96 +-- keyboards/emptystring/nqg/info.json | 77 +- keyboards/emptystring/nqg/nqg.h | 17 - keyboards/ep/40/40.h | 41 -- keyboards/ep/40/info.json | 49 +- keyboards/ep/96/96.h | 46 -- keyboards/ep/96/info.json | 205 +++--- keyboards/ep/comsn/hs68/hs68.h | 42 -- keyboards/ep/comsn/hs68/info.json | 425 ++--------- keyboards/ep/comsn/mollydooker/info.json | 172 ++--- keyboards/ep/comsn/mollydooker/mollydooker.h | 41 -- keyboards/ep/comsn/tf_longeboye/info.json | 187 ++--- .../ep/comsn/tf_longeboye/tf_longeboye.h | 40 -- keyboards/ergotravel/rev1/info.json | 64 +- keyboards/ergotravel/rev1/rev1.h | 21 - keyboards/esca/getawayvan/getawayvan.h | 33 - keyboards/esca/getawayvan/info.json | 52 +- .../esca/getawayvan_f042/getawayvan_f042.h | 33 - keyboards/esca/getawayvan_f042/info.json | 52 +- keyboards/eternal_keypad/eternal_keypad.h | 41 -- keyboards/eternal_keypad/info.json | 79 +- .../evancookaudio/sleepingdinosaur/info.json | 59 +- .../sleepingdinosaur/sleepingdinosaur.h | 41 -- keyboards/evil80/evil80.h | 21 - keyboards/evil80/info.json | 108 ++- keyboards/exclusive/e7v1se/e7v1se.h | 43 -- keyboards/exclusive/e7v1se/info.json | 178 ++--- keyboards/fc660c/fc660c.c | 2 +- keyboards/fc660c/fc660c.h | 36 - keyboards/fc660c/info.json | 75 +- keyboards/fc980c/fc980c.c | 2 +- keyboards/fc980c/fc980c.h | 65 -- keyboards/fc980c/info.json | 212 +++--- keyboards/feker/ik75/ik75.c | 2 +- keyboards/feker/ik75/ik75.h | 56 -- keyboards/feker/ik75/info.json | 176 ++--- keyboards/ffkeebs/siris/info.json | 119 ++-- keyboards/ffkeebs/siris/siris.h | 37 - keyboards/fluorite/fluorite.h | 55 -- keyboards/fluorite/info.json | 287 ++++---- keyboards/flx/virgo/info.json | 201 +++--- keyboards/flx/virgo/virgo.c | 2 +- keyboards/flx/virgo/virgo.h | 42 -- keyboards/flxlb/zplit/info.json | 96 +-- keyboards/flxlb/zplit/zplit.h | 37 - keyboards/foostan/cornelius/cornelius.h | 40 -- keyboards/foostan/cornelius/info.json | 109 +-- keyboards/fortitude60/rev1/info.json | 72 +- keyboards/fortitude60/rev1/rev1.h | 25 - keyboards/foxlab/key65/hotswap/hotswap.h | 33 - keyboards/foxlab/key65/hotswap/info.json | 137 ++-- keyboards/foxlab/time_re/hotswap/hotswap.h | 34 - keyboards/foxlab/time_re/hotswap/info.json | 193 ++--- keyboards/foxlab/time_re/universal/info.json | 193 ++--- .../foxlab/time_re/universal/universal.h | 34 - keyboards/fr4/southpaw75/info.json | 85 ++- keyboards/fr4/southpaw75/southpaw75.h | 37 - keyboards/free_willy/free_willy.h | 33 - keyboards/free_willy/info.json | 77 +- keyboards/friedrich/friedrich.h | 43 -- keyboards/friedrich/info.json | 109 +-- keyboards/function96/v1/info.json | 110 ++- keyboards/function96/v1/v1.h | 44 -- keyboards/fungo/rev1/info.json | 157 ++-- keyboards/fungo/rev1/rev1.h | 41 -- keyboards/funky40/funky40.h | 15 - keyboards/funky40/info.json | 52 +- keyboards/gami_studio/lex60/info.json | 136 ++-- keyboards/gami_studio/lex60/lex60.h | 21 - keyboards/gboards/georgi/georgi.h | 52 -- keyboards/gboards/georgi/info.json | 60 +- keyboards/gboards/gergo/gergo.h | 25 - keyboards/gboards/gergo/info.json | 321 ++------- keyboards/gl516/a52gl/a52gl.h | 37 - keyboards/gl516/a52gl/info.json | 114 +-- keyboards/gl516/j73gl/info.json | 151 ++-- keyboards/gl516/j73gl/j73gl.c | 2 +- keyboards/gl516/j73gl/j73gl.h | 40 -- .../glenpickle/chimera_ergo/chimera_ergo.h | 19 - keyboards/glenpickle/chimera_ergo/info.json | 64 +- .../glenpickle/chimera_ortho/chimera_ortho.h | 18 - keyboards/glenpickle/chimera_ortho/info.json | 99 +-- .../chimera_ortho_plus/chimera_ortho_plus.h | 19 - .../glenpickle/chimera_ortho_plus/info.json | 113 +-- keyboards/gmmk/gmmk2/p65/ansi/ansi.c | 2 +- keyboards/gmmk/gmmk2/p65/ansi/ansi.h | 47 -- keyboards/gmmk/gmmk2/p65/ansi/info.json | 135 ++-- keyboards/gmmk/gmmk2/p65/iso/info.json | 137 ++-- keyboards/gmmk/gmmk2/p65/iso/iso.c | 2 +- keyboards/gmmk/gmmk2/p65/iso/iso.h | 47 -- keyboards/gmmk/gmmk2/p96/ansi/ansi.c | 2 +- keyboards/gmmk/gmmk2/p96/ansi/ansi.h | 54 -- keyboards/gmmk/gmmk2/p96/ansi/info.json | 224 +++--- keyboards/gmmk/gmmk2/p96/iso/info.json | 226 +++--- keyboards/gmmk/gmmk2/p96/iso/iso.c | 2 +- keyboards/gmmk/gmmk2/p96/iso/iso.h | 54 -- keyboards/gmmk/pro/rev1/ansi/ansi.c | 2 +- keyboards/gmmk/pro/rev1/ansi/ansi.h | 52 -- keyboards/gmmk/pro/rev1/ansi/info.json | 197 ++--- keyboards/gmmk/pro/rev1/iso/info.json | 199 +++--- keyboards/gmmk/pro/rev1/iso/iso.c | 2 +- keyboards/gmmk/pro/rev1/iso/iso.h | 52 -- keyboards/gmmk/pro/rev2/ansi/ansi.c | 2 +- keyboards/gmmk/pro/rev2/ansi/ansi.h | 52 -- keyboards/gmmk/pro/rev2/ansi/info.json | 197 ++--- keyboards/gmmk/pro/rev2/iso/info.json | 199 +++--- keyboards/gmmk/pro/rev2/iso/iso.c | 2 +- keyboards/gmmk/pro/rev2/iso/iso.h | 52 -- keyboards/gray_studio/apollo80/apollo80.h | 35 - keyboards/gray_studio/apollo80/info.json | 194 ++--- keyboards/gray_studio/cod67/cod67.h | 33 - keyboards/gray_studio/cod67/info.json | 81 ++- keyboards/gvalchca/ga150/ga150.h | 37 - keyboards/gvalchca/ga150/info.json | 130 ++-- keyboards/hadron/hadron.h | 19 - keyboards/hadron/info.json | 79 +- keyboards/halfcliff/halfcliff.c | 2 +- keyboards/halfcliff/halfcliff.h | 58 -- keyboards/halfcliff/info.json | 161 +++-- keyboards/halokeys/elemental75/elemental75.c | 2 +- keyboards/halokeys/elemental75/elemental75.h | 34 - keyboards/halokeys/elemental75/info.json | 188 ++--- .../108key_trackpoint/108key_trackpoint.h | 23 - .../handwired/108key_trackpoint/info.json | 242 ++++--- keyboards/handwired/3dfoxc/3dfoxc.h | 38 - keyboards/handwired/3dfoxc/info.json | 425 ++--------- keyboards/handwired/42/42.h | 32 - keyboards/handwired/42/info.json | 88 +-- keyboards/handwired/acacia/acacia.h | 49 -- keyboards/handwired/acacia/info.json | 87 ++- keyboards/handwired/aek64/aek64.h | 34 - keyboards/handwired/aek64/info.json | 72 +- keyboards/handwired/aim65/aim65.h | 36 - keyboards/handwired/aim65/info.json | 112 +-- keyboards/handwired/amigopunk/amigopunk.h | 35 - keyboards/handwired/amigopunk/info.json | 160 ++--- keyboards/handwired/angel/angel.h | 40 -- keyboards/handwired/angel/info.json | 53 +- keyboards/handwired/atreus50/atreus50.c | 2 +- keyboards/handwired/atreus50/atreus50.h | 21 - keyboards/handwired/atreus50/info.json | 100 +-- keyboards/handwired/bigmac/bigmac.h | 33 - keyboards/handwired/bigmac/info.json | 178 ++--- keyboards/handwired/bolek/bolek.h | 43 -- keyboards/handwired/bolek/info.json | 79 +- keyboards/handwired/brain/brain.h | 28 - keyboards/handwired/brain/info.json | 117 +-- keyboards/handwired/carpolly/carpolly.h | 36 - keyboards/handwired/carpolly/info.json | 89 +-- keyboards/handwired/chiron/chiron.h | 42 -- keyboards/handwired/chiron/info.json | 148 ++-- keyboards/handwired/cmd60/cmd60.h | 19 - keyboards/handwired/cmd60/info.json | 126 ++-- .../handwired/consolekeyboard/18key/18key.h | 26 - .../handwired/consolekeyboard/18key/info.json | 41 +- .../handwired/consolekeyboard/20key/20key.h | 26 - .../handwired/consolekeyboard/20key/info.json | 46 +- .../handwired/consolekeyboard/27key/27key.h | 28 - .../handwired/consolekeyboard/27key/info.json | 62 +- .../handwired/consolekeyboard/30key/30key.h | 28 - .../handwired/consolekeyboard/30key/info.json | 69 +- keyboards/handwired/croxsplit44/croxsplit44.h | 32 - keyboards/handwired/croxsplit44/info.json | 88 +-- keyboards/handwired/d48/d48.h | 19 - keyboards/handwired/d48/info.json | 101 +-- keyboards/handwired/dactyl_left/dactyl_left.h | 42 -- keyboards/handwired/dactyl_left/info.json | 43 +- .../handwired/dactyl_manuform/4x5_5/4x5_5.h | 29 - .../handwired/dactyl_manuform/4x5_5/info.json | 88 +-- keyboards/handwired/dactyl_manuform/4x6/4x6.h | 27 - .../handwired/dactyl_manuform/4x6/info.json | 107 +-- .../handwired/dactyl_manuform/4x6_5/4x6_5.h | 26 - .../handwired/dactyl_manuform/4x6_5/info.json | 100 +-- keyboards/handwired/daishi/daishi.h | 23 - keyboards/handwired/daishi/info.json | 265 +++---- keyboards/handwired/datahand/datahand.h | 34 - keyboards/handwired/datahand/info.json | 116 ++- keyboards/handwired/dqz11n1g/dqz11n1g.h | 51 -- keyboards/handwired/dqz11n1g/info.json | 261 +++---- keyboards/handwired/eagleii/eagleii.h | 24 - keyboards/handwired/eagleii/info.json | 159 +++-- keyboards/handwired/ergocheap/ergocheap.h | 41 -- keyboards/handwired/ergocheap/info.json | 147 ++-- keyboards/handwired/evk/v1_3/info.json | 206 +++--- keyboards/handwired/evk/v1_3/v1_3.c | 2 +- keyboards/handwired/evk/v1_3/v1_3.h | 43 -- keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h | 46 -- keyboards/handwired/fc200rt_qmk/info.json | 104 ++- .../handwired/fivethirteen/fivethirteen.h | 19 - keyboards/handwired/fivethirteen/info.json | 132 ++-- keyboards/handwired/frenchdev/frenchdev.h | 35 - keyboards/handwired/frenchdev/info.json | 213 +++--- keyboards/handwired/freoduo/freoduo.h | 39 - keyboards/handwired/freoduo/info.json | 129 ++-- .../hacked_motospeed/hacked_motospeed.h | 46 -- .../handwired/hacked_motospeed/info.json | 54 +- keyboards/handwired/hexon38/hexon38.h | 17 - keyboards/handwired/hexon38/info.json | 80 ++- keyboards/handwired/hnah40/hnah40.h | 38 - keyboards/handwired/hnah40/info.json | 87 +-- keyboards/handwired/hwpm87/hwpm87.h | 24 - keyboards/handwired/hwpm87/info.json | 188 ++--- keyboards/handwired/ibm122m/ibm122m.h | 41 -- keyboards/handwired/ibm122m/info.json | 266 +++---- .../ibm_wheelwriter/ibm_wheelwriter.h | 40 -- keyboards/handwired/ibm_wheelwriter/info.json | 134 ++-- keyboards/handwired/jopr/info.json | 672 ++++-------------- keyboards/handwired/jopr/jopr.c | 2 +- keyboards/handwired/jopr/jopr.h | 24 - keyboards/handwired/k8split/info.json | 96 +-- keyboards/handwired/k8split/k8split.h | 37 - keyboards/handwired/kbod/info.json | 126 ++-- keyboards/handwired/kbod/kbod.h | 22 - keyboards/handwired/ks63/info.json | 399 ++--------- keyboards/handwired/ks63/ks63.h | 23 - keyboards/handwired/lagrange/info.json | 147 ++-- keyboards/handwired/lagrange/lagrange.h | 26 - keyboards/handwired/magicforce61/info.json | 126 ++-- .../handwired/magicforce61/magicforce61.h | 17 - keyboards/handwired/magicforce68/info.json | 145 ++-- .../handwired/magicforce68/magicforce68.h | 19 - keyboards/handwired/marauder/info.json | 202 +++--- keyboards/handwired/marauder/marauder.h | 41 -- keyboards/handwired/minorca/info.json | 87 +-- keyboards/handwired/minorca/minorca.h | 15 - keyboards/handwired/not_so_minidox/info.json | 84 +-- .../handwired/not_so_minidox/not_so_minidox.h | 21 - .../handwired/oem_iso_fullsize/info.json | 229 +++--- .../oem_iso_fullsize/oem_iso_fullsize.h | 38 - keyboards/handwired/ortho5x13/info.json | 132 ++-- keyboards/handwired/ortho5x13/ortho5x13.h | 18 - keyboards/handwired/ortho5x14/info.json | 138 ++-- keyboards/handwired/ortho5x14/ortho5x14.h | 34 - keyboards/handwired/p65rgb/info.json | 143 ++-- keyboards/handwired/p65rgb/p65rgb.c | 2 +- keyboards/handwired/p65rgb/p65rgb.h | 42 -- keyboards/handwired/pilcrow/info.json | 83 +-- keyboards/handwired/pilcrow/pilcrow.h | 19 - keyboards/handwired/pill60/info.json | 128 ++-- keyboards/handwired/pill60/pill60.h | 42 -- keyboards/handwired/prime_exl/info.json | 96 ++- keyboards/handwired/prime_exl/prime_exl.h | 40 -- keyboards/handwired/promethium/info.json | 106 +-- .../promethium/keymaps/default/keymap.c | 8 +- .../promethium/keymaps/priyadi/keymap.c | 8 +- keyboards/handwired/promethium/promethium.h | 20 - keyboards/handwired/pteron/info.json | 112 +-- keyboards/handwired/pteron/pteron.h | 17 - keyboards/handwired/pteron44/info.json | 88 +-- keyboards/handwired/pteron44/pteron44.h | 31 - keyboards/handwired/retro_refit/info.json | 168 ++--- keyboards/handwired/retro_refit/readme.md | 28 - keyboards/handwired/retro_refit/retro_refit.c | 2 +- keyboards/handwired/retro_refit/retro_refit.h | 35 - keyboards/handwired/selene/info.json | 244 ++++--- keyboards/handwired/selene/selene.h | 16 - keyboards/handwired/slash/info.json | 126 ++-- keyboards/handwired/slash/slash.h | 36 - keyboards/handwired/space_oddity/info.json | 135 ++-- .../handwired/space_oddity/space_oddity.h | 19 - keyboards/handwired/split65/info.json | 80 --- .../handwired/split65/promicro/info.json | 88 ++- .../handwired/split65/promicro/promicro.h | 38 - keyboards/handwired/split65/stm32/info.json | 88 ++- keyboards/handwired/split65/stm32/stm32.h | 38 - .../handwired/stef9998/split_5x7/info.json | 139 ++-- .../handwired/stef9998/split_5x7/rev1/rev1.h | 40 -- .../handwired/swiftrax/beegboy/beegboy.h | 42 -- .../handwired/swiftrax/beegboy/info.json | 218 +++--- .../handwired/swiftrax/pandamic/info.json | 105 ++- .../handwired/swiftrax/pandamic/pandamic.h | 40 -- .../handwired/swiftrax/unsplit/info.json | 88 +-- .../handwired/swiftrax/unsplit/unsplit.h | 35 - .../handwired/symmetric70_proto/info.json | 145 ++-- .../symmetric70_proto/symmetric70_proto.c | 2 +- .../symmetric70_proto/symmetric70_proto.h | 41 -- keyboards/handwired/t111/info.json | 123 +++- keyboards/handwired/t111/t111.h | 57 -- keyboards/handwired/terminus_mini/info.json | 95 +-- .../handwired/terminus_mini/terminus_mini.h | 39 - keyboards/handwired/traveller/info.json | 100 +-- keyboards/handwired/traveller/traveller.c | 2 +- keyboards/handwired/traveller/traveller.h | 17 - keyboards/handwired/tsubasa/info.json | 127 ++-- keyboards/handwired/tsubasa/tsubasa.c | 2 +- keyboards/handwired/tsubasa/tsubasa.h | 47 -- keyboards/handwired/twadlee/tp69/info.json | 76 +- keyboards/handwired/twadlee/tp69/tp69.h | 48 -- keyboards/handwired/unicomp_mini_m/info.json | 190 ++--- .../handwired/unicomp_mini_m/unicomp_mini_m.h | 49 -- keyboards/handwired/unk/rev1/info.json | 140 ++-- keyboards/handwired/unk/rev1/rev1.h | 28 - keyboards/handwired/videowriter/info.json | 90 ++- keyboards/handwired/videowriter/videowriter.h | 59 -- keyboards/handwired/xealous/rev1/info.json | 131 ++-- keyboards/handwired/xealous/rev1/rev1.h | 24 - keyboards/handwired/z150/info.json | 96 ++- keyboards/handwired/z150/z150.c | 2 +- keyboards/handwired/z150/z150.h | 54 -- keyboards/handwired/zergo/info.json | 170 ++--- keyboards/handwired/zergo/zergo.h | 35 - keyboards/heliar/wm1_hotswap/info.json | 150 ++-- keyboards/heliar/wm1_hotswap/wm1_hotswap.c | 2 +- keyboards/heliar/wm1_hotswap/wm1_hotswap.h | 42 -- keyboards/helix/rev3_4rows/info.json | 61 +- keyboards/helix/rev3_4rows/rev3_4rows.h | 25 - keyboards/helix/rev3_5rows/info.json | 78 +- keyboards/helix/rev3_5rows/rev3_5rows.c | 2 +- keyboards/helix/rev3_5rows/rev3_5rows.h | 28 - keyboards/hfdkb/keyboard_sw/k83/info.json | 175 ++--- keyboards/hfdkb/keyboard_sw/k83/k83.c | 3 +- keyboards/hfdkb/keyboard_sw/k83/k83.h | 39 - keyboards/hhkb/ansi/ansi.h | 23 - keyboards/hhkb/ansi/info.json | 127 ++-- keyboards/hhkb_lite_2/hhkb_lite_2.h | 22 - keyboards/hhkb_lite_2/info.json | 129 ++-- keyboards/hidtech/bastyl/bastyl.h | 43 -- keyboards/hidtech/bastyl/info.json | 127 ++-- keyboards/hillside/46/0_1/0_1.c | 2 +- keyboards/hillside/46/0_1/0_1.h | 37 - keyboards/hillside/46/0_1/info.json | 59 ++ keyboards/hillside/46/info.json | 66 +- keyboards/hillside/48/0_1/0_1.h | 34 - keyboards/hillside/48/0_1/info.json | 61 ++ keyboards/hillside/48/info.json | 69 +- keyboards/hillside/52/0_1/0_1.c | 2 +- keyboards/hillside/52/0_1/0_1.h | 39 - keyboards/hillside/52/0_1/info.json | 65 ++ keyboards/hillside/52/info.json | 72 +- keyboards/holyswitch/southpaw75/info.json | 160 +++-- keyboards/holyswitch/southpaw75/southpaw75.h | 36 - keyboards/horizon/horizon.h | 41 -- keyboards/horizon/info.json | 109 +-- keyboards/horrortroll/lemon40/info.json | 99 +-- keyboards/horrortroll/lemon40/lemon40.c | 2 +- keyboards/horrortroll/lemon40/lemon40.h | 49 -- keyboards/hp69/hp69.h | 32 - keyboards/hp69/info.json | 145 ++-- keyboards/huytbt/h50/h50.h | 35 - keyboards/huytbt/h50/info.json | 107 +-- keyboards/ibnuda/gurindam/gurindam.h | 46 -- keyboards/ibnuda/gurindam/info.json | 143 ++-- keyboards/idobao/id96/id96.h | 63 -- keyboards/idobao/id96/info.json | 209 +++--- keyboards/jc65/v32a/info.json | 80 ++- keyboards/jc65/v32a/v32a.h | 38 - keyboards/jc65/v32u4/info.json | 83 ++- keyboards/jc65/v32u4/v32u4.h | 19 - keyboards/jd40/info.json | 91 +-- keyboards/jd40/jd40.h | 18 - keyboards/jd45/info.json | 97 +-- keyboards/jd45/jd45.h | 19 - keyboards/jiran/info.json | 73 +- keyboards/jiran/rev1/info.json | 71 ++ keyboards/jiran/rev1/rev1.h | 25 - keyboards/jiran/rev2/info.json | 73 +- keyboards/jiran/rev2/rev2.h | 23 - keyboards/jones/v1/info.json | 87 ++- keyboards/jones/v1/v1.c | 2 +- keyboards/jones/v1/v1.h | 57 -- keyboards/jorne/rev1/info.json | 88 +-- keyboards/jorne/rev1/rev1.h | 31 - keyboards/k34/info.json | 68 +- keyboards/k34/k34.h | 26 - keyboards/kabedon/kabedon78s/info.json | 233 +++--- keyboards/kabedon/kabedon78s/kabedon78s.h | 21 - keyboards/kabedon/kabedon980/info.json | 214 +++--- keyboards/kabedon/kabedon980/kabedon980.c | 2 +- keyboards/kabedon/kabedon980/kabedon980.h | 25 - keyboards/kabedon/kabedon98e/info.json | 224 +++--- keyboards/kabedon/kabedon98e/kabedon98e.c | 2 +- keyboards/kabedon/kabedon98e/kabedon98e.h | 63 -- keyboards/kagizaraya/halberd/halberd.h | 40 -- keyboards/kagizaraya/halberd/info.json | 46 +- keyboards/kagizaraya/scythe/info.json | 77 +- keyboards/kagizaraya/scythe/scythe.h | 51 -- keyboards/kakunpc/angel64/alpha/alpha.h | 48 -- keyboards/kakunpc/angel64/alpha/info.json | 71 +- keyboards/kakunpc/suihankey/alpha/alpha.h | 39 - keyboards/kakunpc/suihankey/alpha/info.json | 36 +- keyboards/kakunpc/suihankey/rev1/info.json | 36 +- keyboards/kakunpc/suihankey/rev1/rev1.h | 40 -- keyboards/kapl/rev1/info.json | 153 ++-- keyboards/kapl/rev1/rev1.c | 2 +- keyboards/kapl/rev1/rev1.h | 34 - keyboards/kb58/info.json | 116 +-- keyboards/kb58/kb58.h | 46 -- keyboards/kb_elmo/aek2_usb/aek2_usb.h | 45 -- keyboards/kb_elmo/aek2_usb/info.json | 229 +++--- keyboards/kb_elmo/m0110a_usb/info.json | 162 +++-- keyboards/kb_elmo/m0110a_usb/m0110a_usb.h | 41 -- keyboards/kb_elmo/m0116_usb/info.json | 168 ++--- keyboards/kb_elmo/m0116_usb/m0116_usb.h | 42 -- keyboards/kbdfans/bella/rgb/info.json | 97 ++- keyboards/kbdfans/bella/rgb/rgb.c | 2 +- keyboards/kbdfans/bella/rgb/rgb.h | 34 - keyboards/kbdfans/bella/rgb_iso/info.json | 98 ++- keyboards/kbdfans/bella/rgb_iso/rgb_iso.c | 2 +- keyboards/kbdfans/bella/rgb_iso/rgb_iso.h | 34 - keyboards/kbdfans/kbd6x/info.json | 69 +- keyboards/kbdfans/kbd6x/kbd6x.h | 33 - keyboards/kbdfans/kbdmini/info.json | 104 +-- keyboards/kbdfans/kbdmini/kbdmini.c | 2 +- keyboards/kbdfans/kbdmini/kbdmini.h | 15 - keyboards/kbdfans/maja/info.json | 147 ++-- keyboards/kbdfans/maja/maja.c | 2 +- keyboards/kbdfans/maja/maja.h | 19 - keyboards/kbdfans/maja_soldered/info.json | 150 ++-- .../kbdfans/maja_soldered/maja_soldered.c | 2 +- .../kbdfans/maja_soldered/maja_soldered.h | 19 - keyboards/kbdfans/odin/v2/info.json | 218 +++--- keyboards/kbdfans/odin/v2/v2.h | 36 - keyboards/keebio/bfo9000/bfo9000.h | 26 - keyboards/keebio/bfo9000/info.json | 216 +++--- keyboards/keebio/ergodicity/ergodicity.c | 2 +- keyboards/keebio/ergodicity/ergodicity.h | 41 -- keyboards/keebio/ergodicity/info.json | 138 ++-- keyboards/keebio/foldkb/rev1/info.json | 153 ++-- keyboards/keebio/foldkb/rev1/rev1.c | 2 +- keyboards/keebio/foldkb/rev1/rev1.h | 39 - keyboards/keebio/fourier/fourier.h | 20 - keyboards/keebio/fourier/info.json | 94 +-- keyboards/keebio/iris/info.json | 16 - keyboards/keebio/iris/rev1/info.json | 73 +- keyboards/keebio/iris/rev1/rev1.c | 2 +- keyboards/keebio/iris/rev1/rev1.h | 23 - keyboards/keebio/iris/rev1_led/info.json | 73 +- keyboards/keebio/iris/rev1_led/rev1_led.c | 2 +- keyboards/keebio/iris/rev1_led/rev1_led.h | 23 - keyboards/keebio/iris/rev2/info.json | 73 +- keyboards/keebio/iris/rev2/rev2.c | 2 +- keyboards/keebio/iris/rev2/rev2.h | 23 - keyboards/keebio/iris/rev3/info.json | 73 +- keyboards/keebio/iris/rev3/rev3.c | 2 +- keyboards/keebio/iris/rev3/rev3.h | 23 - keyboards/keebio/iris/rev4/info.json | 73 +- keyboards/keebio/iris/rev4/rev4.c | 2 +- keyboards/keebio/iris/rev4/rev4.h | 23 - keyboards/keebio/iris/rev5/info.json | 73 +- keyboards/keebio/iris/rev5/rev5.c | 2 +- keyboards/keebio/iris/rev5/rev5.h | 41 -- keyboards/keebio/iris/rev6/info.json | 73 +- keyboards/keebio/iris/rev6/rev6.c | 2 +- keyboards/keebio/iris/rev6/rev6.h | 41 -- keyboards/keebio/iris/rev6a/info.json | 73 +- keyboards/keebio/iris/rev6a/rev6a.c | 2 +- keyboards/keebio/iris/rev6a/rev6a.h | 41 -- keyboards/keebio/iris/rev6b/info.json | 73 +- keyboards/keebio/iris/rev6b/rev6b.c | 2 +- keyboards/keebio/iris/rev6b/rev6b.h | 41 -- keyboards/keebio/iris/rev7/info.json | 73 +- keyboards/keebio/iris/rev7/rev7.c | 2 +- keyboards/keebio/iris/rev7/rev7.h | 41 -- keyboards/keebio/laplace/info.json | 95 +-- keyboards/keebio/laplace/laplace.h | 19 - keyboards/keebio/rorschach/rev1/info.json | 105 ++- keyboards/keebio/rorschach/rev1/rev1.h | 23 - keyboards/keyboardio/atreus/atreus.h | 32 - keyboards/keyboardio/atreus/info.json | 95 +-- keyboards/keycapsss/kimiko/rev1/info.json | 125 ++-- keyboards/keycapsss/kimiko/rev1/rev1.h | 40 -- keyboards/keyhive/opus/info.json | 84 +-- keyboards/keyhive/opus/opus.h | 39 - keyboards/keyhive/smallice/info.json | 66 +- keyboards/keyhive/smallice/smallice.h | 40 -- keyboards/keyhive/southpole/info.json | 178 ++--- keyboards/keyhive/southpole/southpole.h | 18 - keyboards/keyprez/corgi/corgi.h | 46 -- keyboards/keyprez/corgi/info.json | 99 ++- keyboards/keyprez/unicorn/info.json | 157 ++-- keyboards/keyprez/unicorn/unicorn.c | 4 - keyboards/keyprez/unicorn/unicorn.h | 36 - keyboards/kingly_keys/ropro/info.json | 84 ++- keyboards/kingly_keys/ropro/ropro.h | 39 - keyboards/kira75/info.json | 91 ++- keyboards/kira75/kira75.h | 22 - keyboards/kiwikey/borderland/borderland.c | 4 - keyboards/kiwikey/borderland/borderland.h | 29 - keyboards/kiwikey/borderland/info.json | 144 ++-- keyboards/kmini/info.json | 89 ++- keyboards/kmini/kmini.c | 2 +- keyboards/kmini/kmini.h | 35 - keyboards/kopibeng/typ65/info.json | 159 +++-- keyboards/kopibeng/typ65/typ65.c | 2 +- keyboards/kopibeng/typ65/typ65.h | 54 -- keyboards/kprepublic/bm43a/bm43a.h | 30 - keyboards/kprepublic/bm43a/info.json | 89 +-- keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h | 30 - keyboards/kprepublic/bm43hsrgb/info.json | 89 +-- .../kprepublic/bm60hsrgb_ec/rev1/info.json | 133 ++-- keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c | 2 +- keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h | 34 - .../kprepublic/bm60hsrgb_ec/rev2/info.json | 133 ++-- keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c | 2 +- keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h | 35 - .../kprepublic/bm60hsrgb_iso/rev1/info.json | 135 ++-- .../kprepublic/bm60hsrgb_iso/rev1/rev1.c | 2 +- .../kprepublic/bm60hsrgb_iso/rev1/rev1.h | 34 - keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c | 2 +- keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h | 35 - keyboards/kprepublic/bm980hsrgb/info.json | 212 +++--- keyboards/kudox/columner/columner.h | 23 - keyboards/kudox/columner/info.json | 141 ++-- keyboards/kudox/rev1/info.json | 137 ++-- keyboards/kudox/rev1/rev1.h | 23 - keyboards/kudox/rev2/info.json | 141 ++-- keyboards/kudox/rev2/rev2.h | 23 - keyboards/kudox/rev3/info.json | 141 ++-- keyboards/kudox/rev3/rev3.h | 23 - keyboards/kudox_full/rev1/info.json | 155 ++-- keyboards/kudox_full/rev1/rev1.h | 26 - keyboards/kudox_game/info.json | 34 +- keyboards/kudox_game/rev1/info.json | 39 +- keyboards/kudox_game/rev1/rev1.h | 18 - keyboards/kudox_game/rev2/info.json | 39 +- keyboards/kudox_game/rev2/rev2.h | 18 - keyboards/ky01/info.json | 177 ++--- keyboards/ky01/ky01.h | 38 - keyboards/labyrinth75/info.json | 93 ++- keyboards/labyrinth75/labyrinth75.h | 47 -- keyboards/latincompass/latin64ble/info.json | 128 ++-- .../latincompass/latin64ble/latin64ble.h | 34 - keyboards/lazydesigners/bolt/bolt.h | 32 - keyboards/lazydesigners/bolt/info.json | 95 +-- keyboards/lazydesigners/the50/info.json | 116 +-- keyboards/lazydesigners/the50/the50.h | 26 - keyboards/lfkeyboards/lfk78/lfk78.h | 2 +- keyboards/lfkeyboards/lfk78/revb/info.json | 165 ++--- keyboards/lfkeyboards/lfk78/revb/revb.h | 41 -- keyboards/lfkeyboards/mini1800/info.json | 171 ++--- keyboards/lfkeyboards/mini1800/mini1800.h | 20 +- keyboards/lime/rev1/info.json | 131 ++-- keyboards/lime/rev1/rev1.c | 2 +- keyboards/lime/rev1/rev1.h | 41 -- keyboards/majistic/info.json | 141 ++-- keyboards/majistic/majistic.h | 47 -- keyboards/malevolti/lyra/rev1/info.json | 140 ++-- keyboards/malevolti/lyra/rev1/rev1.h | 39 - keyboards/malevolti/superlyra/rev1/info.json | 182 ++--- keyboards/malevolti/superlyra/rev1/rev1.h | 34 - keyboards/manta60/info.json | 138 ++-- keyboards/manta60/manta60.h | 40 -- .../marksard/treadstone32/lite/info.json | 47 +- keyboards/marksard/treadstone32/lite/lite.h | 45 -- .../marksard/treadstone32/rev1/info.json | 47 +- keyboards/marksard/treadstone32/rev1/rev1.h | 45 -- keyboards/massdrop/ctrl/ctrl.h | 22 - keyboards/massdrop/ctrl/info.json | 187 ++--- keyboards/matthewdias/minim/info.json | 95 +-- keyboards/matthewdias/minim/minim.h | 33 - keyboards/mechanickeys/miniashen40/info.json | 100 +-- .../mechanickeys/miniashen40/miniashen40.h | 47 -- keyboards/mechanickeys/undead60m/info.json | 147 ++-- keyboards/mechanickeys/undead60m/undead60m.c | 2 +- keyboards/mechanickeys/undead60m/undead60m.h | 34 - keyboards/mechkeys/mk60/info.json | 140 ++-- keyboards/mechkeys/mk60/mk60.h | 41 -- keyboards/mechllama/g35/g35.h | 33 - keyboards/mechllama/g35/info.json | 42 +- keyboards/mechlovin/th1800/info.json | 229 +++--- keyboards/mechlovin/th1800/th1800.h | 36 - keyboards/mechlovin/tmkl/info.json | 161 +++-- keyboards/mechlovin/tmkl/tmkl.h | 35 - keyboards/mechstudio/dawn/dawn.h | 36 - keyboards/mechstudio/dawn/info.json | 174 ++--- keyboards/mechwild/bbs/bbs.c | 2 +- keyboards/mechwild/bbs/bbs.h | 26 - keyboards/mechwild/bbs/info.json | 63 +- keyboards/mechwild/mokulua/mirrored/info.json | 154 ++-- .../mechwild/mokulua/mirrored/mirrored.c | 2 +- .../mechwild/mokulua/mirrored/mirrored.h | 31 - keyboards/mechwild/mokulua/standard/info.json | 152 ++-- .../mechwild/mokulua/standard/standard.c | 2 +- .../mechwild/mokulua/standard/standard.h | 31 - keyboards/mechwild/obe/info.json | 148 ++-- keyboards/mechwild/obe/obe.c | 17 - keyboards/mechwild/obe/obe.h | 43 -- keyboards/mechwild/waka60/info.json | 131 ++-- keyboards/mechwild/waka60/waka60.c | 17 - keyboards/mechwild/waka60/waka60.h | 49 -- keyboards/mehkee96/info.json | 112 ++- keyboards/mehkee96/mehkee96.h | 23 - keyboards/melgeek/tegic/info.json | 165 ++--- keyboards/melgeek/tegic/rev1/rev1.c | 2 +- keyboards/melgeek/tegic/tegic.h | 37 - keyboards/mincedshon/ecila/ecila.h | 20 - keyboards/mincedshon/ecila/info.json | 89 ++- keyboards/mino_plus/mino_plus.c | 2 +- keyboards/mino_plus/mino_plus.h | 10 - keyboards/mino_plus/soldered/info.json | 444 ++---------- keyboards/mino_plus/soldered/soldered.c | 2 +- keyboards/mino_plus/soldered/soldered.h | 28 - keyboards/mint60/info.json | 142 ++-- keyboards/mint60/mint60.h | 42 -- .../misonoworks/chocolatebar/chocolatebar.c | 2 +- .../misonoworks/chocolatebar/chocolatebar.h | 32 - keyboards/misonoworks/chocolatebar/info.json | 116 +-- keyboards/misonoworks/karina/info.json | 79 +- keyboards/misonoworks/karina/karina.h | 33 - keyboards/mitosis/info.json | 58 +- keyboards/mitosis/mitosis.h | 19 - keyboards/ml/gas75/gas75.c | 2 +- keyboards/ml/gas75/gas75.h | 55 -- keyboards/ml/gas75/info.json | 176 ++--- keyboards/mmkzoo65/info.json | 133 ++-- keyboards/mmkzoo65/mmkzoo65.h | 32 - keyboards/mntre/info.json | 164 ++--- keyboards/mntre/mntre.c | 2 +- keyboards/mntre/mntre.h | 30 - keyboards/mokey/mokey64/info.json | 128 ++-- keyboards/mokey/mokey64/mokey64.h | 48 -- keyboards/molecule/info.json | 85 +-- keyboards/molecule/molecule.h | 41 -- keyboards/momoka_ergo/info.json | 148 ++-- keyboards/momoka_ergo/momoka_ergo.h | 56 -- keyboards/morizon/info.json | 136 ++-- keyboards/morizon/morizon.h | 48 -- keyboards/mschwingen/modelm/info.json | 230 +++--- keyboards/mschwingen/modelm/modelm.h | 36 - keyboards/mt/mt980/info.json | 222 +++--- keyboards/mt/mt980/mt980.h | 25 - keyboards/murcielago/info.json | 131 ++-- keyboards/murcielago/murcielago.h | 49 -- keyboards/mwstudio/alicekk/alicekk.c | 16 - keyboards/mwstudio/alicekk/alicekk.h | 32 - keyboards/mwstudio/alicekk/info.json | 135 ++-- keyboards/mwstudio/mw65_rgb/info.json | 144 ++-- keyboards/mwstudio/mw65_rgb/mw65_rgb.c | 2 +- keyboards/mwstudio/mw65_rgb/mw65_rgb.h | 49 -- keyboards/mwstudio/mw75/info.json | 171 ++--- keyboards/mwstudio/mw75/mw75.c | 2 +- keyboards/mwstudio/mw75/mw75.h | 55 -- keyboards/mwstudio/mw75r2/info.json | 167 ++--- keyboards/mwstudio/mw75r2/mw75r2.c | 2 +- keyboards/mwstudio/mw75r2/mw75r2.h | 34 - keyboards/nacly/sodium42/info.json | 84 +-- keyboards/nacly/sodium42/sodium42.h | 36 - keyboards/nacly/sodium50/info.json | 100 +-- keyboards/nacly/sodium50/sodium50.h | 36 - keyboards/nacly/sodium62/info.json | 124 ++-- keyboards/nacly/sodium62/sodium62.c | 2 +- keyboards/nacly/sodium62/sodium62.h | 39 - keyboards/nacly/splitreus62/info.json | 76 +- keyboards/nacly/splitreus62/splitreus62.h | 26 - keyboards/nacly/ua62/info.json | 76 +- keyboards/nacly/ua62/ua62.h | 41 -- keyboards/neito/info.json | 139 ++-- keyboards/neito/neito.h | 37 - keyboards/nek_type_a/info.json | 194 ++--- keyboards/nek_type_a/nek_type_a.h | 18 - keyboards/nemui/info.json | 362 ++-------- keyboards/nemui/nemui.h | 34 - .../nightly_boards/alter_lite/alter_lite.h | 41 -- keyboards/nightly_boards/alter_lite/info.json | 140 ++-- keyboards/nightly_boards/conde60/conde60.h | 42 -- keyboards/nightly_boards/conde60/info.json | 141 ++-- keyboards/nightly_boards/jisoo/info.json | 185 ++--- keyboards/nightly_boards/jisoo/jisoo.h | 43 -- keyboards/nightly_boards/ph_arisu/info.json | 84 ++- keyboards/nightly_boards/ph_arisu/ph_arisu.h | 22 - keyboards/nix_studio/n60_a/info.json | 130 ++-- keyboards/nix_studio/n60_a/n60_a.h | 36 - .../nopunin10did/railroad/rev0/info.json | 205 +++--- keyboards/nopunin10did/railroad/rev0/rev0.h | 51 -- keyboards/noxary/280/280.c | 2 +- keyboards/noxary/280/280.h | 49 -- keyboards/noxary/280/info.json | 107 ++- keyboards/noxary/vulcan/info.json | 128 ++-- keyboards/noxary/vulcan/vulcan.h | 41 -- keyboards/noxary/x268/info.json | 146 ++-- keyboards/noxary/x268/x268.c | 2 +- keyboards/noxary/x268/x268.h | 35 - keyboards/nullbitsco/tidbit/info.json | 41 +- .../tidbit/keymaps/default/keymap.c | 10 +- .../nullbitsco/tidbit/keymaps/oled/keymap.c | 30 +- .../tidbit/keymaps/snailmap_lite/keymap.c | 30 +- .../nullbitsco/tidbit/keymaps/via/keymap.c | 30 +- keyboards/nullbitsco/tidbit/tidbit.c | 4 +- keyboards/nullbitsco/tidbit/tidbit.h | 37 - keyboards/numatreus/info.json | 52 +- keyboards/numatreus/numatreus.h | 20 - keyboards/ocean/addon/addon.h | 35 - keyboards/ocean/addon/info.json | 80 ++- keyboards/ocean/gin_v2/gin_v2.h | 37 - keyboards/ocean/gin_v2/info.json | 120 ++-- keyboards/ocean/slamz/info.json | 50 +- keyboards/ocean/slamz/slamz.h | 31 - keyboards/ocean/wang_v2/info.json | 53 +- keyboards/ocean/wang_v2/wang_v2.h | 31 - keyboards/ocean/yuri/info.json | 109 +-- keyboards/ocean/yuri/yuri.h | 31 - keyboards/oddball/info.json | 55 +- keyboards/oddball/oddball.h | 17 - keyboards/oddforge/vea/info.json | 115 ++- keyboards/oddforge/vea/matrix.c | 1 - keyboards/oddforge/vea/vea.h | 57 -- keyboards/ogre/ergo_single/ergo_single.h | 39 - keyboards/ogre/ergo_single/info.json | 142 ++-- keyboards/ogre/ergo_split/ergo_split.h | 39 - keyboards/ogre/ergo_split/info.json | 142 ++-- keyboards/om60/info.json | 84 ++- keyboards/om60/om60.h | 41 -- keyboards/omkbd/runner3680/3x6/3x6.h | 17 - keyboards/omkbd/runner3680/3x6/info.json | 77 +- keyboards/omkbd/runner3680/3x7/3x7.h | 17 - keyboards/omkbd/runner3680/3x7/info.json | 87 +-- keyboards/omkbd/runner3680/3x8/3x8.h | 17 - keyboards/omkbd/runner3680/3x8/info.json | 99 +-- keyboards/omkbd/runner3680/4x6/4x6.h | 20 - keyboards/omkbd/runner3680/4x6/info.json | 100 +-- keyboards/omkbd/runner3680/4x7/4x7.h | 20 - keyboards/omkbd/runner3680/4x7/info.json | 116 +-- keyboards/omkbd/runner3680/4x8/4x8.h | 20 - keyboards/omkbd/runner3680/4x8/info.json | 132 ++-- keyboards/omkbd/runner3680/5x6/5x6.h | 23 - keyboards/omkbd/runner3680/5x6/info.json | 125 ++-- keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c | 2 +- keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h | 39 - keyboards/omkbd/runner3680/5x6_5x8/info.json | 145 ++-- keyboards/omkbd/runner3680/5x7/5x7.h | 23 - keyboards/omkbd/runner3680/5x7/info.json | 145 ++-- keyboards/omkbd/runner3680/5x8/5x8.h | 23 - keyboards/omkbd/runner3680/5x8/info.json | 165 ++--- keyboards/orange75/info.json | 173 ++--- keyboards/orange75/orange75.h | 29 - keyboards/orthocode/info.json | 152 ++-- keyboards/orthocode/orthocode.h | 16 - keyboards/orthodox/rev1/info.json | 59 +- keyboards/orthodox/rev1/rev1.c | 2 +- keyboards/orthodox/rev1/rev1.h | 38 - keyboards/orthodox/rev3/info.json | 59 +- keyboards/orthodox/rev3/rev3.c | 2 +- keyboards/orthodox/rev3/rev3.h | 38 - keyboards/orthodox/rev3_teensy/info.json | 61 +- keyboards/orthodox/rev3_teensy/rev3_teensy.c | 2 +- keyboards/orthodox/rev3_teensy/rev3_teensy.h | 38 - keyboards/owlab/jelly_epoch/hotswap/hotswap.h | 38 - keyboards/owlab/jelly_epoch/hotswap/info.json | 172 ++--- keyboards/owlab/spring/info.json | 142 ++-- keyboards/owlab/spring/spring.c | 2 +- keyboards/owlab/spring/spring.h | 33 - keyboards/pabile/p42/info.json | 49 +- keyboards/pabile/p42/p42.h | 33 - .../papercranekeyboards/gerald65/gerald65.h | 29 - .../papercranekeyboards/gerald65/info.json | 148 ++-- keyboards/percent/skog/info.json | 105 ++- keyboards/percent/skog/skog.h | 38 - .../phase_studio/titan65/hotswap/hotswap.c | 2 +- .../phase_studio/titan65/hotswap/hotswap.h | 35 - .../phase_studio/titan65/hotswap/info.json | 139 ++-- keyboards/phrygian/ph100/info.json | 218 +++--- keyboards/phrygian/ph100/ph100.h | 44 -- keyboards/pico/65keys/65keys.h | 23 - keyboards/pico/65keys/info.json | 134 ++-- keyboards/pico/70keys/70keys.h | 23 - keyboards/pico/70keys/info.json | 144 ++-- .../frusta_fundamental/frusta_fundamental.h | 44 -- .../picolab/frusta_fundamental/info.json | 135 ++-- keyboards/pkb65/info.json | 142 ++-- keyboards/pkb65/pkb65.h | 38 - keyboards/playkbtw/ca66/ca66.h | 17 - keyboards/playkbtw/ca66/info.json | 84 ++- keyboards/plut0nium/0x3e/0x3e.h | 36 - keyboards/plut0nium/0x3e/info.json | 131 ++-- keyboards/polilla/info.json | 120 ++-- keyboards/polilla/polilla.h | 42 -- keyboards/primekb/meridian_rgb/info.json | 76 +- keyboards/primekb/meridian_rgb/meridian_rgb.h | 37 - keyboards/primekb/prime_e/info.json | 62 +- keyboards/primekb/prime_e/prime_e.h | 32 - keyboards/primekb/prime_l/info.json | 7 +- keyboards/primekb/prime_l/v1/info.json | 90 ++- keyboards/primekb/prime_l/v1/v1.h | 33 - keyboards/primekb/prime_l/v2/info.json | 90 ++- keyboards/primekb/prime_l/v2/v2.h | 33 - keyboards/primekb/prime_o/info.json | 91 ++- keyboards/primekb/prime_o/prime_o.h | 38 - keyboards/primekb/prime_r/info.json | 82 ++- keyboards/primekb/prime_r/prime_r.h | 35 - keyboards/q4z/info.json | 88 +-- keyboards/q4z/q4z.h | 34 - keyboards/quantrik/kyuu/info.json | 152 ++-- keyboards/quantrik/kyuu/kyuu.h | 41 -- keyboards/quarkeys/z40/info.json | 102 +-- keyboards/quarkeys/z40/z40.c | 2 +- keyboards/quarkeys/z40/z40.h | 29 - keyboards/quarkeys/z67/hotswap/hotswap.h | 32 - keyboards/quarkeys/z67/hotswap/info.json | 147 ++-- keyboards/quarkeys/z67/solder/info.json | 155 ++-- keyboards/quarkeys/z67/solder/solder.h | 31 - keyboards/qwertyydox/info.json | 113 +-- keyboards/qwertyydox/rev1/rev1.h | 20 - keyboards/rabbit/rabbit68/info.json | 140 ++-- keyboards/rabbit/rabbit68/rabbit68.h | 41 -- keyboards/rainkeebs/rainkeeb/info.json | 90 +-- keyboards/rainkeebs/rainkeeb/rainkeeb.h | 34 - keyboards/rainkeebs/yasui/info.json | 46 +- keyboards/rainkeebs/yasui/yasui.h | 30 - keyboards/rate/pistachio/info.json | 105 +-- keyboards/rate/pistachio/rev1/info.json | 124 +++- keyboards/rate/pistachio/rev1/rev1.h | 58 -- keyboards/rate/pistachio/rev2/info.json | 124 +++- keyboards/rate/pistachio/rev2/rev2.h | 58 -- keyboards/rate/pistachio_mp/info.json | 36 +- keyboards/rate/pistachio_mp/pistachio_mp.h | 48 -- keyboards/rate/pistachio_pro/info.json | 188 ++--- keyboards/rate/pistachio_pro/pistachio_pro.h | 42 -- keyboards/recompile_keys/choco60/choco60.h | 46 -- keyboards/recompile_keys/choco60/info.json | 76 +- keyboards/recompile_keys/cocoa40/cocoa40.h | 44 -- keyboards/recompile_keys/cocoa40/info.json | 56 +- keyboards/recompile_keys/mio/info.json | 89 +-- keyboards/recompile_keys/mio/mio.h | 44 -- keyboards/recompile_keys/nomu30/info.json | 192 +---- keyboards/recompile_keys/nomu30/nomu30.h | 29 - keyboards/redox/rev1/info.json | 144 ++-- keyboards/redox/rev1/rev1.h | 23 - keyboards/redox_media/info.json | 152 ++-- keyboards/redox_media/redox_media.c | 2 +- keyboards/redox_media/redox_media.h | 69 -- keyboards/redox_w/info.json | 144 ++-- keyboards/redox_w/redox_w.h | 18 - keyboards/reviung/reviung33/info.json | 72 +- keyboards/reviung/reviung33/reviung33.h | 40 -- keyboards/reviung/reviung39/info.json | 78 +- keyboards/reviung/reviung39/reviung39.h | 42 -- keyboards/reviung/reviung41/info.json | 82 +-- keyboards/reviung/reviung41/reviung41.h | 42 -- keyboards/reviung/reviung53/info.json | 110 +-- keyboards/reviung/reviung53/reviung53.h | 30 - keyboards/rgbkb/mun/rev1/info.json | 189 ++--- keyboards/rgbkb/mun/rev1/rev1.h | 30 - keyboards/rgbkb/sol/rev1/info.json | 159 +++-- keyboards/rgbkb/sol/rev2/info.json | 159 +++-- keyboards/rgbkb/sol/sol.h | 23 - keyboards/rgbkb/sol3/rev1/info.json | 188 ++--- keyboards/rgbkb/sol3/rev1/rev1.h | 51 -- keyboards/rgbkb/zen/rev1/info.json | 74 +- keyboards/rgbkb/zen/rev1/rev1.h | 23 - keyboards/rgbkb/zen/rev2/info.json | 427 ++--------- keyboards/rgbkb/zen/rev2/rev2.c | 2 +- keyboards/rgbkb/zen/rev2/rev2.h | 24 - keyboards/ristretto/info.json | 103 +-- keyboards/ristretto/ristretto.c | 2 +- keyboards/ristretto/ristretto.h | 31 - keyboards/rominronin/katana60/rev1/info.json | 144 ++-- keyboards/rominronin/katana60/rev1/rev1.h | 37 - keyboards/roseslite/info.json | 174 ++--- keyboards/roseslite/roseslite.h | 42 -- keyboards/rpiguy9907/southpaw66/info.json | 138 ++-- keyboards/rpiguy9907/southpaw66/southpaw66.h | 37 - keyboards/runes/vaengr/info.json | 122 ++-- keyboards/runes/vaengr/vaengr.h | 41 -- keyboards/rura66/rev1/info.json | 80 ++- keyboards/rura66/rev1/rev1.h | 28 - keyboards/ryanbaekr/rb69/info.json | 136 ++-- keyboards/ryanbaekr/rb69/rb69.h | 35 - keyboards/ryanbaekr/rb86/info.json | 99 ++- keyboards/ryanbaekr/rb86/rb86.h | 37 - keyboards/ryanbaekr/rb87/info.json | 103 ++- keyboards/ryanbaekr/rb87/rb87.h | 37 - keyboards/salicylic_acid3/7skb/rev1/info.json | 135 ++-- keyboards/salicylic_acid3/7skb/rev1/rev1.h | 40 -- keyboards/salicylic_acid3/7splus/7splus.h | 61 -- keyboards/salicylic_acid3/7splus/info.json | 184 ++--- keyboards/salicylic_acid3/ajisai74/ajisai74.h | 54 -- keyboards/salicylic_acid3/ajisai74/info.json | 159 +++-- .../salicylic_acid3/ergoarrows/ergoarrows.h | 59 -- .../salicylic_acid3/ergoarrows/info.json | 153 ++-- .../salicylic_acid3/getta25/rev1/info.json | 55 +- keyboards/salicylic_acid3/getta25/rev1/rev1.h | 35 - .../salicylic_acid3/jisplit89/rev1/info.json | 194 ++--- .../salicylic_acid3/jisplit89/rev1/rev1.h | 61 -- keyboards/salicylic_acid3/nknl7en/info.json | 156 ++-- keyboards/salicylic_acid3/nknl7en/nknl7en.h | 54 -- keyboards/salicylic_acid3/nknl7jp/info.json | 159 +++-- keyboards/salicylic_acid3/nknl7jp/nknl7jp.h | 54 -- keyboards/sam/s80/info.json | 193 ++--- keyboards/sam/s80/s80.h | 43 -- keyboards/satt/comet46/comet46.h | 21 - keyboards/satt/comet46/info.json | 96 +-- .../satt/comet46/lib/host_led_state_reader.c | 2 +- .../satt/comet46/lib/modifier_state_reader.c | 2 +- keyboards/satt/vision/info.json | 60 +- keyboards/satt/vision/vision.h | 31 - keyboards/scatter42/info.json | 259 ++----- keyboards/scatter42/scatter42.h | 44 -- keyboards/sekigon/grs_70ec/grs_70ec.h | 27 - keyboards/sekigon/grs_70ec/info.json | 150 ++-- keyboards/sendyyeah/bevi/bevi.h | 38 - keyboards/sendyyeah/bevi/info.json | 160 ++--- keyboards/senselessclay/gos65/gos65.c | 2 +- keyboards/senselessclay/gos65/gos65.h | 35 - keyboards/senselessclay/gos65/info.json | 77 +- keyboards/sets3n/kk980/info.json | 216 +++--- keyboards/sets3n/kk980/kk980.h | 54 -- keyboards/shambles/info.json | 60 +- keyboards/shambles/keymaps/default/keymap.c | 2 +- keyboards/shambles/shambles.h | 15 - keyboards/shapeshifter4060/info.json | 100 +-- keyboards/shapeshifter4060/shapeshifter4060.h | 34 - keyboards/shoc/info.json | 128 ++-- keyboards/shoc/shoc.h | 38 - keyboards/sidderskb/majbritt/rev1/info.json | 148 ++-- keyboards/sidderskb/majbritt/rev1/rev1.h | 35 - keyboards/sidderskb/majbritt/rev2/info.json | 150 ++-- keyboards/sidderskb/majbritt/rev2/rev2.h | 41 -- keyboards/silverbullet44/info.json | 88 +-- keyboards/silverbullet44/silverbullet44.c | 2 +- keyboards/silverbullet44/silverbullet44.h | 43 -- keyboards/sirius/uni660/rev1/info.json | 182 +++-- keyboards/sirius/uni660/rev1/rev1.h | 19 - keyboards/slz40/info.json | 123 ++-- keyboards/slz40/slz40.h | 41 -- keyboards/sneakbox/disarray/ortho/info.json | 100 ++- keyboards/sneakbox/disarray/ortho/ortho.h | 36 - .../sneakbox/disarray/staggered/info.json | 92 ++- .../sneakbox/disarray/staggered/staggered.h | 35 - keyboards/soda/cherish/cherish.h | 38 - keyboards/soda/cherish/info.json | 167 ++--- keyboards/soda/pocket/info.json | 70 +- keyboards/soda/pocket/pocket.c | 2 +- keyboards/soda/pocket/pocket.h | 39 - keyboards/sofle/keyhive/info.json | 74 +- keyboards/sofle/keyhive/keyhive.h | 46 -- keyboards/sofle/rev1/info.json | 74 +- keyboards/sofle/rev1/rev1.c | 2 +- keyboards/sofle/rev1/rev1.h | 23 - keyboards/sowbug/68keys/info.json | 4 +- keyboards/spaceman/yun65/info.json | 79 +- keyboards/spaceman/yun65/yun65.h | 32 - keyboards/spacetime/info.json | 106 +-- keyboards/spacetime/rev1/rev1.h | 26 - keyboards/spacetime/rev2/rev2.h | 26 - keyboards/spacey/info.json | 140 ++-- keyboards/spacey/spacey.c | 17 - keyboards/spacey/spacey.h | 41 -- keyboards/sparrow62/info.json | 129 ++-- keyboards/sparrow62/sparrow62.h | 54 -- keyboards/spiderisland/split78/info.json | 167 +++-- keyboards/spiderisland/split78/matrix.c | 1 - keyboards/spiderisland/split78/split78.h | 36 - keyboards/splitography/info.json | 315 ++------ keyboards/splitography/splitography.h | 33 - keyboards/splitty/info.json | 133 ++-- keyboards/splitty/rev1/rev1.h | 40 -- keyboards/splitty/splitty.c | 2 +- keyboards/splitty/splitty.h | 23 - keyboards/star75/info.json | 165 ++--- keyboards/star75/star75.h | 41 -- keyboards/stello65/hs_rev1/hs_rev1.h | 35 - keyboards/stello65/hs_rev1/info.json | 74 +- keyboards/stello65/sl_rev1/info.json | 76 +- keyboards/stello65/sl_rev1/sl_rev1.h | 35 - keyboards/stenokeyboards/the_uni/info.json | 34 - .../the_uni/pro_micro/info.json | 41 +- .../the_uni/pro_micro/pro_micro.h | 30 - .../stenokeyboards/the_uni/rp_2040/info.json | 41 +- .../stenokeyboards/the_uni/rp_2040/rp_2040.h | 30 - .../stenokeyboards/the_uni/usb_c/info.json | 41 +- .../stenokeyboards/the_uni/usb_c/usb_c.h | 30 - keyboards/system76/launch_1/info.json | 180 ++--- keyboards/system76/launch_1/launch_1.c | 2 +- keyboards/system76/launch_1/launch_1.h | 38 - .../center_enter/center_enter.h | 37 - .../takashicompany/center_enter/info.json | 70 +- keyboards/takashicompany/compacx/compacx.c | 2 +- keyboards/takashicompany/compacx/compacx.h | 46 -- keyboards/takashicompany/compacx/info.json | 377 ++-------- keyboards/takashicompany/dogtag/dogtag.c | 2 +- keyboards/takashicompany/dogtag/dogtag.h | 40 -- keyboards/takashicompany/dogtag/info.json | 115 +-- .../takashicompany/endzone34/endzone34.c | 2 +- .../takashicompany/endzone34/endzone34.h | 39 - keyboards/takashicompany/endzone34/info.json | 73 +- .../takashicompany/heavy_left/heavy_left.h | 46 -- keyboards/takashicompany/heavy_left/info.json | 599 +++------------- keyboards/takashicompany/minizone/info.json | 80 ++- keyboards/takashicompany/minizone/minizone.c | 2 +- keyboards/takashicompany/minizone/minizone.h | 30 - keyboards/takashicompany/qoolee/info.json | 72 +- keyboards/takashicompany/qoolee/qoolee.h | 37 - keyboards/takashicompany/radialex/info.json | 233 ++---- keyboards/takashicompany/radialex/radialex.h | 42 -- keyboards/takashiski/hecomi/alpha/info.json | 428 ++--------- keyboards/takashiski/hecomi/hecomi.h | 69 -- .../takashiski/otaku_split/rev0/info.json | 83 ++- keyboards/takashiski/otaku_split/rev0/rev0.h | 48 -- .../takashiski/otaku_split/rev1/info.json | 85 ++- keyboards/takashiski/otaku_split/rev1/rev1.h | 47 -- keyboards/taleguers/taleguers75/info.json | 511 +++---------- keyboards/taleguers/taleguers75/taleguers75.c | 17 - keyboards/taleguers/taleguers75/taleguers75.h | 35 - keyboards/team0110/p1800fl/info.json | 183 ++--- keyboards/team0110/p1800fl/p1800fl.c | 2 +- keyboards/team0110/p1800fl/p1800fl.h | 42 -- keyboards/technika/info.json | 110 +-- keyboards/technika/technika.c | 2 +- keyboards/technika/technika.h | 34 - keyboards/tg4x/info.json | 54 +- keyboards/tg4x/tg4x.h | 21 - keyboards/thevankeyboards/caravan/caravan.h | 15 - keyboards/thevankeyboards/caravan/info.json | 95 +-- keyboards/thevankeyboards/jetvan/info.json | 50 +- keyboards/thevankeyboards/jetvan/jetvan.h | 29 - keyboards/tkc/candybar/lefty/info.json | 70 +- keyboards/tkc/candybar/lefty/lefty.h | 31 - keyboards/tkc/candybar/lefty_r3/info.json | 70 +- keyboards/tkc/candybar/lefty_r3/lefty_r3.h | 31 - keyboards/tkc/candybar/righty/info.json | 71 +- keyboards/tkc/candybar/righty/righty.h | 30 - keyboards/tkc/candybar/righty_r3/info.json | 71 +- keyboards/tkc/candybar/righty_r3/righty_r3.h | 30 - keyboards/tkc/godspeed75/godspeed75.h | 40 -- keyboards/tkc/godspeed75/info.json | 92 ++- keyboards/tkc/tkc1800/info.json | 231 +++--- keyboards/tkc/tkc1800/tkc1800.c | 2 +- keyboards/tkc/tkc1800/tkc1800.h | 36 - keyboards/tkw/grandiceps/grandiceps.h | 38 - keyboards/tkw/grandiceps/info.json | 74 +- keyboards/toffee_studio/blueberry/blueberry.h | 37 - keyboards/toffee_studio/blueberry/info.json | 425 ++--------- keyboards/tominabox1/adalyn/adalyn.h | 33 - keyboards/tominabox1/adalyn/info.json | 48 +- keyboards/tominabox1/le_chiffre/he/he.c | 2 +- keyboards/tominabox1/le_chiffre/he/he.h | 33 - keyboards/tominabox1/le_chiffre/he/info.json | 49 +- keyboards/tominabox1/le_chiffre/info.json | 8 - .../tominabox1/le_chiffre/rev1/info.json | 49 +- keyboards/tominabox1/le_chiffre/rev1/rev1.c | 2 +- keyboards/tominabox1/le_chiffre/rev1/rev1.h | 33 - .../tominabox1/le_chiffre/rev2/info.json | 49 +- keyboards/tominabox1/le_chiffre/rev2/rev2.c | 2 +- keyboards/tominabox1/le_chiffre/rev2/rev2.h | 33 - keyboards/tronguylabs/m122_3270/info.json | 288 ++++---- keyboards/tronguylabs/m122_3270/m122_3270.h | 40 -- keyboards/tszaboo/ortho4exent/info.json | 147 ++-- keyboards/tszaboo/ortho4exent/ortho4exent.h | 41 -- keyboards/tunks/ergo33/ergo33.h | 57 -- keyboards/tunks/ergo33/info.json | 45 +- keyboards/ubest/vn/info.json | 144 ++-- keyboards/ubest/vn/vn.h | 35 - keyboards/unikeyboard/diverge3/diverge3.h | 42 -- keyboards/unikeyboard/diverge3/info.json | 84 ++- keyboards/uranuma/info.json | 97 +-- keyboards/uranuma/uranuma.h | 26 - keyboards/uzu42/rev1/info.json | 91 +-- keyboards/uzu42/rev1/rev1.h | 23 - keyboards/uzu42/uzu42.c | 2 +- keyboards/uzu42/uzu42.h | 10 - keyboards/v4n4g0rth0n/info.json | 101 +-- keyboards/v4n4g0rth0n/v4n4g0rth0n.h | 43 -- keyboards/viktus/at101_bh/at101_bh.h | 25 - keyboards/viktus/at101_bh/info.json | 232 +++--- keyboards/viktus/omnikey_bh/info.json | 131 +++- keyboards/viktus/omnikey_bh/omnikey_bh.h | 19 - keyboards/walletburner/neuron/info.json | 47 +- keyboards/walletburner/neuron/neuron.h | 16 - keyboards/waterfowl/info.json | 84 +-- keyboards/waterfowl/waterfowl.c | 2 +- keyboards/waterfowl/waterfowl.h | 44 -- keyboards/weirdo/ls_60/info.json | 134 ++-- keyboards/weirdo/ls_60/ls_60.c | 2 +- keyboards/weirdo/ls_60/ls_60.h | 30 - keyboards/weirdo/naiping/npminila/info.json | 136 ++-- keyboards/weirdo/naiping/npminila/npminila.h | 30 - keyboards/weirdo/tiger910/info.json | 135 ++-- keyboards/weirdo/tiger910/tiger910.h | 33 - keyboards/westfoxtrot/cyclops/cyclops.h | 43 -- keyboards/westfoxtrot/cyclops/info.json | 136 ++-- .../wilba_tech/rama_works_m50_a/info.json | 61 +- .../rama_works_m50_a/rama_works_m50_a.h | 23 - .../wilba_tech/rama_works_m50_ax/info.json | 62 +- .../rama_works_m50_ax/rama_works_m50_ax.h | 33 - keyboards/wolf/kuku65/info.json | 348 ++------- keyboards/wolf/kuku65/kuku65.h | 32 - keyboards/wolf/ryujin/info.json | 76 +- keyboards/wolf/ryujin/ryujin.h | 32 - keyboards/wolf/sabre/info.json | 201 +++--- keyboards/wolf/sabre/sabre.h | 63 -- keyboards/wolfmarkclub/wm1/info.json | 85 ++- keyboards/wolfmarkclub/wm1/wm1.c | 2 +- keyboards/wolfmarkclub/wm1/wm1.h | 34 - keyboards/wren/info.json | 203 +++--- keyboards/wren/wren.c | 2 +- keyboards/wren/wren.h | 46 -- keyboards/wsk/alpha9/alpha9.h | 30 - keyboards/wsk/alpha9/info.json | 47 +- keyboards/wsk/g4m3ralpha/g4m3ralpha.c | 2 +- keyboards/wsk/g4m3ralpha/g4m3ralpha.h | 32 - keyboards/wsk/g4m3ralpha/info.json | 39 +- keyboards/wsk/gothic50/gothic50.h | 24 - keyboards/wsk/gothic50/info.json | 67 +- keyboards/wsk/gothic70/gothic70.h | 41 -- keyboards/wsk/gothic70/info.json | 86 ++- keyboards/wsk/houndstooth/houndstooth.h | 20 - keyboards/wsk/houndstooth/info.json | 58 +- keyboards/wsk/jerkin/info.json | 46 +- keyboards/wsk/jerkin/jerkin.h | 13 - keyboards/wsk/kodachi50/info.json | 60 +- keyboards/wsk/kodachi50/kodachi50.h | 20 - keyboards/wsk/pain27/info.json | 54 +- keyboards/wsk/pain27/pain27.h | 14 - keyboards/wsk/tkl30/info.json | 88 +-- keyboards/wsk/tkl30/tkl30.h | 14 - keyboards/wuque/creek70/creek70.h | 49 -- keyboards/wuque/creek70/info.json | 164 ++--- keyboards/wuque/tata80/wk/info.json | 185 ++--- keyboards/wuque/tata80/wk/wk.h | 44 -- keyboards/wuque/tata80/wkl/info.json | 179 ++--- keyboards/wuque/tata80/wkl/wkl.h | 44 -- keyboards/xbows/knight/info.json | 195 ++--- keyboards/xbows/knight/knight.c | 2 +- keyboards/xbows/knight/knight.h | 33 - keyboards/xbows/knight_plus/info.json | 195 ++--- keyboards/xbows/knight_plus/knight_plus.c | 2 +- keyboards/xbows/knight_plus/knight_plus.h | 33 - keyboards/xbows/nature/info.json | 193 ++--- keyboards/xbows/nature/nature.c | 2 +- keyboards/xbows/nature/nature.h | 33 - keyboards/xbows/woody/info.json | 74 +- keyboards/xbows/woody/woody.c | 2 +- keyboards/xbows/woody/woody.h | 16 - keyboards/xenon/info.json | 113 +-- keyboards/xenon/xenon.c | 2 +- keyboards/xenon/xenon.h | 40 -- keyboards/yandrstudio/buff67v3/buff67v3.c | 2 +- keyboards/yandrstudio/buff67v3/buff67v3.h | 32 - keyboards/yandrstudio/buff67v3/info.json | 419 ++--------- keyboards/yandrstudio/eau87/eau87.h | 34 - keyboards/yandrstudio/eau87/info.json | 549 +++----------- keyboards/yandrstudio/eau_r2/eau_r2.c | 2 +- keyboards/yandrstudio/eau_r2/eau_r2.h | 35 - keyboards/yandrstudio/eau_r2/info.json | 524 +++----------- keyboards/yandrstudio/nightstar75/info.json | 496 +++---------- .../yandrstudio/nightstar75/nightstar75.c | 2 +- .../yandrstudio/nightstar75/nightstar75.h | 33 - keyboards/yandrstudio/nz64/info.json | 71 +- keyboards/yandrstudio/nz64/nz64.h | 14 - keyboards/yandrstudio/tg67/info.json | 419 ++--------- keyboards/yandrstudio/tg67/tg67.c | 2 +- keyboards/yandrstudio/tg67/tg67.h | 33 - keyboards/yandrstudio/wave75/info.json | 507 +++---------- keyboards/yandrstudio/wave75/wave75.h | 34 - keyboards/yandrstudio/yr80/info.json | 105 ++- keyboards/yandrstudio/yr80/yr80.c | 2 +- keyboards/yandrstudio/yr80/yr80.h | 35 - keyboards/yandrstudio/zhou65/info.json | 75 +- keyboards/yandrstudio/zhou65/zhou65.h | 32 - keyboards/ydkb/just60/info.json | 132 ++-- keyboards/ydkb/just60/just60.h | 41 -- keyboards/ymdk/sp64/info.json | 143 ++-- keyboards/ymdk/sp64/sp64.h | 42 -- keyboards/ymdk/ymd67/info.json | 138 ++-- keyboards/ymdk/ymd67/ymd67.h | 17 - keyboards/yosino58/rev1/info.json | 76 +- keyboards/yosino58/rev1/rev1.h | 23 - keyboards/yushakobo/navpad/10/info.json | 15 +- keyboards/yushakobo/navpad/10/rev0/info.json | 49 +- keyboards/yushakobo/navpad/10/rev0/rev0.h | 25 - keyboards/yushakobo/navpad/10/rev1/info.json | 49 +- keyboards/yushakobo/navpad/10/rev1/rev1.h | 25 - .../yushakobo/navpad/10_helix_r/10_helix_r.h | 50 -- .../yushakobo/navpad/10_helix_r/info.json | 84 ++- .../10_helix_r/keymaps/default/keymap.c | 2 + keyboards/yynmt/kagamidget/info.json | 55 +- keyboards/yynmt/kagamidget/kagamidget.h | 39 - users/vnmm/vnmm.h | 21 - 1443 files changed, 45440 insertions(+), 60153 deletions(-) delete mode 100644 keyboards/25keys/aleth42/rev0/rev0.h delete mode 100644 keyboards/25keys/aleth42/rev1/rev1.h delete mode 100644 keyboards/30wer/30wer.h delete mode 100644 keyboards/3w6/rev1/rev1.h delete mode 100644 keyboards/3w6/rev2/rev2.h delete mode 100644 keyboards/4pplet/waffling60/rev_a/rev_a.h delete mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c delete mode 100644 keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h delete mode 100644 keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c delete mode 100644 keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h delete mode 100644 keyboards/abacus/abacus.h delete mode 100644 keyboards/acheron/elongate/beta/beta.h delete mode 100644 keyboards/ada/ada1800mini/ada1800mini.h delete mode 100644 keyboards/ada/infinity81/infinity81.h delete mode 100644 keyboards/adelheid/adelheid.h delete mode 100644 keyboards/adm42/adm42.h delete mode 100644 keyboards/adpenrose/kintsugi/kintsugi.h delete mode 100644 keyboards/afternoonlabs/breeze/rev0/rev0.h delete mode 100644 keyboards/afternoonlabs/breeze/rev1/rev1.h delete mode 100644 keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h delete mode 100644 keyboards/afternoonlabs/southern_breeze/rev1/rev1.h delete mode 100644 keyboards/afternoonlabs/summer_breeze/rev1/rev1.h delete mode 100644 keyboards/ai03/jp60/jp60.h delete mode 100644 keyboards/ai03/lunar/lunar.h delete mode 100644 keyboards/ai03/orbit_x/orbit_x.h delete mode 100644 keyboards/ai03/quasar/quasar.h delete mode 100644 keyboards/ai03/voyager60_alps/voyager60_alps.h delete mode 100644 keyboards/akb/eb46/eb46.h delete mode 100644 keyboards/akb/raine/raine.h delete mode 100644 keyboards/aleblazer/zodiark/zodiark.h delete mode 100644 keyboards/alf/x11/x11.h delete mode 100755 keyboards/alpha/alpha.h delete mode 100644 keyboards/alpine65/alpine65.h delete mode 100644 keyboards/amjkeyboard/amj84/amj84.h delete mode 100644 keyboards/arabica37/rev1/rev1.h delete mode 100644 keyboards/arisu/arisu.h delete mode 100644 keyboards/at_at/660m/660m.h delete mode 100644 keyboards/atlantis/ak81_ve/ak81_ve.h delete mode 100644 keyboards/atlas_65/atlas_65.h delete mode 100644 keyboards/atreus62/atreus62.h delete mode 100644 keyboards/atreyu/rev1/rev1.h delete mode 100644 keyboards/atreyu/rev2/rev2.h delete mode 100644 keyboards/avalanche/v1/v1.h delete mode 100644 keyboards/avalanche/v2/v2.h delete mode 100644 keyboards/avalanche/v3/v3.h delete mode 100644 keyboards/avalanche/v4/v4.h delete mode 100644 keyboards/axolstudio/yeti/hotswap/hotswap.h delete mode 100644 keyboards/aya/aya.h delete mode 100644 keyboards/b_sides/rev41lp/rev41lp.h delete mode 100644 keyboards/bantam44/bantam44.h delete mode 100644 keyboards/basekeys/trifecta/trifecta.h delete mode 100644 keyboards/bastardkb/charybdis/3x5/3x5.h delete mode 100644 keyboards/bastardkb/charybdis/3x6/3x6.h delete mode 100644 keyboards/bastardkb/charybdis/4x6/4x6.h delete mode 100644 keyboards/blank_tehnologii/manibus/manibus.h delete mode 100644 keyboards/blockboy/ac980mini/ac980mini.h delete mode 100644 keyboards/blockey/blockey.h delete mode 100644 keyboards/bop/bop.h delete mode 100644 keyboards/box75/box75.h delete mode 100755 keyboards/bpiphany/hid_liber/hid_liber.h delete mode 100644 keyboards/bubble75/hotswap/hotswap.h delete mode 100644 keyboards/canary/canary60rgb/canary60rgb.h delete mode 100644 keyboards/cannonkeys/crin/crin.h delete mode 100644 keyboards/chocofly/v1/v1.h delete mode 100644 keyboards/ck60i/ck60i.c delete mode 100644 keyboards/ck60i/ck60i.h delete mode 100644 keyboards/clawsome/hatchback/hatchback.h delete mode 100644 keyboards/clawsome/roadster/roadster.h delete mode 100644 keyboards/clawsome/suv/suv.h delete mode 100644 keyboards/clickety_split/leeloo/rev1/rev1.h delete mode 100644 keyboards/cmm_studio/fuji65/fuji65.h delete mode 100644 keyboards/compound/compound.h delete mode 100644 keyboards/converter/hp_46010a/hp_46010a.h delete mode 100644 keyboards/converter/modelm101/modelm101.h delete mode 100644 keyboards/converter/modelm101_teensy2/modelm101_teensy2.h delete mode 100644 keyboards/converter/palm_usb/stowaway/stowaway.h delete mode 100644 keyboards/converter/periboard_512/periboard_512.h delete mode 100644 keyboards/converter/siemens_tastatur/siemens_tastatur.h delete mode 100644 keyboards/converter/sun_usb/type3/type3.h delete mode 100644 keyboards/cool836a/cool836a.h delete mode 100644 keyboards/coseyfannitutti/mullet/mullet.h delete mode 100644 keyboards/cosmo65/cosmo65.h delete mode 100644 keyboards/cozykeys/bloomer/v2/v2.h delete mode 100644 keyboards/cozykeys/bloomer/v3/v3.h delete mode 100644 keyboards/cozykeys/speedo/v2/v2.h delete mode 100644 keyboards/cozykeys/speedo/v3/v3.h delete mode 100644 keyboards/custommk/evo70/evo70.h create mode 100644 keyboards/dailycraft/bat43/rev1/info.json delete mode 100644 keyboards/dailycraft/bat43/rev1/rev1.h create mode 100644 keyboards/dailycraft/bat43/rev2/info.json delete mode 100644 keyboards/dailycraft/bat43/rev2/rev2.h delete mode 100644 keyboards/dailycraft/claw44/rev1/rev1.h delete mode 100644 keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h delete mode 100644 keyboards/db/db63/db63.h delete mode 100644 keyboards/delikeeb/vanana/rev1/rev1.h delete mode 100644 keyboards/delikeeb/vanana/rev2/rev2.h delete mode 100644 keyboards/deng/djam/djam.h delete mode 100644 keyboards/dm9records/ergoinu/ergoinu.h delete mode 100644 keyboards/doppelganger/doppelganger.h delete mode 100644 keyboards/draculad/draculad.h delete mode 100644 keyboards/drhigsby/dubba175/dubba175.h delete mode 100644 keyboards/dtisaac/cg108/cg108.h delete mode 100644 keyboards/dtisaac/dosa40rgb/dosa40rgb.h delete mode 100644 keyboards/dtisaac/dtisaac01/dtisaac01.h delete mode 100644 keyboards/duck/lightsaver/lightsaver.h delete mode 100644 keyboards/dztech/dz60rgb/dz60rgb.h delete mode 100644 keyboards/eason/aeroboard/aeroboard.h delete mode 100644 keyboards/eco/rev1/rev1.h delete mode 100644 keyboards/eco/rev2/rev2.h delete mode 100644 keyboards/edc40/edc40.h delete mode 100644 keyboards/edinburgh41/edinburgh41.h delete mode 100644 keyboards/ein_60/ein_60.h delete mode 100644 keyboards/elephant42/elephant42.h delete mode 100644 keyboards/emajesty/eiri/eiri.h delete mode 100644 keyboards/emptystring/nqg/nqg.h delete mode 100644 keyboards/ep/40/40.h delete mode 100644 keyboards/ep/96/96.h delete mode 100644 keyboards/ep/comsn/hs68/hs68.h delete mode 100644 keyboards/ep/comsn/mollydooker/mollydooker.h delete mode 100644 keyboards/ep/comsn/tf_longeboye/tf_longeboye.h delete mode 100644 keyboards/ergotravel/rev1/rev1.h delete mode 100644 keyboards/esca/getawayvan/getawayvan.h delete mode 100644 keyboards/esca/getawayvan_f042/getawayvan_f042.h delete mode 100644 keyboards/eternal_keypad/eternal_keypad.h delete mode 100644 keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h delete mode 100644 keyboards/evil80/evil80.h delete mode 100644 keyboards/exclusive/e7v1se/e7v1se.h delete mode 100644 keyboards/fc660c/fc660c.h delete mode 100644 keyboards/fc980c/fc980c.h delete mode 100644 keyboards/feker/ik75/ik75.h delete mode 100644 keyboards/ffkeebs/siris/siris.h delete mode 100644 keyboards/fluorite/fluorite.h delete mode 100644 keyboards/flx/virgo/virgo.h delete mode 100644 keyboards/flxlb/zplit/zplit.h delete mode 100644 keyboards/foostan/cornelius/cornelius.h delete mode 100644 keyboards/fortitude60/rev1/rev1.h delete mode 100644 keyboards/foxlab/key65/hotswap/hotswap.h delete mode 100644 keyboards/foxlab/time_re/hotswap/hotswap.h delete mode 100644 keyboards/foxlab/time_re/universal/universal.h delete mode 100644 keyboards/fr4/southpaw75/southpaw75.h delete mode 100644 keyboards/free_willy/free_willy.h delete mode 100644 keyboards/friedrich/friedrich.h delete mode 100644 keyboards/function96/v1/v1.h delete mode 100644 keyboards/fungo/rev1/rev1.h delete mode 100644 keyboards/funky40/funky40.h delete mode 100644 keyboards/gami_studio/lex60/lex60.h delete mode 100644 keyboards/gl516/a52gl/a52gl.h delete mode 100644 keyboards/gl516/j73gl/j73gl.h delete mode 100644 keyboards/gmmk/gmmk2/p65/ansi/ansi.h delete mode 100644 keyboards/gmmk/gmmk2/p65/iso/iso.h delete mode 100644 keyboards/gmmk/gmmk2/p96/ansi/ansi.h delete mode 100644 keyboards/gmmk/gmmk2/p96/iso/iso.h delete mode 100644 keyboards/gmmk/pro/rev1/ansi/ansi.h delete mode 100644 keyboards/gmmk/pro/rev1/iso/iso.h delete mode 100644 keyboards/gmmk/pro/rev2/ansi/ansi.h delete mode 100644 keyboards/gmmk/pro/rev2/iso/iso.h delete mode 100644 keyboards/gray_studio/apollo80/apollo80.h delete mode 100644 keyboards/gray_studio/cod67/cod67.h delete mode 100644 keyboards/gvalchca/ga150/ga150.h delete mode 100644 keyboards/hadron/hadron.h delete mode 100644 keyboards/halfcliff/halfcliff.h delete mode 100644 keyboards/halokeys/elemental75/elemental75.h delete mode 100644 keyboards/handwired/108key_trackpoint/108key_trackpoint.h delete mode 100644 keyboards/handwired/3dfoxc/3dfoxc.h delete mode 100644 keyboards/handwired/42/42.h delete mode 100644 keyboards/handwired/acacia/acacia.h delete mode 100644 keyboards/handwired/aek64/aek64.h delete mode 100644 keyboards/handwired/aim65/aim65.h delete mode 100644 keyboards/handwired/amigopunk/amigopunk.h delete mode 100644 keyboards/handwired/angel/angel.h delete mode 100644 keyboards/handwired/atreus50/atreus50.h delete mode 100644 keyboards/handwired/bigmac/bigmac.h delete mode 100644 keyboards/handwired/bolek/bolek.h delete mode 100644 keyboards/handwired/brain/brain.h delete mode 100644 keyboards/handwired/carpolly/carpolly.h delete mode 100644 keyboards/handwired/chiron/chiron.h delete mode 100644 keyboards/handwired/cmd60/cmd60.h delete mode 100644 keyboards/handwired/consolekeyboard/18key/18key.h delete mode 100644 keyboards/handwired/consolekeyboard/20key/20key.h delete mode 100644 keyboards/handwired/consolekeyboard/27key/27key.h delete mode 100644 keyboards/handwired/consolekeyboard/30key/30key.h delete mode 100644 keyboards/handwired/croxsplit44/croxsplit44.h delete mode 100644 keyboards/handwired/d48/d48.h delete mode 100644 keyboards/handwired/dactyl_left/dactyl_left.h delete mode 100644 keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h delete mode 100644 keyboards/handwired/dactyl_manuform/4x6/4x6.h delete mode 100644 keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h delete mode 100644 keyboards/handwired/daishi/daishi.h delete mode 100644 keyboards/handwired/dqz11n1g/dqz11n1g.h delete mode 100644 keyboards/handwired/eagleii/eagleii.h delete mode 100644 keyboards/handwired/ergocheap/ergocheap.h delete mode 100644 keyboards/handwired/evk/v1_3/v1_3.h delete mode 100644 keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h delete mode 100644 keyboards/handwired/fivethirteen/fivethirteen.h delete mode 100644 keyboards/handwired/freoduo/freoduo.h delete mode 100644 keyboards/handwired/hacked_motospeed/hacked_motospeed.h delete mode 100644 keyboards/handwired/hexon38/hexon38.h delete mode 100644 keyboards/handwired/hnah40/hnah40.h delete mode 100644 keyboards/handwired/hwpm87/hwpm87.h delete mode 100644 keyboards/handwired/ibm122m/ibm122m.h delete mode 100644 keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h delete mode 100644 keyboards/handwired/jopr/jopr.h delete mode 100644 keyboards/handwired/k8split/k8split.h delete mode 100644 keyboards/handwired/kbod/kbod.h delete mode 100644 keyboards/handwired/ks63/ks63.h delete mode 100644 keyboards/handwired/magicforce61/magicforce61.h delete mode 100644 keyboards/handwired/magicforce68/magicforce68.h delete mode 100644 keyboards/handwired/marauder/marauder.h delete mode 100644 keyboards/handwired/minorca/minorca.h delete mode 100644 keyboards/handwired/not_so_minidox/not_so_minidox.h delete mode 100644 keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h delete mode 100644 keyboards/handwired/ortho5x13/ortho5x13.h delete mode 100644 keyboards/handwired/ortho5x14/ortho5x14.h delete mode 100644 keyboards/handwired/p65rgb/p65rgb.h delete mode 100644 keyboards/handwired/pilcrow/pilcrow.h delete mode 100644 keyboards/handwired/pill60/pill60.h delete mode 100644 keyboards/handwired/prime_exl/prime_exl.h delete mode 100644 keyboards/handwired/pteron/pteron.h delete mode 100644 keyboards/handwired/pteron44/pteron44.h delete mode 100644 keyboards/handwired/retro_refit/retro_refit.h delete mode 100644 keyboards/handwired/slash/slash.h delete mode 100644 keyboards/handwired/space_oddity/space_oddity.h delete mode 100644 keyboards/handwired/split65/promicro/promicro.h delete mode 100644 keyboards/handwired/split65/stm32/stm32.h delete mode 100644 keyboards/handwired/stef9998/split_5x7/rev1/rev1.h delete mode 100644 keyboards/handwired/swiftrax/beegboy/beegboy.h delete mode 100644 keyboards/handwired/swiftrax/pandamic/pandamic.h delete mode 100644 keyboards/handwired/swiftrax/unsplit/unsplit.h delete mode 100644 keyboards/handwired/symmetric70_proto/symmetric70_proto.h delete mode 100644 keyboards/handwired/t111/t111.h delete mode 100644 keyboards/handwired/terminus_mini/terminus_mini.h delete mode 100644 keyboards/handwired/traveller/traveller.h delete mode 100644 keyboards/handwired/tsubasa/tsubasa.h delete mode 100644 keyboards/handwired/twadlee/tp69/tp69.h delete mode 100644 keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h delete mode 100644 keyboards/handwired/unk/rev1/rev1.h delete mode 100644 keyboards/handwired/videowriter/videowriter.h delete mode 100644 keyboards/handwired/xealous/rev1/rev1.h delete mode 100644 keyboards/handwired/z150/z150.h delete mode 100644 keyboards/handwired/zergo/zergo.h delete mode 100644 keyboards/heliar/wm1_hotswap/wm1_hotswap.h delete mode 100644 keyboards/hfdkb/keyboard_sw/k83/k83.h delete mode 100644 keyboards/hhkb/ansi/ansi.h delete mode 100644 keyboards/hhkb_lite_2/hhkb_lite_2.h delete mode 100644 keyboards/hidtech/bastyl/bastyl.h delete mode 100644 keyboards/hillside/46/0_1/0_1.h delete mode 100644 keyboards/hillside/48/0_1/0_1.h delete mode 100644 keyboards/hillside/52/0_1/0_1.h delete mode 100644 keyboards/holyswitch/southpaw75/southpaw75.h delete mode 100644 keyboards/horizon/horizon.h delete mode 100644 keyboards/horrortroll/lemon40/lemon40.h delete mode 100644 keyboards/hp69/hp69.h delete mode 100644 keyboards/huytbt/h50/h50.h delete mode 100644 keyboards/ibnuda/gurindam/gurindam.h delete mode 100644 keyboards/idobao/id96/id96.h delete mode 100644 keyboards/jc65/v32a/v32a.h delete mode 100644 keyboards/jc65/v32u4/v32u4.h delete mode 100644 keyboards/jd40/jd40.h delete mode 100644 keyboards/jd45/jd45.h delete mode 100644 keyboards/jiran/rev1/rev1.h delete mode 100644 keyboards/jiran/rev2/rev2.h delete mode 100644 keyboards/jones/v1/v1.h delete mode 100644 keyboards/jorne/rev1/rev1.h delete mode 100644 keyboards/k34/k34.h delete mode 100644 keyboards/kabedon/kabedon78s/kabedon78s.h delete mode 100644 keyboards/kabedon/kabedon980/kabedon980.h delete mode 100644 keyboards/kabedon/kabedon98e/kabedon98e.h delete mode 100644 keyboards/kagizaraya/halberd/halberd.h delete mode 100644 keyboards/kagizaraya/scythe/scythe.h delete mode 100644 keyboards/kakunpc/angel64/alpha/alpha.h delete mode 100644 keyboards/kakunpc/suihankey/alpha/alpha.h delete mode 100644 keyboards/kakunpc/suihankey/rev1/rev1.h delete mode 100644 keyboards/kapl/rev1/rev1.h delete mode 100644 keyboards/kb58/kb58.h delete mode 100644 keyboards/kb_elmo/aek2_usb/aek2_usb.h delete mode 100644 keyboards/kb_elmo/m0110a_usb/m0110a_usb.h delete mode 100644 keyboards/kb_elmo/m0116_usb/m0116_usb.h delete mode 100644 keyboards/kbdfans/bella/rgb/rgb.h delete mode 100644 keyboards/kbdfans/bella/rgb_iso/rgb_iso.h delete mode 100644 keyboards/kbdfans/kbd6x/kbd6x.h delete mode 100644 keyboards/kbdfans/kbdmini/kbdmini.h delete mode 100755 keyboards/kbdfans/maja/maja.h delete mode 100755 keyboards/kbdfans/maja_soldered/maja_soldered.h delete mode 100644 keyboards/kbdfans/odin/v2/v2.h delete mode 100644 keyboards/keebio/bfo9000/bfo9000.h delete mode 100644 keyboards/keebio/ergodicity/ergodicity.h delete mode 100644 keyboards/keebio/foldkb/rev1/rev1.h delete mode 100644 keyboards/keebio/fourier/fourier.h delete mode 100644 keyboards/keebio/iris/rev1/rev1.h delete mode 100644 keyboards/keebio/iris/rev1_led/rev1_led.h delete mode 100644 keyboards/keebio/iris/rev2/rev2.h delete mode 100644 keyboards/keebio/iris/rev3/rev3.h delete mode 100644 keyboards/keebio/iris/rev4/rev4.h delete mode 100644 keyboards/keebio/iris/rev5/rev5.h delete mode 100644 keyboards/keebio/iris/rev6/rev6.h delete mode 100644 keyboards/keebio/iris/rev6a/rev6a.h delete mode 100644 keyboards/keebio/iris/rev6b/rev6b.h delete mode 100644 keyboards/keebio/iris/rev7/rev7.h delete mode 100644 keyboards/keebio/laplace/laplace.h delete mode 100644 keyboards/keebio/rorschach/rev1/rev1.h delete mode 100644 keyboards/keyboardio/atreus/atreus.h delete mode 100644 keyboards/keycapsss/kimiko/rev1/rev1.h delete mode 100644 keyboards/keyhive/opus/opus.h delete mode 100644 keyboards/keyhive/smallice/smallice.h delete mode 100644 keyboards/keyhive/southpole/southpole.h delete mode 100644 keyboards/keyprez/corgi/corgi.h delete mode 100644 keyboards/keyprez/unicorn/unicorn.c delete mode 100644 keyboards/keyprez/unicorn/unicorn.h delete mode 100644 keyboards/kingly_keys/ropro/ropro.h delete mode 100644 keyboards/kiwikey/borderland/borderland.c delete mode 100644 keyboards/kiwikey/borderland/borderland.h delete mode 100755 keyboards/kmini/kmini.h delete mode 100644 keyboards/kopibeng/typ65/typ65.h delete mode 100644 keyboards/kprepublic/bm43a/bm43a.h delete mode 100755 keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h delete mode 100644 keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h delete mode 100644 keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h delete mode 100644 keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h delete mode 100644 keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h delete mode 100644 keyboards/kudox/columner/columner.h delete mode 100644 keyboards/kudox/rev1/rev1.h delete mode 100644 keyboards/kudox/rev2/rev2.h delete mode 100644 keyboards/kudox/rev3/rev3.h delete mode 100644 keyboards/kudox_full/rev1/rev1.h delete mode 100644 keyboards/kudox_game/rev1/rev1.h delete mode 100644 keyboards/kudox_game/rev2/rev2.h delete mode 100644 keyboards/ky01/ky01.h delete mode 100644 keyboards/labyrinth75/labyrinth75.h delete mode 100644 keyboards/latincompass/latin64ble/latin64ble.h delete mode 100644 keyboards/lazydesigners/bolt/bolt.h delete mode 100644 keyboards/lfkeyboards/lfk78/revb/revb.h delete mode 100644 keyboards/lime/rev1/rev1.h delete mode 100644 keyboards/majistic/majistic.h delete mode 100644 keyboards/malevolti/lyra/rev1/rev1.h delete mode 100644 keyboards/malevolti/superlyra/rev1/rev1.h delete mode 100644 keyboards/manta60/manta60.h delete mode 100644 keyboards/marksard/treadstone32/lite/lite.h delete mode 100644 keyboards/marksard/treadstone32/rev1/rev1.h delete mode 100644 keyboards/matthewdias/minim/minim.h delete mode 100644 keyboards/mechanickeys/miniashen40/miniashen40.h delete mode 100644 keyboards/mechanickeys/undead60m/undead60m.h delete mode 100644 keyboards/mechkeys/mk60/mk60.h delete mode 100644 keyboards/mechllama/g35/g35.h delete mode 100644 keyboards/mechlovin/th1800/th1800.h delete mode 100644 keyboards/mechlovin/tmkl/tmkl.h delete mode 100644 keyboards/mechstudio/dawn/dawn.h delete mode 100644 keyboards/mechwild/bbs/bbs.h delete mode 100644 keyboards/mechwild/mokulua/mirrored/mirrored.h delete mode 100644 keyboards/mechwild/mokulua/standard/standard.h delete mode 100644 keyboards/mechwild/obe/obe.c delete mode 100644 keyboards/mechwild/obe/obe.h delete mode 100644 keyboards/mechwild/waka60/waka60.c delete mode 100644 keyboards/mechwild/waka60/waka60.h delete mode 100644 keyboards/mehkee96/mehkee96.h delete mode 100755 keyboards/melgeek/tegic/tegic.h delete mode 100644 keyboards/mincedshon/ecila/ecila.h delete mode 100644 keyboards/mino_plus/mino_plus.h delete mode 100644 keyboards/mino_plus/soldered/soldered.h delete mode 100644 keyboards/mint60/mint60.h delete mode 100644 keyboards/misonoworks/chocolatebar/chocolatebar.h delete mode 100644 keyboards/misonoworks/karina/karina.h delete mode 100644 keyboards/ml/gas75/gas75.h delete mode 100644 keyboards/mmkzoo65/mmkzoo65.h delete mode 100644 keyboards/mntre/mntre.h delete mode 100644 keyboards/mokey/mokey64/mokey64.h delete mode 100755 keyboards/molecule/molecule.h delete mode 100644 keyboards/momoka_ergo/momoka_ergo.h delete mode 100644 keyboards/morizon/morizon.h delete mode 100644 keyboards/mt/mt980/mt980.h delete mode 100644 keyboards/murcielago/murcielago.h delete mode 100644 keyboards/mwstudio/alicekk/alicekk.c delete mode 100644 keyboards/mwstudio/alicekk/alicekk.h delete mode 100644 keyboards/mwstudio/mw65_rgb/mw65_rgb.h delete mode 100644 keyboards/mwstudio/mw75/mw75.h delete mode 100644 keyboards/mwstudio/mw75r2/mw75r2.h delete mode 100644 keyboards/nacly/sodium42/sodium42.h delete mode 100644 keyboards/nacly/sodium50/sodium50.h delete mode 100644 keyboards/nacly/sodium62/sodium62.h delete mode 100644 keyboards/nacly/splitreus62/splitreus62.h delete mode 100644 keyboards/nacly/ua62/ua62.h delete mode 100644 keyboards/neito/neito.h delete mode 100644 keyboards/nemui/nemui.h delete mode 100644 keyboards/nightly_boards/alter_lite/alter_lite.h delete mode 100644 keyboards/nightly_boards/conde60/conde60.h delete mode 100644 keyboards/nightly_boards/jisoo/jisoo.h delete mode 100644 keyboards/nightly_boards/ph_arisu/ph_arisu.h delete mode 100644 keyboards/nix_studio/n60_a/n60_a.h delete mode 100644 keyboards/nopunin10did/railroad/rev0/rev0.h delete mode 100644 keyboards/noxary/280/280.h delete mode 100644 keyboards/noxary/vulcan/vulcan.h delete mode 100644 keyboards/noxary/x268/x268.h delete mode 100644 keyboards/nullbitsco/tidbit/tidbit.h delete mode 100644 keyboards/numatreus/numatreus.h delete mode 100644 keyboards/ocean/addon/addon.h delete mode 100644 keyboards/ocean/gin_v2/gin_v2.h delete mode 100644 keyboards/ocean/slamz/slamz.h delete mode 100644 keyboards/ocean/wang_v2/wang_v2.h delete mode 100644 keyboards/ocean/yuri/yuri.h delete mode 100644 keyboards/oddforge/vea/vea.h delete mode 100644 keyboards/ogre/ergo_single/ergo_single.h delete mode 100644 keyboards/ogre/ergo_split/ergo_split.h delete mode 100644 keyboards/om60/om60.h delete mode 100644 keyboards/omkbd/runner3680/3x6/3x6.h delete mode 100644 keyboards/omkbd/runner3680/3x7/3x7.h delete mode 100644 keyboards/omkbd/runner3680/3x8/3x8.h delete mode 100644 keyboards/omkbd/runner3680/4x6/4x6.h delete mode 100644 keyboards/omkbd/runner3680/4x7/4x7.h delete mode 100644 keyboards/omkbd/runner3680/4x8/4x8.h delete mode 100644 keyboards/omkbd/runner3680/5x6/5x6.h delete mode 100644 keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h delete mode 100644 keyboards/omkbd/runner3680/5x7/5x7.h delete mode 100644 keyboards/omkbd/runner3680/5x8/5x8.h delete mode 100644 keyboards/orange75/orange75.h delete mode 100644 keyboards/orthodox/rev1/rev1.h delete mode 100644 keyboards/orthodox/rev3/rev3.h delete mode 100644 keyboards/orthodox/rev3_teensy/rev3_teensy.h delete mode 100644 keyboards/owlab/jelly_epoch/hotswap/hotswap.h delete mode 100644 keyboards/owlab/spring/spring.h delete mode 100644 keyboards/pabile/p42/p42.h delete mode 100644 keyboards/papercranekeyboards/gerald65/gerald65.h delete mode 100644 keyboards/percent/skog/skog.h delete mode 100644 keyboards/phase_studio/titan65/hotswap/hotswap.h delete mode 100644 keyboards/phrygian/ph100/ph100.h delete mode 100644 keyboards/pico/65keys/65keys.h delete mode 100644 keyboards/pico/70keys/70keys.h delete mode 100644 keyboards/picolab/frusta_fundamental/frusta_fundamental.h delete mode 100644 keyboards/pkb65/pkb65.h delete mode 100644 keyboards/playkbtw/ca66/ca66.h delete mode 100644 keyboards/plut0nium/0x3e/0x3e.h delete mode 100644 keyboards/polilla/polilla.h delete mode 100644 keyboards/primekb/meridian_rgb/meridian_rgb.h delete mode 100644 keyboards/primekb/prime_e/prime_e.h delete mode 100644 keyboards/primekb/prime_l/v1/v1.h delete mode 100644 keyboards/primekb/prime_l/v2/v2.h delete mode 100644 keyboards/primekb/prime_o/prime_o.h delete mode 100644 keyboards/primekb/prime_r/prime_r.h delete mode 100644 keyboards/q4z/q4z.h delete mode 100644 keyboards/quantrik/kyuu/kyuu.h delete mode 100644 keyboards/quarkeys/z40/z40.h delete mode 100644 keyboards/quarkeys/z67/hotswap/hotswap.h delete mode 100644 keyboards/quarkeys/z67/solder/solder.h delete mode 100644 keyboards/qwertyydox/rev1/rev1.h delete mode 100644 keyboards/rabbit/rabbit68/rabbit68.h delete mode 100644 keyboards/rainkeebs/rainkeeb/rainkeeb.h delete mode 100644 keyboards/rainkeebs/yasui/yasui.h delete mode 100644 keyboards/rate/pistachio/rev1/rev1.h delete mode 100644 keyboards/rate/pistachio/rev2/rev2.h delete mode 100644 keyboards/rate/pistachio_mp/pistachio_mp.h delete mode 100644 keyboards/rate/pistachio_pro/pistachio_pro.h delete mode 100644 keyboards/recompile_keys/choco60/choco60.h delete mode 100644 keyboards/recompile_keys/cocoa40/cocoa40.h delete mode 100644 keyboards/recompile_keys/mio/mio.h delete mode 100644 keyboards/recompile_keys/nomu30/nomu30.h delete mode 100644 keyboards/redox/rev1/rev1.h delete mode 100644 keyboards/redox_media/redox_media.h delete mode 100644 keyboards/reviung/reviung33/reviung33.h delete mode 100644 keyboards/reviung/reviung39/reviung39.h delete mode 100644 keyboards/reviung/reviung41/reviung41.h delete mode 100644 keyboards/reviung/reviung53/reviung53.h delete mode 100644 keyboards/rgbkb/zen/rev1/rev1.h delete mode 100644 keyboards/rgbkb/zen/rev2/rev2.h delete mode 100644 keyboards/ristretto/ristretto.h delete mode 100644 keyboards/rominronin/katana60/rev1/rev1.h delete mode 100644 keyboards/roseslite/roseslite.h delete mode 100644 keyboards/rpiguy9907/southpaw66/southpaw66.h delete mode 100644 keyboards/runes/vaengr/vaengr.h delete mode 100644 keyboards/ryanbaekr/rb69/rb69.h delete mode 100644 keyboards/ryanbaekr/rb86/rb86.h delete mode 100644 keyboards/ryanbaekr/rb87/rb87.h delete mode 100644 keyboards/salicylic_acid3/7skb/rev1/rev1.h delete mode 100644 keyboards/salicylic_acid3/7splus/7splus.h delete mode 100644 keyboards/salicylic_acid3/ajisai74/ajisai74.h delete mode 100644 keyboards/salicylic_acid3/ergoarrows/ergoarrows.h delete mode 100644 keyboards/salicylic_acid3/getta25/rev1/rev1.h delete mode 100644 keyboards/salicylic_acid3/jisplit89/rev1/rev1.h delete mode 100644 keyboards/salicylic_acid3/nknl7en/nknl7en.h delete mode 100644 keyboards/salicylic_acid3/nknl7jp/nknl7jp.h delete mode 100644 keyboards/sam/s80/s80.h delete mode 100644 keyboards/satt/comet46/comet46.h delete mode 100644 keyboards/satt/vision/vision.h delete mode 100644 keyboards/scatter42/scatter42.h delete mode 100644 keyboards/sendyyeah/bevi/bevi.h delete mode 100644 keyboards/senselessclay/gos65/gos65.h delete mode 100644 keyboards/sets3n/kk980/kk980.h delete mode 100644 keyboards/shambles/shambles.h delete mode 100644 keyboards/shapeshifter4060/shapeshifter4060.h delete mode 100644 keyboards/shoc/shoc.h delete mode 100644 keyboards/sidderskb/majbritt/rev1/rev1.h delete mode 100644 keyboards/sidderskb/majbritt/rev2/rev2.h delete mode 100644 keyboards/silverbullet44/silverbullet44.h delete mode 100644 keyboards/slz40/slz40.h delete mode 100644 keyboards/sneakbox/disarray/ortho/ortho.h delete mode 100644 keyboards/sneakbox/disarray/staggered/staggered.h delete mode 100644 keyboards/soda/cherish/cherish.h delete mode 100644 keyboards/soda/pocket/pocket.h delete mode 100755 keyboards/sofle/keyhive/keyhive.h delete mode 100644 keyboards/sofle/rev1/rev1.h delete mode 100644 keyboards/spaceman/yun65/yun65.h delete mode 100644 keyboards/spacey/spacey.c delete mode 100644 keyboards/spacey/spacey.h delete mode 100644 keyboards/sparrow62/sparrow62.h delete mode 100644 keyboards/spiderisland/split78/split78.h delete mode 100644 keyboards/splitography/splitography.h delete mode 100644 keyboards/splitty/rev1/rev1.h delete mode 100644 keyboards/splitty/splitty.h delete mode 100644 keyboards/star75/star75.h delete mode 100644 keyboards/stello65/hs_rev1/hs_rev1.h delete mode 100644 keyboards/stello65/sl_rev1/sl_rev1.h delete mode 100644 keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.h delete mode 100644 keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.h delete mode 100644 keyboards/stenokeyboards/the_uni/usb_c/usb_c.h delete mode 100644 keyboards/system76/launch_1/launch_1.h delete mode 100644 keyboards/takashicompany/center_enter/center_enter.h delete mode 100644 keyboards/takashicompany/compacx/compacx.h delete mode 100644 keyboards/takashicompany/dogtag/dogtag.h delete mode 100644 keyboards/takashicompany/endzone34/endzone34.h delete mode 100644 keyboards/takashicompany/heavy_left/heavy_left.h delete mode 100644 keyboards/takashicompany/minizone/minizone.h delete mode 100644 keyboards/takashicompany/qoolee/qoolee.h delete mode 100644 keyboards/takashicompany/radialex/radialex.h delete mode 100644 keyboards/takashiski/hecomi/hecomi.h delete mode 100644 keyboards/takashiski/otaku_split/rev0/rev0.h delete mode 100644 keyboards/takashiski/otaku_split/rev1/rev1.h delete mode 100644 keyboards/taleguers/taleguers75/taleguers75.c delete mode 100644 keyboards/taleguers/taleguers75/taleguers75.h delete mode 100644 keyboards/team0110/p1800fl/p1800fl.h delete mode 100644 keyboards/technika/technika.h delete mode 100644 keyboards/tg4x/tg4x.h delete mode 100644 keyboards/thevankeyboards/caravan/caravan.h delete mode 100644 keyboards/thevankeyboards/jetvan/jetvan.h delete mode 100644 keyboards/tkc/candybar/lefty/lefty.h delete mode 100644 keyboards/tkc/candybar/lefty_r3/lefty_r3.h delete mode 100644 keyboards/tkc/candybar/righty/righty.h delete mode 100644 keyboards/tkc/candybar/righty_r3/righty_r3.h delete mode 100644 keyboards/tkc/godspeed75/godspeed75.h delete mode 100644 keyboards/tkc/tkc1800/tkc1800.h delete mode 100644 keyboards/tkw/grandiceps/grandiceps.h delete mode 100644 keyboards/toffee_studio/blueberry/blueberry.h delete mode 100644 keyboards/tominabox1/adalyn/adalyn.h delete mode 100644 keyboards/tominabox1/le_chiffre/he/he.h delete mode 100644 keyboards/tominabox1/le_chiffre/rev1/rev1.h delete mode 100644 keyboards/tominabox1/le_chiffre/rev2/rev2.h delete mode 100644 keyboards/tronguylabs/m122_3270/m122_3270.h delete mode 100644 keyboards/tszaboo/ortho4exent/ortho4exent.h delete mode 100644 keyboards/tunks/ergo33/ergo33.h delete mode 100644 keyboards/ubest/vn/vn.h delete mode 100644 keyboards/unikeyboard/diverge3/diverge3.h delete mode 100644 keyboards/uranuma/uranuma.h delete mode 100644 keyboards/uzu42/rev1/rev1.h delete mode 100644 keyboards/uzu42/uzu42.h delete mode 100644 keyboards/v4n4g0rth0n/v4n4g0rth0n.h delete mode 100644 keyboards/viktus/at101_bh/at101_bh.h delete mode 100644 keyboards/viktus/omnikey_bh/omnikey_bh.h delete mode 100644 keyboards/walletburner/neuron/neuron.h delete mode 100644 keyboards/waterfowl/waterfowl.h delete mode 100644 keyboards/weirdo/ls_60/ls_60.h delete mode 100644 keyboards/weirdo/naiping/npminila/npminila.h delete mode 100644 keyboards/weirdo/tiger910/tiger910.h delete mode 100644 keyboards/westfoxtrot/cyclops/cyclops.h delete mode 100644 keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.h delete mode 100644 keyboards/wolf/kuku65/kuku65.h delete mode 100644 keyboards/wolf/ryujin/ryujin.h delete mode 100644 keyboards/wolf/sabre/sabre.h delete mode 100644 keyboards/wolfmarkclub/wm1/wm1.h delete mode 100644 keyboards/wren/wren.h delete mode 100644 keyboards/wsk/alpha9/alpha9.h delete mode 100644 keyboards/wsk/g4m3ralpha/g4m3ralpha.h delete mode 100644 keyboards/wsk/gothic50/gothic50.h delete mode 100644 keyboards/wsk/gothic70/gothic70.h delete mode 100644 keyboards/wsk/houndstooth/houndstooth.h delete mode 100644 keyboards/wsk/jerkin/jerkin.h delete mode 100644 keyboards/wsk/kodachi50/kodachi50.h delete mode 100644 keyboards/wsk/pain27/pain27.h delete mode 100644 keyboards/wsk/tkl30/tkl30.h delete mode 100644 keyboards/wuque/creek70/creek70.h delete mode 100644 keyboards/wuque/tata80/wk/wk.h delete mode 100644 keyboards/wuque/tata80/wkl/wkl.h delete mode 100644 keyboards/xbows/knight/knight.h delete mode 100644 keyboards/xbows/knight_plus/knight_plus.h delete mode 100644 keyboards/xbows/nature/nature.h delete mode 100644 keyboards/xbows/woody/woody.h delete mode 100644 keyboards/xenon/xenon.h delete mode 100644 keyboards/yandrstudio/buff67v3/buff67v3.h delete mode 100644 keyboards/yandrstudio/eau87/eau87.h delete mode 100644 keyboards/yandrstudio/eau_r2/eau_r2.h delete mode 100644 keyboards/yandrstudio/nightstar75/nightstar75.h delete mode 100644 keyboards/yandrstudio/tg67/tg67.h delete mode 100644 keyboards/yandrstudio/wave75/wave75.h delete mode 100644 keyboards/yandrstudio/yr80/yr80.h delete mode 100644 keyboards/yandrstudio/zhou65/zhou65.h delete mode 100644 keyboards/ydkb/just60/just60.h delete mode 100644 keyboards/ymdk/ymd67/ymd67.h delete mode 100644 keyboards/yosino58/rev1/rev1.h delete mode 100644 keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h delete mode 100644 keyboards/yynmt/kagamidget/kagamidget.h delete mode 100644 users/vnmm/vnmm.h diff --git a/keyboards/25keys/aleth42/info.json b/keyboards/25keys/aleth42/info.json index 7a71d2b36703..2773a9fd605c 100644 --- a/keyboards/25keys/aleth42/info.json +++ b/keyboards/25keys/aleth42/info.json @@ -6,52 +6,5 @@ "usb": { "vid": "0x04D8", "pid": "0xEAC8" - }, - "layouts": { - "LAYOUT": { - "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":0, "y":1, "w":1.25}, - {"x":1.25, "y":1}, - {"x":2.25, "y":1}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - {"x":8.25, "y":1}, - {"x":9.25, "y":1}, - {"x":10.25, "y":1, "w":1.75}, - {"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, "w":1.25}, - {"x":0, "y":3, "w":1.25}, - {"x":1.25, "y":3}, - {"x":2.25, "y":3, "w":1.25}, - {"x":3.5, "y":3, "w":2.75}, - {"x":6.25, "y":3, "w":2.25}, - {"x":8.5, "y":3, "w":1.25}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3, "w":1.25}] - } } } diff --git a/keyboards/25keys/aleth42/rev0/info.json b/keyboards/25keys/aleth42/rev0/info.json index 3b2395a247f7..f3741a80b148 100644 --- a/keyboards/25keys/aleth42/rev0/info.json +++ b/keyboards/25keys/aleth42/rev0/info.json @@ -17,5 +17,56 @@ "pin": "C7" }, "processor": "atmega32u2", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75}, + {"matrix": [3, 4], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 9.75, "y": 3}, + {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/25keys/aleth42/rev0/rev0.h b/keyboards/25keys/aleth42/rev0/rev0.h deleted file mode 100644 index a5dd74037f1c..000000000000 --- a/keyboards/25keys/aleth42/rev0/rev0.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 monksoffunk - * - * 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" - -// for readability -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -/* ALETH42 layout - * ,-----------------------------------------------------------. - * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 38 | - * |-----------------------------------------------------------| - * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | - * |-----------------------------------------------------------| - * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | - * |-----------------------------------------------------------| - * | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | - * `-----------------------------------------------------------' - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k38,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,\ - k30, k31, k32, k33, k34, k35, k36, k37\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A },\ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A },\ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A },\ - { k30, k31, k32, k33, k34, k35, k36, k37, XXX, XXX, k38 }\ -} diff --git a/keyboards/25keys/aleth42/rev1/info.json b/keyboards/25keys/aleth42/rev1/info.json index d3ed4d6cd053..562020388953 100644 --- a/keyboards/25keys/aleth42/rev1/info.json +++ b/keyboards/25keys/aleth42/rev1/info.json @@ -22,5 +22,56 @@ "breathing": true }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75}, + {"matrix": [3, 4], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 9.75, "y": 3}, + {"matrix": [3, 7], "x": 10.75, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/25keys/aleth42/rev1/rev1.h b/keyboards/25keys/aleth42/rev1/rev1.h deleted file mode 100644 index a5dd74037f1c..000000000000 --- a/keyboards/25keys/aleth42/rev1/rev1.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 monksoffunk - * - * 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" - -// for readability -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -/* ALETH42 layout - * ,-----------------------------------------------------------. - * | 00 | 01 | 02 | 03 | 04 | 05 | 06 | 07 | 08 | 09 | 0A | 38 | - * |-----------------------------------------------------------| - * | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 1A | - * |-----------------------------------------------------------| - * | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 2A | - * |-----------------------------------------------------------| - * | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | - * `-----------------------------------------------------------' - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k38,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A,\ - k30, k31, k32, k33, k34, k35, k36, k37\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A },\ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A },\ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A },\ - { k30, k31, k32, k33, k34, k35, k36, k37, XXX, XXX, k38 }\ -} diff --git a/keyboards/30wer/30wer.h b/keyboards/30wer/30wer.h deleted file mode 100644 index e7bce82776b2..000000000000 --- a/keyboards/30wer/30wer.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \ -} diff --git a/keyboards/30wer/info.json b/keyboards/30wer/info.json index bced976dd56e..85f3826acd34 100644 --- a/keyboards/30wer/info.json +++ b/keyboards/30wer/info.json @@ -18,44 +18,46 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Bksp", "x":11, "y":0}, - {"label":"Delete", "x":12, "y":0, "w":1.25}, - {"label":"Ctrl", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":":", "x":10.25, "y":1}, - {"label":"\"", "x":11.25, "y":1}, - {"label":"Enter", "x":12.25, "y":1}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":"<", "x":8.75, "y":2}, - {"label":">", "x":9.75, "y":2}, - {"label":"?", "x":10.75, "y":2}, - {"label":"Space", "x":11.75, "y":2, "w":1.5} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1}, + {"matrix": [1, 12], "x": 12.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.5} ] } } diff --git a/keyboards/3w6/info.json b/keyboards/3w6/info.json index d76688bfc13d..2a273231d9de 100644 --- a/keyboards/3w6/info.json +++ b/keyboards/3w6/info.json @@ -6,54 +6,5 @@ "usb": { "vid": "0xFEED", "pid": "0x4658" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "k00", "x": 0, "y": 0.8}, - {"label": "k01", "x": 1, "y": 0.2}, - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0.2}, - {"label": "k04", "x": 4, "y": 0.4}, - - {"label": "k05", "x": 8, "y": 0.4}, - {"label": "k06", "x": 9, "y": 0.2}, - {"label": "k07", "x": 10, "y": 0}, - {"label": "k08", "x": 11, "y": 0.2}, - {"label": "k09", "x": 12, "y": 0.8}, - - {"label": "k10", "x": 0, "y": 1.8}, - {"label": "k11", "x": 1, "y": 1.2}, - {"label": "k12", "x": 2, "y": 1}, - {"label": "k13", "x": 3, "y": 1.2}, - {"label": "k14", "x": 4, "y": 1.4}, - - {"label": "k15", "x": 8, "y": 1.4}, - {"label": "k16", "x": 9, "y": 1.2}, - {"label": "k17", "x": 10, "y": 1}, - {"label": "k18", "x": 11, "y": 1.2}, - {"label": "k19", "x": 12, "y": 1.8}, - - {"label": "k20", "x": 0, "y": 2.8}, - {"label": "k21", "x": 1, "y": 2.2}, - {"label": "k22", "x": 2, "y": 2}, - {"label": "k23", "x": 3, "y": 2.2}, - {"label": "k24", "x": 4, "y": 2.4}, - - {"label": "k25", "x": 8, "y": 2.4}, - {"label": "k26", "x": 9, "y": 2.2}, - {"label": "k27", "x": 10, "y": 2}, - {"label": "k28", "x": 11, "y": 2.2}, - {"label": "k29", "x": 12, "y": 2.8}, - - {"label": "k32", "x": 3.2, "y": 3.6}, - {"label": "k33", "x": 4.2, "y": 3.6}, - {"label": "k34", "x": 5.2, "y": 3.8}, - - {"label": "k35", "x": 6.8, "y": 3.8}, - {"label": "k36", "x": 7.8, "y": 3.6}, - {"label": "k37", "x": 8.8, "y": 3.6} - ] - } } } diff --git a/keyboards/3w6/rev1/info.json b/keyboards/3w6/rev1/info.json index dab37baf0456..2db9363564da 100644 --- a/keyboards/3w6/rev1/info.json +++ b/keyboards/3w6/rev1/info.json @@ -3,5 +3,54 @@ "device_version": "0.0.1" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.8}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.2}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + + {"matrix": [4, 0], "x": 8, "y": 0.4}, + {"matrix": [4, 1], "x": 9, "y": 0.2}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0.2}, + {"matrix": [4, 4], "x": 12, "y": 0.8}, + + {"matrix": [1, 0], "x": 0, "y": 1.8}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.2}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + + {"matrix": [5, 0], "x": 8, "y": 1.4}, + {"matrix": [5, 1], "x": 9, "y": 1.2}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1.2}, + {"matrix": [5, 4], "x": 12, "y": 1.8}, + + {"matrix": [2, 0], "x": 0, "y": 2.8}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.2}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + + {"matrix": [6, 0], "x": 8, "y": 2.4}, + {"matrix": [6, 1], "x": 9, "y": 2.2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2.2}, + {"matrix": [6, 4], "x": 12, "y": 2.8}, + + {"matrix": [3, 2], "x": 3.2, "y": 3.6}, + {"matrix": [3, 3], "x": 4.2, "y": 3.6}, + {"matrix": [3, 4], "x": 5.2, "y": 3.8}, + + {"matrix": [7, 0], "x": 6.8, "y": 3.8}, + {"matrix": [7, 1], "x": 7.8, "y": 3.6}, + {"matrix": [7, 2], "x": 8.8, "y": 3.6} + ] + } + } } diff --git a/keyboards/3w6/rev1/rev1.h b/keyboards/3w6/rev1/rev1.h deleted file mode 100644 index ba881ca431ce..000000000000 --- a/keyboards/3w6/rev1/rev1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 weteor - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\ - k32, k33, k34, k35, k36, k37\ -) { \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { KC_NO, KC_NO, k32, k33, k34 }, \ - \ - { k05, k06, k07, k08, k09 }, \ - { k15, k16, k17, k18, k19 }, \ - { k25, k26, k27, k28, k29 }, \ - { k35, k36, k37, KC_NO, KC_NO }, \ -} diff --git a/keyboards/3w6/rev2/info.json b/keyboards/3w6/rev2/info.json index 65be217368d2..70ee0e0fcacf 100644 --- a/keyboards/3w6/rev2/info.json +++ b/keyboards/3w6/rev2/info.json @@ -3,5 +3,54 @@ "device_version": "0.0.2" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.8}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.2}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + + {"matrix": [4, 0], "x": 8, "y": 0.4}, + {"matrix": [4, 1], "x": 9, "y": 0.2}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0.2}, + {"matrix": [4, 4], "x": 12, "y": 0.8}, + + {"matrix": [1, 0], "x": 0, "y": 1.8}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.2}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + + {"matrix": [5, 0], "x": 8, "y": 1.4}, + {"matrix": [5, 1], "x": 9, "y": 1.2}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1.2}, + {"matrix": [5, 4], "x": 12, "y": 1.8}, + + {"matrix": [2, 0], "x": 0, "y": 2.8}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.2}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + + {"matrix": [6, 0], "x": 8, "y": 2.4}, + {"matrix": [6, 1], "x": 9, "y": 2.2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2.2}, + {"matrix": [6, 4], "x": 12, "y": 2.8}, + + {"matrix": [3, 2], "x": 3.2, "y": 3.6}, + {"matrix": [3, 3], "x": 4.2, "y": 3.6}, + {"matrix": [3, 4], "x": 5.2, "y": 3.8}, + + {"matrix": [7, 0], "x": 6.8, "y": 3.8}, + {"matrix": [7, 1], "x": 7.8, "y": 3.6}, + {"matrix": [7, 2], "x": 8.8, "y": 3.6} + ] + } + } } diff --git a/keyboards/3w6/rev2/rev2.c b/keyboards/3w6/rev2/rev2.c index 224925111e7d..e68792cfb239 100644 --- a/keyboards/3w6/rev2/rev2.c +++ b/keyboards/3w6/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev2.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/3w6/rev2/rev2.h b/keyboards/3w6/rev2/rev2.h deleted file mode 100644 index ba881ca431ce..000000000000 --- a/keyboards/3w6/rev2/rev2.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 weteor - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29,\ - k32, k33, k34, k35, k36, k37\ -) { \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { KC_NO, KC_NO, k32, k33, k34 }, \ - \ - { k05, k06, k07, k08, k09 }, \ - { k15, k16, k17, k18, k19 }, \ - { k25, k26, k27, k28, k29 }, \ - { k35, k36, k37, KC_NO, KC_NO }, \ -} diff --git a/keyboards/40percentclub/half_n_half/half_n_half.h b/keyboards/40percentclub/half_n_half/half_n_half.h index bc330c9cb7b8..c9b4e6e73940 100644 --- a/keyboards/40percentclub/half_n_half/half_n_half.h +++ b/keyboards/40percentclub/half_n_half/half_n_half.h @@ -16,32 +16,6 @@ #pragma once #include "quantum.h" -#define ___ KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L34, R32 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { ___, ___, ___, ___, L34, ___, ___ }, \ -\ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { ___, ___, ___, ___, R32, ___, ___ } \ -} #ifdef USE_I2C #error "I2C not Supported" diff --git a/keyboards/40percentclub/half_n_half/info.json b/keyboards/40percentclub/half_n_half/info.json index 0bec859a5a0e..8174e639c23f 100644 --- a/keyboards/40percentclub/half_n_half/info.json +++ b/keyboards/40percentclub/half_n_half/info.json @@ -21,53 +21,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - {"label":"R00", "x":7, "y":0}, - {"label":"R01", "x":8, "y":0}, - {"label":"R02", "x":9, "y":0}, - {"label":"R03", "x":10, "y":0}, - {"label":"R04", "x":11, "y":0}, - {"label":"R05", "x":12, "y":0}, - {"label":"R06", "x":13, "y":0}, + {"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}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"L16", "x":6, "y":1}, - {"label":"R10", "x":7, "y":1}, - {"label":"R11", "x":8, "y":1}, - {"label":"R12", "x":9, "y":1}, - {"label":"R13", "x":10, "y":1}, - {"label":"R14", "x":11, "y":1}, - {"label":"R15", "x":12, "y":1}, - {"label":"R16", "x":13, "y":1}, + {"matrix": [4, 6], "x": 7, "y": 0}, + {"matrix": [4, 5], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0}, + {"matrix": [4, 0], "x": 13, "y": 0}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"L26", "x":6, "y":2}, - {"label":"R20", "x":7, "y":2}, - {"label":"R21", "x":8, "y":2}, - {"label":"R22", "x":9, "y":2}, - {"label":"R23", "x":10, "y":2}, - {"label":"R24", "x":11, "y":2}, - {"label":"R25", "x":12, "y":2}, - {"label":"R26", "x":13, "y":2}, - - {"label":"L34", "x":4, "y":3, "w":2}, - {"label":"R32", "x":8, "y":3, "w":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [5, 6], "x": 7, "y": 1}, + {"matrix": [5, 5], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1}, + {"matrix": [5, 0], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [6, 6], "x": 7, "y": 2}, + {"matrix": [6, 5], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2}, + {"matrix": [6, 0], "x": 13, "y": 2}, + + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2}, + + {"matrix": [7, 4], "x": 8, "y": 3, "w": 2} ] } } diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json index c0f9ef312663..9fa3ab5d413c 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/info.json +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/info.json @@ -30,7 +30,79 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"1,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"1,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"1,6", "x":13, "y":0}, {"label":"3,6", "x":14, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":6.5, "y":1}, {"label":"3,3", "x":7.5, "y":1}, {"label":"2,4", "x":8.5, "y":1}, {"label":"3,4", "x":9.5, "y":1}, {"label":"2,5", "x":10.5, "y":1}, {"label":"3,5", "x":11.5, "y":1}, {"label":"2,6", "x":12.5, "y":1}, {"label":"5,6", "x":13.5, "y":1, "w":1.5}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":6.75, "y":2}, {"label":"5,3", "x":7.75, "y":2}, {"label":"4,4", "x":8.75, "y":2}, {"label":"5,4", "x":9.75, "y":2}, {"label":"4,5", "x":10.75, "y":2}, {"label":"5,5", "x":11.75, "y":2}, {"label":"4,6", "x":12.75, "y":2}, {"label":"7,6", "x":13.75, "y":2, "w":1.25}, {"label":"6,0", "x":0, "y":3, "w":1.25}, {"label":"7,0", "x":1.25, "y":3}, {"label":"6,1", "x":2.25, "y":3}, {"label":"7,1", "x":3.25, "y":3}, {"label":"6,2", "x":4.25, "y":3}, {"label":"7,2", "x":5.25, "y":3}, {"label":"6,3", "x":6.25, "y":3}, {"label":"7,3", "x":7.25, "y":3}, {"label":"6,4", "x":8.25, "y":3}, {"label":"7,4", "x":9.25, "y":3}, {"label":"6,5", "x":10.25, "y":3}, {"label":"7,5", "x":11.25, "y":3}, {"label":"6,6", "x":12.25, "y":3, "w":1.75}, {"label":"9,6", "x":14, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.25}, {"label":"9,0", "x":1.25, "y":4, "w":1.25}, {"label":"9,1", "x":2.5, "y":4, "w":1.25}, {"label":"9,2", "x":3.75, "y":4, "w":2.25}, {"label":"9,3", "x":6, "y":4, "w":1.25}, {"label":"9,4", "x":10, "y":4, "w":1.25}, {"label":"8,5", "x":11.25, "y":4, "w":1.25}, {"label":"9,5", "x":12.5, "y":4, "w":1.25}, {"label":"8,6", "x":13.75, "y":4, "w":1.25}, {"label":"8,4", "x":7, "y":9, "w":2.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [3, 6], "x": 14, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 6], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [9, 6], "x": 14, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [9, 3], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 7, "y": 9, "w": 2.75} + ] } } } diff --git a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h index 02dea9d1ca06..7cfb11b3f352 100644 --- a/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h +++ b/keyboards/4pplet/eagle_viper_rep/rev_b/rev_b.h @@ -19,23 +19,3 @@ along with this program. If not, see . #include "quantum.h" void setLayerLed(layer_state_t state); - -#define LAYOUT( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k36, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k56,\ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k76,\ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k96,\ - k80, k90, k91, k92, k93, k84 ,k94, k85, k95, k86 \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06}, \ - {k10, k11, k12, k13, k14, k15, k16}, \ - {k20, k21, k22, k23, k24, k25, k26}, \ - {k30, k31, k32, k33, k34, k35, k36}, \ - {k40, k41, k42, k43, k44, k45, k46}, \ - {k50, k51, k52, k53, k54, k55, k56}, \ - {k60, k61, k62, k63, k64, k65, k66}, \ - {k70, k71, k72, k73, k74, k75, k76}, \ - {k80, KC_NO, KC_NO, KC_NO, k84, k85, k86}, \ - {k90, k91, k92, k93, k94, k95, k96} \ -} diff --git a/keyboards/4pplet/waffling60/rev_a/info.json b/keyboards/4pplet/waffling60/rev_a/info.json index ea24fceea0ff..fbd30bdd29ef 100644 --- a/keyboards/4pplet/waffling60/rev_a/info.json +++ b/keyboards/4pplet/waffling60/rev_a/info.json @@ -21,7 +21,78 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 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, "y": 0}, + {"matrix": [1, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [1, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0}, + {"matrix": [0, 10], "x": 13, "y": 0}, + {"matrix": [1, 10], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [2, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [2, 5], "x": 6.5, "y": 1}, + {"matrix": [3, 5], "x": 7.5, "y": 1}, + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [2, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [2, 9], "x": 12.5, "y": 1}, + {"matrix": [2, 10], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [3, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [3, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 2}, + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [3, 6], "x": 8.75, "y": 2}, + {"matrix": [2, 7], "x": 9.75, "y": 2}, + {"matrix": [3, 8], "x": 10.75, "y": 2}, + {"matrix": [3, 9], "x": 11.75, "y": 2}, + {"matrix": [3, 10], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 0], "x": 1.25, "y": 3}, + {"matrix": [4, 1], "x": 2.25, "y": 3}, + {"matrix": [4, 2], "x": 3.25, "y": 3}, + {"matrix": [4, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 4], "x": 6.25, "y": 3}, + {"matrix": [5, 5], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [3, 7], "x": 9.25, "y": 3}, + {"matrix": [4, 7], "x": 10.25, "y": 3}, + {"matrix": [4, 8], "x": 11.25, "y": 3}, + {"matrix": [4, 9], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [4, 10], "x": 14, "y": 3}, + + {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [5, 4], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [5, 6], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [5, 10], "x": 13.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/4pplet/waffling60/rev_a/rev_a.h b/keyboards/4pplet/waffling60/rev_a/rev_a.h deleted file mode 100644 index 92384b4840b9..000000000000 --- a/keyboards/4pplet/waffling60/rev_a/rev_a.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" - -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" - -// k -#define LAYOUT( \ - k00, k01, k11, k02, k03, k04, k05, k15, k06, k07, k08, k18, k09, k0a, k1a, \ - k10, k21, k12, k22, k13, k14, k25, k35, k16, k17, k28, k19, k29, k2a, \ - k20, k31, k32, k23, k33, k24, k45, k26, k36, k27, k38, k39, k3a, \ - k30, k40, k41, k42, k43, k34, k44, k55, k46, k37, k47, k48, k49, k4a, \ - k50, k51, k52, k53, k54, k56, k57, k58, k59, k5a \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \ - {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \ - {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a} \ -} diff --git a/keyboards/4pplet/waffling60/rev_b/info.json b/keyboards/4pplet/waffling60/rev_b/info.json index 143b9c207f30..90fe5d02a227 100644 --- a/keyboards/4pplet/waffling60/rev_b/info.json +++ b/keyboards/4pplet/waffling60/rev_b/info.json @@ -24,7 +24,78 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/4pplet/waffling60/rev_b/rev_b.h b/keyboards/4pplet/waffling60/rev_b/rev_b.h index b3949012e948..57a496420284 100644 --- a/keyboards/4pplet/waffling60/rev_b/rev_b.h +++ b/keyboards/4pplet/waffling60/rev_b/rev_b.h @@ -20,18 +20,3 @@ along with this program. If not, see . //#define CAPS_LOCK_COLOR HSV_ORANGE #include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \ -} diff --git a/keyboards/4pplet/waffling60/rev_c/info.json b/keyboards/4pplet/waffling60/rev_c/info.json index 0f7ba079d57b..c33d2b0616c2 100644 --- a/keyboards/4pplet/waffling60/rev_c/info.json +++ b/keyboards/4pplet/waffling60/rev_c/info.json @@ -24,7 +24,78 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/4pplet/waffling60/rev_c/rev_c.h b/keyboards/4pplet/waffling60/rev_c/rev_c.h index c57c0f29c27a..641b6633362e 100644 --- a/keyboards/4pplet/waffling60/rev_c/rev_c.h +++ b/keyboards/4pplet/waffling60/rev_c/rev_c.h @@ -20,18 +20,3 @@ along with this program. If not, see . //#define CAPS_LOCK_COLOR HSV_ORANGE #include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \ -} diff --git a/keyboards/4pplet/waffling60/rev_d/info.json b/keyboards/4pplet/waffling60/rev_d/info.json index 18ffba5abc58..01aba228636b 100644 --- a/keyboards/4pplet/waffling60/rev_d/info.json +++ b/keyboards/4pplet/waffling60/rev_d/info.json @@ -20,7 +20,79 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"ISO", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"ISO", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.25}, {"x":6, "y":4, "w":1.25}, {"x":7.25, "y":4, "w":2.75}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/4pplet/waffling60/rev_d/rev_d.h b/keyboards/4pplet/waffling60/rev_d/rev_d.h index a3b75c63b62f..641b6633362e 100644 --- a/keyboards/4pplet/waffling60/rev_d/rev_d.h +++ b/keyboards/4pplet/waffling60/rev_d/rev_d.h @@ -20,18 +20,3 @@ along with this program. If not, see . //#define CAPS_LOCK_COLOR HSV_ORANGE #include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k3d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k4d, \ - k40, k41, k42, k44, k46, k48, k49, k4a, k4b, k4c \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d}, \ -} diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/info.json b/keyboards/4pplet/waffling60/rev_d_ansi/info.json index 84f375371d89..3969d98c4247 100644 --- a/keyboards/4pplet/waffling60/rev_d_ansi/info.json +++ b/keyboards/4pplet/waffling60/rev_d_ansi/info.json @@ -17,7 +17,76 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"|", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"label":"3U", "x":4, "y":4, "w":3}, {"label":"1U", "x":7, "y":4}, {"label":"3U", "x":8, "y":4, "w":3}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4, "w": 3}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c deleted file mode 100644 index 2568bd5650f3..000000000000 --- a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.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 . -*/ -#include "rev_d_ansi.h" diff --git a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h b/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h deleted file mode 100644 index aaa60a1f339b..000000000000 --- a/keyboards/4pplet/waffling60/rev_d_ansi/rev_d_ansi.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" <4pplet@protonmail.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 . -*/ -#pragma once - -#include "quantum.h" - -// k -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k44, k46, k48, k4b, k4c, k4d \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ - {k30, KC_NO, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \ -} diff --git a/keyboards/4pplet/waffling60/rev_d_iso/info.json b/keyboards/4pplet/waffling60/rev_d_iso/info.json index c920744d27bc..cab2fa1c0791 100644 --- a/keyboards/4pplet/waffling60/rev_d_iso/info.json +++ b/keyboards/4pplet/waffling60/rev_d_iso/info.json @@ -17,7 +17,77 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":3}, {"x":7, "y":4}, {"x":8, "y":4, "w":3}, {"label":"Win", "x":11, "y":4, "w":1.5}, {"label":"Menu", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 3}, + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4, "w": 3}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c deleted file mode 100644 index 8efa86152e3a..000000000000 --- a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.c +++ /dev/null @@ -1,17 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" - -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 . -*/ -#include "rev_d_iso.h" diff --git a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h b/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h deleted file mode 100644 index 46f0ec65ff80..000000000000 --- a/keyboards/4pplet/waffling60/rev_d_iso/rev_d_iso.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2022 Stefan Sundin "4pplet" - -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" - -// k -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k44, k46, k48, k4b, k4c, k4d \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, KC_NO, k4b, k4c, k4d} \ -} diff --git a/keyboards/abacus/abacus.h b/keyboards/abacus/abacus.h deleted file mode 100644 index 7f221c3c3473..000000000000 --- a/keyboards/abacus/abacus.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 nickolaij - * - * 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 XXX KC_NO - - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - 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 \ -) \ -{ \ - { 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, XXX, XXX, k34, XXX, k35, k36, k37, k38} \ -} diff --git a/keyboards/abacus/info.json b/keyboards/abacus/info.json index 2b3bfa434b8a..c12d7cb23541 100644 --- a/keyboards/abacus/info.json +++ b/keyboards/abacus/info.json @@ -26,54 +26,54 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0, "w":1.75}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, - {"label":"k10", "x":0, "y":1, "w":1.25}, - {"label":"k11", "x":1.25, "y":1}, - {"label":"k12", "x":2.25, "y":1}, - {"label":"k13", "x":3.25, "y":1}, - {"label":"k14", "x":4.25, "y":1}, - {"label":"k15", "x":5.25, "y":1}, - {"label":"k16", "x":6.25, "y":1}, - {"label":"k17", "x":7.25, "y":1}, - {"label":"k18", "x":8.25, "y":1}, - {"label":"k19", "x":9.25, "y":1}, - {"label":"k1a", "x":10.25, "y":1}, - {"label":"k1b", "x":11.25, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k21", "x":1.75, "y":2}, - {"label":"k22", "x":2.75, "y":2}, - {"label":"k23", "x":3.75, "y":2}, - {"label":"k24", "x":4.75, "y":2}, - {"label":"k25", "x":5.75, "y":2}, - {"label":"k26", "x":6.75, "y":2}, - {"label":"k27", "x":7.75, "y":2}, - {"label":"k28", "x":8.75, "y":2}, - {"label":"k29", "x":9.75, "y":2}, - {"label":"k2a", "x":10.75, "y":2}, - {"label":"k2b", "x":11.75, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, - {"label":"k30", "x":0, "y":3, "w":1.25}, - {"label":"k31", "x":1.25, "y":3}, - {"label":"k32", "x":2.25, "y":3}, - {"label":"k33", "x":3.25, "y":3, "w":2.75}, - {"label":"k34", "x":6, "y":3, "w":2.75}, - {"label":"k35", "x":8.75, "y":3}, - {"label":"k36", "x":9.75, "y":3}, - {"label":"k37", "x":10.75, "y":3}, - {"label":"k38", "x":11.75, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.75}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/acheron/elongate/beta/beta.h b/keyboards/acheron/elongate/beta/beta.h deleted file mode 100644 index 6ff32b4f7575..000000000000 --- a/keyboards/acheron/elongate/beta/beta.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Gondolindrim - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the Keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define KNO KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K49, K41, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, K1C, K4A, K42, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4B, K44, \ - K30, K31, K32, K34, K37, K3A, K3B, K3C, K3D, K4C, K47 \ -)\ -{\ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KNO, K1B, K1C }, \ - { K20, KNO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, KNO, K34, KNO, KNO, K37, KNO, K3A, K3B, K3C, K3D }, \ - { KNO, K41, K42, KNO, K44, KNO, KNO, K47, KNO, K49, K4A, K4B, K4C } \ -} diff --git a/keyboards/acheron/elongate/beta/info.json b/keyboards/acheron/elongate/beta/info.json index 7c7c8ebf54f9..5f46a2a48c0a 100644 --- a/keyboards/acheron/elongate/beta/info.json +++ b/keyboards/acheron/elongate/beta/info.json @@ -26,63 +26,68 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Backspace", "x":11, "y":0}, - {"label":"7", "x":12.5, "y":0}, - {"label":"8", "x":13.5, "y":0}, - {"label":"9", "x":14.5, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"Enter", "x":10.25, "y":1, "w":1.75}, - {"label":"4", "x":12.5, "y":1}, - {"label":"5", "x":13.5, "y":1}, - {"label":"6", "x":14.5, "y":1}, - - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":"<", "x":8.75, "y":2}, - {"label":"Fn1", "x":9.75, "y":2, "w":1.25}, - {"label":"Up", "x":11.25, "y":2.25}, - {"label":"1", "x":12.5, "y":2}, - {"label":"2", "x":13.5, "y":2}, - {"label":"3", "x":14.5, "y":2}, - - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3}, - {"label":"Alt", "x":2.25, "y":3, "w":1.25}, - {"label":"Space/Fn2", "x":3.5, "y":3, "w":2.25}, - {"label":"Space", "x":6.25, "y":3, "w":2.75}, - {"label":"Alt", "x":9, "y":3}, - {"label":"Left", "x":10.25, "y":3.25}, - {"label":"Down", "x":11.25, "y":3.25}, - {"label":"Right", "x":12.25, "y":3.25}, - {"label":"0", "x":13.5, "y":3}, - {"label":".", "x":14.5, "y":3} + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [4, 9], "x": 13.5, "y": 0}, + {"matrix": [4, 1], "x": 14.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [4, 10], "x": 13.5, "y": 1}, + {"matrix": [4, 2], "x": 14.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25}, + {"matrix": [2, 11], "x": 11.25, "y": 2.25}, + + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [4, 11], "x": 13.5, "y": 2}, + {"matrix": [4, 4], "x": 14.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 9, "y": 3}, + + {"matrix": [3, 10], "x": 10.25, "y": 3.25}, + {"matrix": [3, 11], "x": 11.25, "y": 3.25}, + {"matrix": [3, 12], "x": 12.25, "y": 3.25}, + + {"matrix": [4, 12], "x": 13.5, "y": 3}, + {"matrix": [4, 7], "x": 14.5, "y": 3} ] } } diff --git a/keyboards/ada/ada1800mini/ada1800mini.h b/keyboards/ada/ada1800mini/ada1800mini.h deleted file mode 100644 index 89ac0beba307..000000000000 --- a/keyboards/ada/ada1800mini/ada1800mini.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 peepeetee - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3C, K3D, K3E, K3B, \ - K40, K41, K42, K43, K46, K47, K48, K4D, K4E, K4A, K4B, K4C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, XXX, XXX, K46, K47, K48, XXX, K4A, K4B, K4C, K4D, K4E }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/ada/ada1800mini/info.json b/keyboards/ada/ada1800mini/info.json index 4af2c200c2d9..780afec336c7 100644 --- a/keyboards/ada/ada1800mini/info.json +++ b/keyboards/ada/ada1800mini/info.json @@ -21,76 +21,89 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (D0,F1)", "x": 0, "y": 0 }, - { "label": "K01 (D0,F4)", "x": 1.25, "y": 0 }, - { "label": "K02 (D0,F5)", "x": 2.25, "y": 0 }, - { "label": "K03 (D0,F6)", "x": 3.25, "y": 0 }, - { "label": "K04 (D0,F7)", "x": 4.5, "y": 0 }, - { "label": "K05 (D0,C7)", "x": 5.5, "y": 0 }, - { "label": "K06 (D0,C6)", "x": 6.5, "y": 0 }, - { "label": "K07 (D0,B6)", "x": 7.5, "y": 0 }, - { "label": "K08 (D0,B5)", "x": 8.75, "y": 0 }, - { "label": "K09 (D0,B4)", "x": 9.75, "y": 0 }, - { "label": "K0A (D0,D7)", "x": 10.75, "y": 0 }, - { "label": "K0B (D0,D6)", "x": 12, "y": 0 }, - { "label": "K0C (D0,B3)", "x": 13.5, "y": 0 }, - { "label": "K0D (D0,B2)", "x": 14.5, "y": 0 }, - { "label": "K0E (D0,B1)", "x": 15.5, "y": 0 }, - { "label": "K10 (D1,F1)", "x": 0, "y": 1.25, "w": 1.5 }, - { "label": "K11 (D1,F4)", "x": 1.5, "y": 1.25 }, - { "label": "K12 (D1,F5)", "x": 2.5, "y": 1.25 }, - { "label": "K13 (D1,F6)", "x": 3.5, "y": 1.25 }, - { "label": "K14 (D1,F7)", "x": 4.5, "y": 1.25 }, - { "label": "K15 (D1,C7)", "x": 5.5, "y": 1.25 }, - { "label": "K16 (D1,C6)", "x": 6.5, "y": 1.25 }, - { "label": "K17 (D1,B6)", "x": 7.5, "y": 1.25 }, - { "label": "K18 (D1,B5)", "x": 8.5, "y": 1.25 }, - { "label": "K19 (D1,B4)", "x": 9.5, "y": 1.25 }, - { "label": "K1A (D1,D7)", "x": 10.5, "y": 1.25 }, - { "label": "K1B (D1,D6)", "x": 11.5, "y": 1.25, "w": 1.5 }, - { "label": "K1C (D1,B3)", "x": 13.5, "y": 1.25 }, - { "label": "K1D (D1,B2)", "x": 14.5, "y": 1.25 }, - { "label": "K1E (D1,B1)", "x": 15.5, "y": 1.25 }, - { "label": "K20 (D2,F1)", "x": 0, "y": 2.25, "w": 1.75 }, - { "label": "K21 (D2,F4)", "x": 1.75, "y": 2.25 }, - { "label": "K22 (D2,F5)", "x": 2.75, "y": 2.25 }, - { "label": "K23 (D2,F6)", "x": 3.75, "y": 2.25 }, - { "label": "K24 (D2,F7)", "x": 4.75, "y": 2.25 }, - { "label": "K25 (D2,C7)", "x": 5.75, "y": 2.25 }, - { "label": "K26 (D2,C6)", "x": 6.75, "y": 2.25 }, - { "label": "K27 (D2,B6)", "x": 7.75, "y": 2.25 }, - { "label": "K28 (D2,B5)", "x": 8.75, "y": 2.25 }, - { "label": "K29 (D2,B4)", "x": 9.75, "y": 2.25 }, - { "label": "K2A (D2,D7)", "x": 10.75, "y": 2.25, "w": 2.25 }, - { "label": "K2C (D2,B3)", "x": 13.5, "y": 2.25 }, - { "label": "K2D (D2,B2)", "x": 14.5, "y": 2.25 }, - { "label": "K2E (D2,B1)", "x": 15.5, "y": 2.25 }, - { "label": "K30 (D3,F1)", "x": 0, "y": 3.25, "w": 2.25 }, - { "label": "K31 (D3,F4)", "x": 2.25, "y": 3.25 }, - { "label": "K32 (D3,F5)", "x": 3.25, "y": 3.25 }, - { "label": "K33 (D3,F6)", "x": 4.25, "y": 3.25 }, - { "label": "K34 (D3,F7)", "x": 5.25, "y": 3.25 }, - { "label": "K35 (D3,C7)", "x": 6.25, "y": 3.25 }, - { "label": "K36 (D3,C6)", "x": 7.25, "y": 3.25 }, - { "label": "K37 (D3,B6)", "x": 8.25, "y": 3.25 }, - { "label": "K38 (D3,B5)", "x": 9.25, "y": 3.25 }, - { "label": "K39 (D3,B4)", "x": 10.25, "y": 3.25, "w": 1.75 }, - { "label": "K3C (D3,B3)", "x": 13.5, "y": 3.25 }, - { "label": "K3D (D3,B2)", "x": 14.5, "y": 3.25 }, - { "label": "K3E (D3,B1)", "x": 15.5, "y": 3.25 }, - { "label": "K3B (D3,D6)", "x": 12.25, "y": 3.5 }, - { "label": "K40 (D5,F1)", "x": 0, "y": 4.25, "w": 1.25 }, - { "label": "K41 (D5,F4)", "x": 1.25, "y": 4.25, "w": 1.25 }, - { "label": "K42 (D5,F5)", "x": 2.5, "y": 4.25, "w": 1.25 }, - { "label": "K43 (D5,F6)", "x": 3.75, "y": 4.25, "w": 2.75 }, - { "label": "K46 (D5,C6)", "x": 6.5, "y": 4.25, "w": 2.25 }, - { "label": "K47 (D5,B6)", "x": 8.75, "y": 4.25 }, - { "label": "K48 (D5,B5)", "x": 9.75, "y": 4.25, "w": 1.25 }, - { "label": "K4D (D5,B2)", "x": 14.5, "y": 4.25 }, - { "label": "K4E (D5,B1)", "x": 15.5, "y": 4.25 }, - { "label": "K4A (D5,D7)", "x": 11.25, "y": 4.5 }, - { "label": "K4B (D5,D6)", "x": 12.25, "y": 4.5 }, - { "label": "K4C (D5,B3)", "x": 13.25, "y": 4.5 } + {"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.5, "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.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + + {"matrix": [0, 11], "x": 12, "y": 0}, + + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1.25}, + {"matrix": [1, 3], "x": 3.5, "y": 1.25}, + {"matrix": [1, 4], "x": 4.5, "y": 1.25}, + {"matrix": [1, 5], "x": 5.5, "y": 1.25}, + {"matrix": [1, 6], "x": 6.5, "y": 1.25}, + {"matrix": [1, 7], "x": 7.5, "y": 1.25}, + {"matrix": [1, 8], "x": 8.5, "y": 1.25}, + {"matrix": [1, 9], "x": 9.5, "y": 1.25}, + {"matrix": [1, 10], "x": 10.5, "y": 1.25}, + {"matrix": [1, 11], "x": 11.5, "y": 1.25, "w": 1.5}, + + {"matrix": [1, 12], "x": 13.5, "y": 1.25}, + {"matrix": [1, 13], "x": 14.5, "y": 1.25}, + {"matrix": [1, 14], "x": 15.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2.25}, + {"matrix": [2, 2], "x": 2.75, "y": 2.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2.25}, + {"matrix": [2, 4], "x": 4.75, "y": 2.25}, + {"matrix": [2, 5], "x": 5.75, "y": 2.25}, + {"matrix": [2, 6], "x": 6.75, "y": 2.25}, + {"matrix": [2, 7], "x": 7.75, "y": 2.25}, + {"matrix": [2, 8], "x": 8.75, "y": 2.25}, + {"matrix": [2, 9], "x": 9.75, "y": 2.25}, + {"matrix": [2, 10], "x": 10.75, "y": 2.25, "w": 2.25}, + + {"matrix": [2, 12], "x": 13.5, "y": 2.25}, + {"matrix": [2, 13], "x": 14.5, "y": 2.25}, + {"matrix": [2, 14], "x": 15.5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + {"matrix": [3, 6], "x": 7.25, "y": 3.25}, + {"matrix": [3, 7], "x": 8.25, "y": 3.25}, + {"matrix": [3, 8], "x": 9.25, "y": 3.25}, + {"matrix": [3, 9], "x": 10.25, "y": 3.25, "w": 1.75}, + {"matrix": [3, 12], "x": 13.5, "y": 3.25}, + {"matrix": [3, 13], "x": 14.5, "y": 3.25}, + {"matrix": [3, 14], "x": 15.5, "y": 3.25}, + + {"matrix": [3, 11], "x": 12.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4.25, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4.25, "w": 2.75}, + {"matrix": [4, 6], "x": 6.5, "y": 4.25, "w": 2.25}, + {"matrix": [4, 7], "x": 8.75, "y": 4.25}, + {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 1.25}, + {"matrix": [4, 13], "x": 14.5, "y": 4.25}, + {"matrix": [4, 14], "x": 15.5, "y": 4.25}, + + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5}, + {"matrix": [4, 12], "x": 13.25, "y": 4.5} ] } } diff --git a/keyboards/ada/infinity81/infinity81.h b/keyboards/ada/infinity81/infinity81.h deleted file mode 100644 index 199c6f36428a..000000000000 --- a/keyboards/ada/infinity81/infinity81.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \ - K500, K501, K502, K505, K510, K511, K512, K513, K514 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, KC_NO }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514 } \ -} diff --git a/keyboards/ada/infinity81/info.json b/keyboards/ada/infinity81/info.json index cc16b67c046e..f957a01094c4 100644 --- a/keyboards/ada/infinity81/info.json +++ b/keyboards/ada/infinity81/info.json @@ -21,86 +21,94 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (B3,D1)", "x": 0, "y": 0 }, - { "label": "K01 (B3,D2)", "x": 1.25, "y": 0 }, - { "label": "K02 (B3,D3)", "x": 2.25, "y": 0 }, - { "label": "K03 (B3,D5)", "x": 3.25, "y": 0 }, - { "label": "K04 (B3,D4)", "x": 4.25, "y": 0 }, - { "label": "K05 (B3,D6)", "x": 5.5, "y": 0 }, - { "label": "K06 (B3,D7)", "x": 6.5, "y": 0 }, - { "label": "K07 (B3,B4)", "x": 7.5, "y": 0 }, - { "label": "K08 (B3,B5)", "x": 8.5, "y": 0 }, - { "label": "K09 (B3,B6)", "x": 9.75, "y": 0 }, - { "label": "K0A (B3,C6)", "x": 10.75, "y": 0 }, - { "label": "K0B (B3,C7)", "x": 11.75, "y": 0 }, - { "label": "K0C (B3,F5)", "x": 12.75, "y": 0 }, - { "label": "K10 (B2,D1)", "x": 0, "y": 1.25 }, - { "label": "K11 (B2,D2)", "x": 1, "y": 1.25 }, - { "label": "K12 (B2,D3)", "x": 2, "y": 1.25 }, - { "label": "K13 (B2,D5)", "x": 3, "y": 1.25 }, - { "label": "K14 (B2,D4)", "x": 4, "y": 1.25 }, - { "label": "K15 (B2,D6)", "x": 5, "y": 1.25 }, - { "label": "K16 (B2,D7)", "x": 6, "y": 1.25 }, - { "label": "K17 (B2,B4)", "x": 7, "y": 1.25 }, - { "label": "K18 (B2,B5)", "x": 8, "y": 1.25 }, - { "label": "K19 (B2,B6)", "x": 9, "y": 1.25 }, - { "label": "K1A (B2,C6)", "x": 10, "y": 1.25 }, - { "label": "K1B (B2,C7)", "x": 11, "y": 1.25 }, - { "label": "K1C (B2,F5)", "x": 12, "y": 1.25 }, - { "label": "K1D (B2,F1)", "x": 13, "y": 1.25, "w": 2 }, - { "label": "K1E (B2,F4)", "x": 15, "y": 1.25 }, - { "label": "K20 (B1,D1)", "x": 0, "y": 2.25, "w": 1.5 }, - { "label": "K21 (B1,D2)", "x": 1.5, "y": 2.25 }, - { "label": "K22 (B1,D3)", "x": 2.5, "y": 2.25 }, - { "label": "K23 (B1,D5)", "x": 3.5, "y": 2.25 }, - { "label": "K24 (B1,D4)", "x": 4.5, "y": 2.25 }, - { "label": "K25 (B1,D6)", "x": 5.5, "y": 2.25 }, - { "label": "K26 (B1,D7)", "x": 6.5, "y": 2.25 }, - { "label": "K27 (B1,B4)", "x": 7.5, "y": 2.25 }, - { "label": "K28 (B1,B5)", "x": 8.5, "y": 2.25 }, - { "label": "K29 (B1,B6)", "x": 9.5, "y": 2.25 }, - { "label": "K2A (B1,C6)", "x": 10.5, "y": 2.25 }, - { "label": "K2B (B1,C7)", "x": 11.5, "y": 2.25 }, - { "label": "K2C (B1,F5)", "x": 12.5, "y": 2.25 }, - { "label": "K2D (B1,F1)", "x": 13.5, "y": 2.25, "w": 1.5 }, - { "label": "K2E (B1,F4)", "x": 15, "y": 2.25 }, - { "label": "K30 (B0,D1)", "x": 0, "y": 3.25, "w": 1.75 }, - { "label": "K31 (B0,D2)", "x": 1.75, "y": 3.25 }, - { "label": "K32 (B0,D3)", "x": 2.75, "y": 3.25 }, - { "label": "K33 (B0,D5)", "x": 3.75, "y": 3.25 }, - { "label": "K34 (B0,D4)", "x": 4.75, "y": 3.25 }, - { "label": "K35 (B0,D6)", "x": 5.75, "y": 3.25 }, - { "label": "K36 (B0,D7)", "x": 6.75, "y": 3.25 }, - { "label": "K37 (B0,B4)", "x": 7.75, "y": 3.25 }, - { "label": "K38 (B0,B5)", "x": 8.75, "y": 3.25 }, - { "label": "K39 (B0,B6)", "x": 9.75, "y": 3.25 }, - { "label": "K3A (B0,C6)", "x": 10.75, "y": 3.25 }, - { "label": "K3B (B0,C7)", "x": 11.75, "y": 3.25 }, - { "label": "K3D (B0,F1)", "x": 12.75, "y": 3.25, "w": 2.25 }, - { "label": "K3E (B0,F4)", "x": 15, "y": 3.25 }, - { "label": "K40 (F6,D1)", "x": 0, "y": 4.25, "w": 2.25 }, - { "label": "K41 (F6,D2)", "x": 2.25, "y": 4.25 }, - { "label": "K42 (F6,D3)", "x": 3.25, "y": 4.25 }, - { "label": "K43 (F6,D5)", "x": 4.25, "y": 4.25 }, - { "label": "K44 (F6,D4)", "x": 5.25, "y": 4.25 }, - { "label": "K45 (F6,D6)", "x": 6.25, "y": 4.25 }, - { "label": "K46 (F6,D7)", "x": 7.25, "y": 4.25 }, - { "label": "K47 (F6,B4)", "x": 8.25, "y": 4.25 }, - { "label": "K48 (F6,B5)", "x": 9.25, "y": 4.25 }, - { "label": "K49 (F6,B6)", "x": 10.25, "y": 4.25 }, - { "label": "K4A (F6,C6)", "x": 11.25, "y": 4.25 }, - { "label": "K4B (F6,C7)", "x": 12.25, "y": 4.25, "w": 1.75 }, - { "label": "K4D (F6,F1)", "x": 14, "y": 4.25 }, - { "label": "K4E (F6,F4)", "x": 15, "y": 4.25 }, - { "label": "K50 (B7,D1)", "x": 0, "y": 5.25, "w": 1.25 }, - { "label": "K51 (B7,D2)", "x": 1.25, "y": 5.25, "w": 1.25 }, - { "label": "K52 (B7,D3)", "x": 2.5, "y": 5.25, "w": 1.25 }, - { "label": "K55 (B7,D6)", "x": 3.75, "y": 5.25, "w": 6.25 }, - { "label": "K5A (B7,C6)", "x": 10, "y": 5.25, "w": 1.25 }, - { "label": "K5B (B7,C7)", "x": 11.25, "y": 5.25, "w": 1.25 }, - { "label": "K5C (B7,F5)", "x": 13, "y": 5.25 }, - { "label": "K5D (B7,F1)", "x": 14, "y": 5.25 }, - { "label": "K5E (B7,F4)", "x": 15, "y": 5.25 } + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "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, "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, "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": [3, 14], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 14], "x": 15, "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, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 13, "y": 5.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25} ] } } diff --git a/keyboards/adelheid/adelheid.h b/keyboards/adelheid/adelheid.h deleted file mode 100644 index 48d315f30f7b..000000000000 --- a/keyboards/adelheid/adelheid.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2020 floookay - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k2E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k3E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k4E, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, \ - k50, k52, k54, k55, k57, k59, k5C, k5D, k5E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, k4E }, \ - { k50, KC_NO, k52, KC_NO, k54, k55, KC_NO, k57, KC_NO, k59, KC_NO, KC_NO, k5C, k5D, k5E } \ -} diff --git a/keyboards/adelheid/info.json b/keyboards/adelheid/info.json index c323d62a7503..fa203432c123 100644 --- a/keyboards/adelheid/info.json +++ b/keyboards/adelheid/info.json @@ -21,93 +21,98 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0, "y": 0 }, - { "label": "k01", "x": 1.25, "y": 0 }, - { "label": "k02", "x": 2.25, "y": 0 }, - { "label": "k03", "x": 3.5, "y": 0 }, - { "label": "k04", "x": 4.5, "y": 0 }, - { "label": "k05", "x": 5.75, "y": 0 }, - { "label": "k06", "x": 6.75, "y": 0 }, - { "label": "k07", "x": 9.75, "y": 0 }, - { "label": "k08", "x": 10.75, "y": 0 }, - { "label": "k09", "x": 12, "y": 0 }, - { "label": "k0A", "x": 13, "y": 0 }, - { "label": "k0B", "x": 14.25, "y": 0 }, - { "label": "k0C", "x": 15.25, "y": 0 }, - { "label": "k0D", "x": 16.5, "y": 0 }, - { "label": "k0E", "x": 17.75, "y": 0 }, + {"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.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 9.75, "y": 0}, + {"matrix": [0, 8], "x": 10.75, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0}, + {"matrix": [0, 10], "x": 13, "y": 0}, + {"matrix": [0, 11], "x": 14.25, "y": 0}, + {"matrix": [0, 12], "x": 15.25, "y": 0}, + {"matrix": [0, 13], "x": 16.5, "y": 0}, + {"matrix": [0, 14], "x": 17.75, "y": 0}, - { "label": "k10", "x": 0.75, "y": 1.25 }, - { "label": "k11", "x": 1.75, "y": 1.25 }, - { "label": "k12", "x": 2.75, "y": 1.25 }, - { "label": "k13", "x": 4, "y": 1.25 }, - { "label": "k14", "x": 5, "y": 1.25 }, - { "label": "k15", "x": 6, "y": 1.25 }, - { "label": "k16", "x": 7, "y": 1.25 }, - { "label": "k17", "x": 9.5, "y": 1.25 }, - { "label": "k18", "x": 10.5, "y": 1.25 }, - { "label": "k19", "x": 11.5, "y": 1.25 }, - { "label": "k1A", "x": 12.5, "y": 1.25 }, - { "label": "k1B", "x": 13.75, "y": 1.25 }, - { "label": "k1C", "x": 14.75, "y": 1.25 }, - { "label": "k1D", "x": 15.75, "y": 1.25 }, - { "label": "k1E", "x": 16.75, "y": 1.25 }, - { "label": "k2E", "x": 18, "y": 1 }, + {"matrix": [2, 0], "x": 0.75, "y": 1.25}, + {"matrix": [2, 1], "x": 1.75, "y": 1.25}, + {"matrix": [2, 2], "x": 2.75, "y": 1.25}, + {"matrix": [2, 3], "x": 4, "y": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 1.25}, + {"matrix": [2, 5], "x": 6, "y": 1.25}, + {"matrix": [2, 6], "x": 7, "y": 1.25}, + {"matrix": [2, 7], "x": 9.5, "y": 1.25}, + {"matrix": [2, 8], "x": 10.5, "y": 1.25}, + {"matrix": [2, 9], "x": 11.5, "y": 1.25}, + {"matrix": [2, 10], "x": 12.5, "y": 1.25}, + {"matrix": [2, 11], "x": 13.75, "y": 1.25}, + {"matrix": [2, 12], "x": 14.75, "y": 1.25}, + {"matrix": [2, 13], "x": 15.75, "y": 1.25}, + {"matrix": [2, 14], "x": 16.75, "y": 1.25}, - { "label": "k20", "x": 0.5, "y": 2.25, "w": 1.5 }, - { "label": "k21", "x": 2, "y": 2.25 }, - { "label": "k22", "x": 3.5, "y": 2.25 }, - { "label": "k23", "x": 4.5, "y": 2.25 }, - { "label": "k24", "x": 5.5, "y": 2.25 }, - { "label": "k25", "x": 6.5, "y": 2.25 }, - { "label": "k26", "x": 9, "y": 2.25 }, - { "label": "k27", "x": 10, "y": 2.25 }, - { "label": "k28", "x": 11, "y": 2.25 }, - { "label": "k29", "x": 12, "y": 2.25 }, - { "label": "k2A", "x": 13, "y": 2.25 }, - { "label": "k2B", "x": 14.5, "y": 2.25 }, - { "label": "k2C", "x": 15.5, "y": 2.25 }, - { "label": "k2D", "x": 16.5, "y": 2.25, "w": 1.5 }, - { "label": "k3E", "x": 18.25, "y": 2 }, + {"matrix": [3, 14], "x": 18, "y": 1}, - { "label": "k30", "x": 0.25, "y": 3.25, "w": 1.75 }, - { "label": "k31", "x": 2, "y": 3.25 }, - { "label": "k32", "x": 3.75, "y": 3.25 }, - { "label": "k33", "x": 4.75, "y": 3.25 }, - { "label": "k34", "x": 5.75, "y": 3.25 }, - { "label": "k35", "x": 6.75, "y": 3.25 }, - { "label": "k36", "x": 9.25, "y": 3.25 }, - { "label": "k37", "x": 10.25, "y": 3.25 }, - { "label": "k38", "x": 11.25, "y": 3.25 }, - { "label": "k39", "x": 12.25, "y": 3.25 }, - { "label": "k3A", "x": 14, "y": 3.25 }, - { "label": "k3B", "x": 15, "y": 3.25 }, - { "label": "k3C", "x": 16, "y": 3.25, "w": 2.25 }, - { "label": "k4E", "x": 18.5, "y": 3 }, + {"matrix": [3, 0], "x": 0.5, "y": 2.25, "w": 1.5}, + {"matrix": [3, 1], "x": 2, "y": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 2.25}, + {"matrix": [3, 3], "x": 4.5, "y": 2.25}, + {"matrix": [3, 4], "x": 5.5, "y": 2.25}, + {"matrix": [3, 5], "x": 6.5, "y": 2.25}, + {"matrix": [3, 6], "x": 9, "y": 2.25}, + {"matrix": [3, 7], "x": 10, "y": 2.25}, + {"matrix": [3, 8], "x": 11, "y": 2.25}, + {"matrix": [3, 9], "x": 12, "y": 2.25}, + {"matrix": [3, 10], "x": 13, "y": 2.25}, + {"matrix": [3, 11], "x": 14.5, "y": 2.25}, + {"matrix": [3, 12], "x": 15.5, "y": 2.25}, + {"matrix": [3, 13], "x": 16.5, "y": 2.25, "w": 1.5}, - { "label": "k40", "x": 0, "y": 4.25, "w": 2.25 }, - { "label": "k41", "x": 2.25, "y": 4.25 }, - { "label": "k42", "x": 4.25, "y": 4.25 }, - { "label": "k43", "x": 5.25, "y": 4.25 }, - { "label": "k44", "x": 6.25, "y": 4.25 }, - { "label": "k45", "x": 7.25, "y": 4.25 }, - { "label": "k46", "x": 9.5, "y": 4.25 }, - { "label": "k47", "x": 10.5, "y": 4.25 }, - { "label": "k48", "x": 11.5, "y": 4.25 }, - { "label": "k49", "x": 12.5, "y": 4.25 }, - { "label": "k4A", "x": 14.5, "y": 4.25 }, - { "label": "k4B", "x": 15.5, "y": 4.25, "w": 1.75 }, - { "label": "k4D", "x": 17.5, "y": 4.5 }, + {"matrix": [4, 14], "x": 18.25, "y": 2}, - { "label": "k50", "x": 0, "y": 5.25, "w": 1.5 }, - { "label": "k52", "x": 4.25, "y": 5.25, "w": 1.5 }, - { "label": "k54", "x": 5.75, "y": 5.25, "w": 2 }, - { "label": "k55", "x": 7.75, "y": 5.25 }, - { "label": "k57", "x": 9, "y": 5.25, "w": 2.75 }, - { "label": "k59", "x": 11.75, "y": 5.25, "w": 1.5 }, - { "label": "k5C", "x": 16.5, "y": 5.5 }, - { "label": "k5D", "x": 17.5, "y": 5.5 }, - { "label": "k5E", "x": 18.5, "y": 5.5 } + {"matrix": [4, 0], "x": 0.25, "y": 3.25, "w": 1.75}, + {"matrix": [4, 1], "x": 2, "y": 3.25}, + {"matrix": [4, 2], "x": 3.75, "y": 3.25}, + {"matrix": [4, 3], "x": 4.75, "y": 3.25}, + {"matrix": [4, 4], "x": 5.75, "y": 3.25}, + {"matrix": [4, 5], "x": 6.75, "y": 3.25}, + {"matrix": [4, 6], "x": 9.25, "y": 3.25}, + {"matrix": [4, 7], "x": 10.25, "y": 3.25}, + {"matrix": [4, 8], "x": 11.25, "y": 3.25}, + {"matrix": [4, 9], "x": 12.25, "y": 3.25}, + {"matrix": [4, 10], "x": 14, "y": 3.25}, + {"matrix": [4, 11], "x": 15, "y": 3.25}, + {"matrix": [4, 12], "x": 16, "y": 3.25, "w": 2.25}, + + {"matrix": [5, 14], "x": 18.5, "y": 3}, + + {"matrix": [5, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [5, 1], "x": 2.25, "y": 4.25}, + {"matrix": [5, 2], "x": 4.25, "y": 4.25}, + {"matrix": [5, 3], "x": 5.25, "y": 4.25}, + {"matrix": [5, 4], "x": 6.25, "y": 4.25}, + {"matrix": [5, 5], "x": 7.25, "y": 4.25}, + {"matrix": [5, 6], "x": 9.5, "y": 4.25}, + {"matrix": [5, 7], "x": 10.5, "y": 4.25}, + {"matrix": [5, 8], "x": 11.5, "y": 4.25}, + {"matrix": [5, 9], "x": 12.5, "y": 4.25}, + {"matrix": [5, 10], "x": 14.5, "y": 4.25}, + {"matrix": [5, 11], "x": 15.5, "y": 4.25, "w": 1.75}, + + {"matrix": [5, 13], "x": 17.5, "y": 4.5}, + + {"matrix": [6, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [6, 2], "x": 4.25, "y": 5.25, "w": 1.5}, + {"matrix": [6, 4], "x": 5.75, "y": 5.25, "w": 2}, + {"matrix": [6, 5], "x": 7.75, "y": 5.25}, + {"matrix": [6, 7], "x": 9, "y": 5.25, "w": 2.75}, + {"matrix": [6, 9], "x": 11.75, "y": 5.25, "w": 1.5}, + + {"matrix": [6, 12], "x": 16.5, "y": 5.5}, + {"matrix": [6, 13], "x": 17.5, "y": 5.5}, + {"matrix": [6, 14], "x": 18.5, "y": 5.5} ] } } diff --git a/keyboards/adm42/adm42.h b/keyboards/adm42/adm42.h deleted file mode 100644 index 536fb51da510..000000000000 --- a/keyboards/adm42/adm42.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020-2022 Lorenzo Leonini - * SPDX-License-Identifier: GPL-2.0-only - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * 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( \ - K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ - K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \ - K404, K405, K406, K407, K408, K409 \ -) { \ - { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \ - { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ - { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 }, \ - { KC_NO, KC_NO, KC_NO, K404, K405, K407, K406, K408, K409, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/adm42/info.json b/keyboards/adm42/info.json index 3fc07a2c1c5e..0ffebff135ab 100644 --- a/keyboards/adm42/info.json +++ b/keyboards/adm42/info.json @@ -28,51 +28,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"GUI/`~", "x":0, "y":0.8}, - {"label":"Q", "x":1, "y":0.8}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.5}, - {"label":"T", "x":5, "y":0.5}, - {"label":"Y", "x":7.5, "y":0.5}, - {"label":"U", "x":8.5, "y":0.5}, - {"label":"I", "x":9.5, "y":0}, - {"label":"O", "x":10.5, "y":0}, - {"label":"P", "x":11.5, "y":0.8}, - {"label":"GUI/=+", "x":12.5, "y":0.8}, + {"matrix": [0, 0], "x": 0, "y": 0.8}, + {"matrix": [0, 1], "x": 1, "y": 0.8}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"label":"Ctrl/Tab", "x":0, "y":1.8}, - {"label":"A", "x":1, "y":1.8}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.5}, - {"label":"G", "x":5, "y":1.5}, - {"label":"H", "x":7.5, "y":1.5}, - {"label":"J", "x":8.5, "y":1.5}, - {"label":"K", "x":9.5, "y":1}, - {"label":"L", "x":10.5, "y":1}, - {"label":";:", "x":11.5, "y":1.8}, - {"label":"Ctrl/'\"", "x":12.5, "y":1.8}, + {"matrix": [0, 6], "x": 7.5, "y": 0.5}, + {"matrix": [0, 7], "x": 8.5, "y": 0.5}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0.8}, + {"matrix": [0, 11], "x": 12.5, "y": 0.8}, - {"label":"Alt", "x":0, "y":2.8}, - {"label":"Z", "x":1, "y":2.8}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.5}, - {"label":"B", "x":5, "y":2.5}, - {"label":"N", "x":7.5, "y":2.5}, - {"label":"M", "x":8.5, "y":2.5}, - {"label":",<", "x":9.5, "y":2}, - {"label":".>", "x":10.5, "y":2}, - {"label":"/?", "x":11.5, "y":2.8}, - {"label":"Alt", "x":12.5, "y":2.8}, + {"matrix": [1, 0], "x": 0, "y": 1.8}, + {"matrix": [1, 1], "x": 1, "y": 1.8}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"label":"Special/Esc", "x":4.25, "y":3.55}, - {"label":"Shift/Backspace", "x":5.25, "y":3.65}, - {"label":"Adm/Delete", "x":6.25, "y":1.875, "h":1.25}, - {"label":"Extra/Enter", "x":6.25, "y":4.05}, - {"label":"Shift/Space", "x":7.25, "y":3.65}, - {"label":"Special/Alt", "x":8.25, "y":3.55} + {"matrix": [1, 6], "x": 7.5, "y": 1.5}, + {"matrix": [1, 7], "x": 8.5, "y": 1.5}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1.8}, + {"matrix": [1, 11], "x": 12.5, "y": 1.8}, + + {"matrix": [2, 0], "x": 0, "y": 2.8}, + {"matrix": [2, 1], "x": 1, "y": 2.8}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [2, 6], "x": 7.5, "y": 2.5}, + {"matrix": [2, 7], "x": 8.5, "y": 2.5}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2.8}, + {"matrix": [2, 11], "x": 12.5, "y": 2.8}, + + {"matrix": [3, 3], "x": 4.25, "y": 3.55}, + {"matrix": [3, 4], "x": 5.25, "y": 3.65}, + {"matrix": [3, 6], "x": 6.25, "y": 1.875, "h": 1.25}, + + {"matrix": [3, 5], "x": 6.25, "y": 4.05}, + {"matrix": [3, 7], "x": 7.25, "y": 3.65}, + {"matrix": [3, 8], "x": 8.25, "y": 3.55} ] } } diff --git a/keyboards/adpenrose/kintsugi/info.json b/keyboards/adpenrose/kintsugi/info.json index 1014362503c7..3daf3326acd7 100644 --- a/keyboards/adpenrose/kintsugi/info.json +++ b/keyboards/adpenrose/kintsugi/info.json @@ -26,75 +26,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, + {"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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0, "w": 2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Enc", "x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [7, 6], "x": 15, "y": 2}, - {"label":"LShift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"RShift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"M1", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 6], "x": 15, "y": 3}, - {"label":"LCtrl", "x":0, "y":4, "w":1.25}, - {"label":"LSuper", "x":1.25, "y":4, "w":1.25}, - {"label":"LAlt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"L1", "x":10, "y":4, "w":1.5}, - {"label":"L2", "x":11.5, "y":4, "w":1.5}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 13, "y": 4}, + {"matrix": [9, 5], "x": 14, "y": 4}, + {"matrix": [9, 6], "x": 15, "y": 4} ] } } diff --git a/keyboards/adpenrose/kintsugi/kintsugi.c b/keyboards/adpenrose/kintsugi/kintsugi.c index 59e7d79b55f6..0fd26d317e2f 100644 --- a/keyboards/adpenrose/kintsugi/kintsugi.c +++ b/keyboards/adpenrose/kintsugi/kintsugi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "kintsugi.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/adpenrose/kintsugi/kintsugi.h b/keyboards/adpenrose/kintsugi/kintsugi.h deleted file mode 100644 index 728ef72d0a0c..000000000000 --- a/keyboards/adpenrose/kintsugi/kintsugi.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2022 adpenrose - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, \ - K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, \ - K20, K21, K22, K23, K24, K25, K26, K70, K71, K72, K73, K74, K75, K76, \ - K30, K31, K32, K33, K34, K35, K36, K80, K81, K82, K83, K84, K85, K86, \ - K40, K41, K42, K46, K92, K93, K94, K95, K96 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, K33, K34, K35, K36 }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46 }, \ - { K50, K51, K52, K53, K54, K55, K56 }, \ - { K60, K61, K62, K63, K64, K65, K66 }, \ - { K70, K71, K72, K73, K74, K75, K76 }, \ - { K80, K81, K82, K83, K84, K85, K86 }, \ - { KC_NO, KC_NO, K92, K93, K94, K95, K96 } \ -} diff --git a/keyboards/afternoonlabs/breeze/rev0/info.json b/keyboards/afternoonlabs/breeze/rev0/info.json index 5d3ebbe5cad8..0afb37957fea 100644 --- a/keyboards/afternoonlabs/breeze/rev0/info.json +++ b/keyboards/afternoonlabs/breeze/rev0/info.json @@ -24,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":9.75, "y":0.25}, - {"x":10.75, "y":0.125}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0.125}, - {"x":13.75, "y":0.375}, - {"x":14.75, "y":0.375}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 5], "x": 0, "y": 0.375}, + {"matrix": [0, 4], "x": 1, "y": 0.375}, + {"matrix": [0, 3], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0.125}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":9.75, "y":1.25}, - {"x":10.75, "y":1.125}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1.125}, - {"x":13.75, "y":1.375}, - {"x":14.75, "y":1.375}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [5, 0], "x": 9.75, "y": 0.25}, + {"matrix": [5, 1], "x": 10.75, "y": 0.125}, + {"matrix": [5, 2], "x": 11.75, "y": 0}, + {"matrix": [5, 3], "x": 12.75, "y": 0.125}, + {"matrix": [5, 4], "x": 13.75, "y": 0.375}, + {"matrix": [5, 5], "x": 14.75, "y": 0.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.125}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2.125}, - {"x":13.75, "y":2.375}, - {"x":14.75, "y":2.375}, - {"x":17, "y":2.375}, + {"matrix": [5, 6], "x": 16, "y": 0.375}, + {"matrix": [5, 7], "x": 17, "y": 0.375}, + {"matrix": [5, 8], "x": 18, "y": 0.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.125}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3.125}, - {"x":13.75, "y":3.375}, - {"x":14.75, "y":3.375}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [1, 5], "x": 0, "y": 1.375}, + {"matrix": [1, 4], "x": 1, "y": 1.375}, + {"matrix": [1, 3], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1.125}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, - {"x":2.5, "y":4.25}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":6.25, "y":3.75, "h":2, "r":30}, - {"x":8.5, "y":3.75, "h":2, "r":-30}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25} + {"matrix": [6, 0], "x": 9.75, "y": 1.25}, + {"matrix": [6, 1], "x": 10.75, "y": 1.125}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1.125}, + {"matrix": [6, 4], "x": 13.75, "y": 1.375}, + {"matrix": [6, 5], "x": 14.75, "y": 1.375}, + + {"matrix": [6, 6], "x": 16, "y": 1.375}, + {"matrix": [6, 7], "x": 17, "y": 1.375}, + {"matrix": [6, 8], "x": 18, "y": 1.375}, + + {"matrix": [2, 5], "x": 0, "y": 2.375}, + {"matrix": [2, 4], "x": 1, "y": 2.375}, + {"matrix": [2, 3], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2.125}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + + {"matrix": [7, 0], "x": 9.75, "y": 2.25}, + {"matrix": [7, 1], "x": 10.75, "y": 2.125}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2.125}, + {"matrix": [7, 4], "x": 13.75, "y": 2.375}, + {"matrix": [7, 5], "x": 14.75, "y": 2.375}, + + {"matrix": [7, 7], "x": 17, "y": 2.375}, + + {"matrix": [3, 5], "x": 0, "y": 3.375}, + {"matrix": [3, 4], "x": 1, "y": 3.375}, + {"matrix": [3, 3], "x": 2, "y": 3.125}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3.125}, + {"matrix": [3, 0], "x": 5, "y": 3.25}, + + {"matrix": [8, 0], "x": 9.75, "y": 3.25}, + {"matrix": [8, 1], "x": 10.75, "y": 3.125}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3.125}, + {"matrix": [8, 4], "x": 13.75, "y": 3.375}, + {"matrix": [8, 5], "x": 14.75, "y": 3.375}, + + {"matrix": [8, 6], "x": 16, "y": 3.375}, + {"matrix": [8, 7], "x": 17, "y": 3.375}, + {"matrix": [8, 8], "x": 18, "y": 3.375}, + + {"matrix": [4, 3], "x": 2.5, "y": 4.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 1], "x": 4.5, "y": 4.5}, + {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30}, + + {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 10.25, "y": 4.5}, + {"matrix": [9, 2], "x": 11.25, "y": 4.25}, + {"matrix": [9, 3], "x": 12.25, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/breeze/rev0/rev0.h b/keyboards/afternoonlabs/breeze/rev0/rev0.h deleted file mode 100644 index 4ef5fd328658..000000000000 --- a/keyboards/afternoonlabs/breeze/rev0/rev0.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \ - { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/breeze/rev1/info.json b/keyboards/afternoonlabs/breeze/rev1/info.json index 191c3ffc63ab..21b6a7a43649 100644 --- a/keyboards/afternoonlabs/breeze/rev1/info.json +++ b/keyboards/afternoonlabs/breeze/rev1/info.json @@ -24,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":9.75, "y":0.25}, - {"x":10.75, "y":0.125}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0.125}, - {"x":13.75, "y":0.375}, - {"x":14.75, "y":0.375}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 5], "x": 0, "y": 0.375}, + {"matrix": [0, 4], "x": 1, "y": 0.375}, + {"matrix": [0, 3], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0.125}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":9.75, "y":1.25}, - {"x":10.75, "y":1.125}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1.125}, - {"x":13.75, "y":1.375}, - {"x":14.75, "y":1.375}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [5, 0], "x": 9.75, "y": 0.25}, + {"matrix": [5, 1], "x": 10.75, "y": 0.125}, + {"matrix": [5, 2], "x": 11.75, "y": 0}, + {"matrix": [5, 3], "x": 12.75, "y": 0.125}, + {"matrix": [5, 4], "x": 13.75, "y": 0.375}, + {"matrix": [5, 5], "x": 14.75, "y": 0.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.125}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2.125}, - {"x":13.75, "y":2.375}, - {"x":14.75, "y":2.375}, - {"x":17, "y":2.375}, + {"matrix": [5, 6], "x": 16, "y": 0.375}, + {"matrix": [5, 7], "x": 17, "y": 0.375}, + {"matrix": [5, 8], "x": 18, "y": 0.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.125}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3.125}, - {"x":13.75, "y":3.375}, - {"x":14.75, "y":3.375}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [1, 5], "x": 0, "y": 1.375}, + {"matrix": [1, 4], "x": 1, "y": 1.375}, + {"matrix": [1, 3], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1.125}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, - {"x":2.5, "y":4.25}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":6.25, "y":3.75, "h":2, "r":30}, - {"x":8.5, "y":3.75, "h":2, "r":-30}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25} + {"matrix": [6, 0], "x": 9.75, "y": 1.25}, + {"matrix": [6, 1], "x": 10.75, "y": 1.125}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1.125}, + {"matrix": [6, 4], "x": 13.75, "y": 1.375}, + {"matrix": [6, 5], "x": 14.75, "y": 1.375}, + + {"matrix": [6, 6], "x": 16, "y": 1.375}, + {"matrix": [6, 7], "x": 17, "y": 1.375}, + {"matrix": [6, 8], "x": 18, "y": 1.375}, + + {"matrix": [2, 5], "x": 0, "y": 2.375}, + {"matrix": [2, 4], "x": 1, "y": 2.375}, + {"matrix": [2, 3], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2.125}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + + {"matrix": [7, 0], "x": 9.75, "y": 2.25}, + {"matrix": [7, 1], "x": 10.75, "y": 2.125}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2.125}, + {"matrix": [7, 4], "x": 13.75, "y": 2.375}, + {"matrix": [7, 5], "x": 14.75, "y": 2.375}, + + {"matrix": [7, 7], "x": 17, "y": 2.375}, + + {"matrix": [3, 5], "x": 0, "y": 3.375}, + {"matrix": [3, 4], "x": 1, "y": 3.375}, + {"matrix": [3, 3], "x": 2, "y": 3.125}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3.125}, + {"matrix": [3, 0], "x": 5, "y": 3.25}, + + {"matrix": [8, 0], "x": 9.75, "y": 3.25}, + {"matrix": [8, 1], "x": 10.75, "y": 3.125}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3.125}, + {"matrix": [8, 4], "x": 13.75, "y": 3.375}, + {"matrix": [8, 5], "x": 14.75, "y": 3.375}, + + {"matrix": [8, 6], "x": 16, "y": 3.375}, + {"matrix": [8, 7], "x": 17, "y": 3.375}, + {"matrix": [8, 8], "x": 18, "y": 3.375}, + + {"matrix": [4, 3], "x": 2.5, "y": 4.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 1], "x": 4.5, "y": 4.5}, + {"matrix": [4, 0], "x": 6.25, "y": 3.75, "h": 2, "r": 30}, + + {"matrix": [9, 0], "x": 8.5, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 10.25, "y": 4.5}, + {"matrix": [9, 2], "x": 11.25, "y": 4.25}, + {"matrix": [9, 3], "x": 12.25, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/breeze/rev1/rev1.h b/keyboards/afternoonlabs/breeze/rev1/rev1.h deleted file mode 100644 index 4ef5fd328658..000000000000 --- a/keyboards/afternoonlabs/breeze/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 eithanshavit - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, KC_NO, KC_NO, KC_NO }, \ - { L15, L14, L13, L12, L11, L10, KC_NO, KC_NO, KC_NO }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, KC_NO, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, KC_NO, KC_NO, KC_NO }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json index 1a099ee54843..44f7fa7006af 100644 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/info.json +++ b/keyboards/afternoonlabs/oceanbreeze/rev1/info.json @@ -24,78 +24,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":9.75, "y":0.25}, - {"x":10.75, "y":0.125}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0.125}, - {"x":13.75, "y":0.375}, - {"x":14.75, "y":0.375}, - {"x":16, "y":0.375}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 5], "x": 0, "y": 0.375}, + {"matrix": [0, 4], "x": 1, "y": 0.375}, + {"matrix": [0, 3], "x": 2, "y": 0.125}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 1], "x": 4, "y": 0.125}, + {"matrix": [0, 0], "x": 5, "y": 0.25}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":9.75, "y":1.25}, - {"x":10.75, "y":1.125}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1.125}, - {"x":13.75, "y":1.375}, - {"x":14.75, "y":1.375}, - {"x":16, "y":1.375}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [6, 0], "x": 9.75, "y": 0.25}, + {"matrix": [6, 1], "x": 10.75, "y": 0.125}, + {"matrix": [6, 2], "x": 11.75, "y": 0}, + {"matrix": [6, 3], "x": 12.75, "y": 0.125}, + {"matrix": [6, 4], "x": 13.75, "y": 0.375}, + {"matrix": [6, 5], "x": 14.75, "y": 0.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":9.75, "y":2.25}, - {"x":10.75, "y":2.125}, - {"x":11.75, "y":2}, - {"x":12.75, "y":2.125}, - {"x":13.75, "y":2.375}, - {"x":14.75, "y":2.375}, - {"x":17, "y":2.375}, + {"matrix": [6, 6], "x": 16, "y": 0.375}, + {"matrix": [6, 7], "x": 17, "y": 0.375}, + {"matrix": [6, 8], "x": 18, "y": 0.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6.25, "y":3.75}, - {"x":8.5, "y":3.75}, - {"x":9.75, "y":3.25}, - {"x":10.75, "y":3.125}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3.125}, - {"x":13.75, "y":3.375}, - {"x":14.75, "y":3.375}, - {"x":16, "y":3.375}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [1, 5], "x": 0, "y": 1.375}, + {"matrix": [1, 4], "x": 1, "y": 1.375}, + {"matrix": [1, 3], "x": 2, "y": 1.125}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 1], "x": 4, "y": 1.125}, + {"matrix": [1, 0], "x": 5, "y": 1.25}, - {"x":2.5, "y":4.25}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":6.25, "y":4.75}, - {"x":8.5, "y":4.75}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.25}, - {"x":12.25, "y":4.25} + {"matrix": [7, 0], "x": 9.75, "y": 1.25}, + {"matrix": [7, 1], "x": 10.75, "y": 1.125}, + {"matrix": [7, 2], "x": 11.75, "y": 1}, + {"matrix": [7, 3], "x": 12.75, "y": 1.125}, + {"matrix": [7, 4], "x": 13.75, "y": 1.375}, + {"matrix": [7, 5], "x": 14.75, "y": 1.375}, + + {"matrix": [7, 6], "x": 16, "y": 1.375}, + {"matrix": [7, 7], "x": 17, "y": 1.375}, + {"matrix": [7, 8], "x": 18, "y": 1.375}, + + {"matrix": [2, 5], "x": 0, "y": 2.375}, + {"matrix": [2, 4], "x": 1, "y": 2.375}, + {"matrix": [2, 3], "x": 2, "y": 2.125}, + {"matrix": [2, 2], "x": 3, "y": 2}, + {"matrix": [2, 1], "x": 4, "y": 2.125}, + {"matrix": [2, 0], "x": 5, "y": 2.25}, + + {"matrix": [8, 0], "x": 9.75, "y": 2.25}, + {"matrix": [8, 1], "x": 10.75, "y": 2.125}, + {"matrix": [8, 2], "x": 11.75, "y": 2}, + {"matrix": [8, 3], "x": 12.75, "y": 2.125}, + {"matrix": [8, 4], "x": 13.75, "y": 2.375}, + {"matrix": [8, 5], "x": 14.75, "y": 2.375}, + + {"matrix": [8, 7], "x": 17, "y": 2.375}, + + {"matrix": [3, 5], "x": 0, "y": 3.375}, + {"matrix": [3, 4], "x": 1, "y": 3.375}, + {"matrix": [3, 3], "x": 2, "y": 3.125}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 1], "x": 4, "y": 3.125}, + {"matrix": [3, 0], "x": 5, "y": 3.25}, + + {"matrix": [5, 0], "x": 6.25, "y": 3.75}, + + {"matrix": [11, 0], "x": 8.5, "y": 3.75}, + + {"matrix": [9, 0], "x": 9.75, "y": 3.25}, + {"matrix": [9, 1], "x": 10.75, "y": 3.125}, + {"matrix": [9, 2], "x": 11.75, "y": 3}, + {"matrix": [9, 3], "x": 12.75, "y": 3.125}, + {"matrix": [9, 4], "x": 13.75, "y": 3.375}, + {"matrix": [9, 5], "x": 14.75, "y": 3.375}, + + {"matrix": [9, 6], "x": 16, "y": 3.375}, + {"matrix": [9, 7], "x": 17, "y": 3.375}, + {"matrix": [9, 8], "x": 18, "y": 3.375}, + + {"matrix": [4, 3], "x": 2.5, "y": 4.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 1], "x": 4.5, "y": 4.5}, + {"matrix": [4, 0], "x": 6.25, "y": 4.75}, + + {"matrix": [10, 0], "x": 8.5, "y": 4.75}, + {"matrix": [10, 1], "x": 10.25, "y": 4.5}, + {"matrix": [10, 2], "x": 11.25, "y": 4.25}, + {"matrix": [10, 3], "x": 12.25, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h b/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h deleted file mode 100644 index 08d175f8c051..000000000000 --- a/keyboards/afternoonlabs/oceanbreeze/rev1/rev1.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * 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 XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - L30, L31, L32, L33, L34, L35, LT4, RT1, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT2, RT3, RT4, RT5 \ -) { \ - { L05, L04, L03, L02, L01, L00, XXX, XXX, XXX }, \ - { L15, L14, L13, L12, L11, L10, XXX, XXX, XXX }, \ - { L25, L24, L23, L22, L21, L20, XXX, XXX, XXX }, \ - { L35, L34, L33, L32, L31, L30, XXX, XXX, XXX }, \ - { LT3, LT2, LT1, LT0, XXX, XXX, XXX, XXX, XXX }, \ - { LT4, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, XXX, AUP, XXX }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT2, RT3, RT4, RT5, XXX, XXX, XXX, XXX, XXX }, \ - { RT1, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/info.json b/keyboards/afternoonlabs/southern_breeze/rev1/info.json index c9a7ecc3ca92..c71feef8ba02 100644 --- a/keyboards/afternoonlabs/southern_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/southern_breeze/rev1/info.json @@ -24,76 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.375}, - {"x":3.25, "y":0.375}, - {"x":4.25, "y":0.375}, - {"x":5.25, "y":0.125}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0.125}, - {"x":8.25, "y":0.25}, - {"x":13, "y":0.25}, - {"x":14, "y":0.125}, - {"x":15, "y":0}, - {"x":16, "y":0.125}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 8], "x": 0, "y": 0.375}, + {"matrix": [0, 7], "x": 1, "y": 0.375}, + {"matrix": [0, 6], "x": 2, "y": 0.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.375}, - {"x":3.25, "y":1.375}, - {"x":4.25, "y":1.375}, - {"x":5.25, "y":1.125}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1.125}, - {"x":8.25, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.125}, - {"x":15, "y":1}, - {"x":16, "y":1.125}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [0, 5], "x": 3.25, "y": 0.375}, + {"matrix": [0, 4], "x": 4.25, "y": 0.375}, + {"matrix": [0, 3], "x": 5.25, "y": 0.125}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 1], "x": 7.25, "y": 0.125}, + {"matrix": [0, 0], "x": 8.25, "y": 0.25}, - {"x":1, "y":2.375}, - {"x":3.25, "y":2.375}, - {"x":4.25, "y":2.375}, - {"x":5.25, "y":2.125}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2.125}, - {"x":8.25, "y":2.25}, - {"x":13, "y":2.25}, - {"x":14, "y":2.125}, - {"x":15, "y":2}, - {"x":16, "y":2.125}, - {"x":17, "y":2.375}, - {"x":18, "y":2.375}, + {"matrix": [5, 0], "x": 13, "y": 0.25}, + {"matrix": [5, 1], "x": 14, "y": 0.125}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0.125}, + {"matrix": [5, 4], "x": 17, "y": 0.375}, + {"matrix": [5, 5], "x": 18, "y": 0.375}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.375}, - {"x":3.25, "y":3.375}, - {"x":4.25, "y":3.375}, - {"x":5.25, "y":3.125}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3.125}, - {"x":8.25, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.125}, - {"x":15, "y":3}, - {"x":16, "y":3.125}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [1, 8], "x": 0, "y": 1.375}, + {"matrix": [1, 7], "x": 1, "y": 1.375}, + {"matrix": [1, 6], "x": 2, "y": 1.375}, - {"x":5.75, "y":4.25}, - {"x":6.75, "y":4.25}, - {"x":7.75, "y":4.5}, - {"x":9.5, "y":3.75, "h":2, "r":30}, - {"x":11.75, "y":3.75, "h":2, "r":-30}, - {"x":13.5, "y":4.5}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25} + {"matrix": [1, 5], "x": 3.25, "y": 1.375}, + {"matrix": [1, 4], "x": 4.25, "y": 1.375}, + {"matrix": [1, 3], "x": 5.25, "y": 1.125}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 1], "x": 7.25, "y": 1.125}, + {"matrix": [1, 0], "x": 8.25, "y": 1.25}, + + {"matrix": [6, 0], "x": 13, "y": 1.25}, + {"matrix": [6, 1], "x": 14, "y": 1.125}, + {"matrix": [6, 2], "x": 15, "y": 1}, + {"matrix": [6, 3], "x": 16, "y": 1.125}, + {"matrix": [6, 4], "x": 17, "y": 1.375}, + {"matrix": [6, 5], "x": 18, "y": 1.375}, + + {"matrix": [2, 7], "x": 1, "y": 2.375}, + + {"matrix": [2, 5], "x": 3.25, "y": 2.375}, + {"matrix": [2, 4], "x": 4.25, "y": 2.375}, + {"matrix": [2, 3], "x": 5.25, "y": 2.125}, + {"matrix": [2, 2], "x": 6.25, "y": 2}, + {"matrix": [2, 1], "x": 7.25, "y": 2.125}, + {"matrix": [2, 0], "x": 8.25, "y": 2.25}, + + {"matrix": [7, 0], "x": 13, "y": 2.25}, + {"matrix": [7, 1], "x": 14, "y": 2.125}, + {"matrix": [7, 2], "x": 15, "y": 2}, + {"matrix": [7, 3], "x": 16, "y": 2.125}, + {"matrix": [7, 4], "x": 17, "y": 2.375}, + {"matrix": [7, 5], "x": 18, "y": 2.375}, + + {"matrix": [3, 8], "x": 0, "y": 3.375}, + {"matrix": [3, 7], "x": 1, "y": 3.375}, + {"matrix": [3, 6], "x": 2, "y": 3.375}, + + {"matrix": [3, 5], "x": 3.25, "y": 3.375}, + {"matrix": [3, 4], "x": 4.25, "y": 3.375}, + {"matrix": [3, 3], "x": 5.25, "y": 3.125}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [3, 1], "x": 7.25, "y": 3.125}, + {"matrix": [3, 0], "x": 8.25, "y": 3.25}, + + {"matrix": [8, 0], "x": 13, "y": 3.25}, + {"matrix": [8, 1], "x": 14, "y": 3.125}, + {"matrix": [8, 2], "x": 15, "y": 3}, + {"matrix": [8, 3], "x": 16, "y": 3.125}, + {"matrix": [8, 4], "x": 17, "y": 3.375}, + {"matrix": [8, 5], "x": 18, "y": 3.375}, + + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 2], "x": 6.75, "y": 4.25}, + {"matrix": [4, 1], "x": 7.75, "y": 4.5}, + {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30}, + + {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 13.5, "y": 4.5}, + {"matrix": [9, 2], "x": 14.5, "y": 4.25}, + {"matrix": [9, 3], "x": 15.5, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h b/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h deleted file mode 100644 index b8a83f6aadae..000000000000 --- a/keyboards/afternoonlabs/southern_breeze/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * 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( \ - LW00, LW01, LW02, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - LW10, LW11, LW12, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - LWUP, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - LWLT, LWDN, LWRT, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, LW02, LW01, LW00 }, \ - { L15, L14, L13, L12, L11, L10, LW12, LW11, LW10 }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, LWUP, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, LWRT, LWDN, LWLT }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, KC_NO, KC_NO, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO, KC_NO, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, KC_NO, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, KC_NO, KC_NO, KC_NO }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/info.json b/keyboards/afternoonlabs/summer_breeze/rev1/info.json index f42ad75bac61..4ec3db219cdd 100644 --- a/keyboards/afternoonlabs/summer_breeze/rev1/info.json +++ b/keyboards/afternoonlabs/summer_breeze/rev1/info.json @@ -24,86 +24,99 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.375}, - {"x":3.25, "y":0.375}, - {"x":4.25, "y":0.375}, - {"x":5.25, "y":0.125}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0.125}, - {"x":8.25, "y":0.25}, - {"x":13, "y":0.25}, - {"x":14, "y":0.125}, - {"x":15, "y":0}, - {"x":16, "y":0.125}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, - {"x":19.25, "y":0.375}, - {"x":20.25, "y":0.375}, - {"x":21.25, "y":0.375}, - - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.375}, - {"x":3.25, "y":1.375}, - {"x":4.25, "y":1.375}, - {"x":5.25, "y":1.125}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1.125}, - {"x":8.25, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14, "y":1.125}, - {"x":15, "y":1}, - {"x":16, "y":1.125}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, - {"x":19.25, "y":1.375}, - {"x":20.25, "y":1.375}, - {"x":21.25, "y":1.375}, - - {"x":1, "y":2.375}, - {"x":3.25, "y":2.375}, - {"x":4.25, "y":2.375}, - {"x":5.25, "y":2.125}, - {"x":6.25, "y":2}, - {"x":7.25, "y":2.125}, - {"x":8.25, "y":2.25}, - {"x":13, "y":2.25}, - {"x":14, "y":2.125}, - {"x":15, "y":2}, - {"x":16, "y":2.125}, - {"x":17, "y":2.375}, - {"x":18, "y":2.375}, - {"x":20.25, "y":2.375}, - - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.375}, - {"x":3.25, "y":3.375}, - {"x":4.25, "y":3.375}, - {"x":5.25, "y":3.125}, - {"x":6.25, "y":3}, - {"x":7.25, "y":3.125}, - {"x":8.25, "y":3.25}, - {"x":13, "y":3.25}, - {"x":14, "y":3.125}, - {"x":15, "y":3}, - {"x":16, "y":3.125}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, - {"x":19.25, "y":3.375}, - {"x":20.25, "y":3.375}, - {"x":21.25, "y":3.375}, - - {"x":5.75, "y":4.25}, - {"x":6.75, "y":4.25}, - {"x":7.75, "y":4.5}, - {"x":9.5, "y":3.75, "h":2, "r":30}, - {"x":11.75, "y":3.75, "h":2, "r":-30}, - {"x":13.5, "y":4.5}, - {"x":14.5, "y":4.25}, - {"x":15.5, "y":4.25} + {"matrix": [0, 8], "x": 0, "y": 0.375}, + {"matrix": [0, 7], "x": 1, "y": 0.375}, + {"matrix": [0, 6], "x": 2, "y": 0.375}, + + {"matrix": [0, 5], "x": 3.25, "y": 0.375}, + {"matrix": [0, 4], "x": 4.25, "y": 0.375}, + {"matrix": [0, 3], "x": 5.25, "y": 0.125}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 1], "x": 7.25, "y": 0.125}, + {"matrix": [0, 0], "x": 8.25, "y": 0.25}, + + {"matrix": [5, 0], "x": 13, "y": 0.25}, + {"matrix": [5, 1], "x": 14, "y": 0.125}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [5, 3], "x": 16, "y": 0.125}, + {"matrix": [5, 4], "x": 17, "y": 0.375}, + {"matrix": [5, 5], "x": 18, "y": 0.375}, + + {"matrix": [5, 6], "x": 19.25, "y": 0.375}, + {"matrix": [5, 7], "x": 20.25, "y": 0.375}, + {"matrix": [5, 8], "x": 21.25, "y": 0.375}, + + {"matrix": [1, 8], "x": 0, "y": 1.375}, + {"matrix": [1, 7], "x": 1, "y": 1.375}, + {"matrix": [1, 6], "x": 2, "y": 1.375}, + + {"matrix": [1, 5], "x": 3.25, "y": 1.375}, + {"matrix": [1, 4], "x": 4.25, "y": 1.375}, + {"matrix": [1, 3], "x": 5.25, "y": 1.125}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 1], "x": 7.25, "y": 1.125}, + {"matrix": [1, 0], "x": 8.25, "y": 1.25}, + + {"matrix": [6, 0], "x": 13, "y": 1.25}, + {"matrix": [6, 1], "x": 14, "y": 1.125}, + {"matrix": [6, 2], "x": 15, "y": 1}, + {"matrix": [6, 3], "x": 16, "y": 1.125}, + {"matrix": [6, 4], "x": 17, "y": 1.375}, + {"matrix": [6, 5], "x": 18, "y": 1.375}, + + {"matrix": [6, 6], "x": 19.25, "y": 1.375}, + {"matrix": [6, 7], "x": 20.25, "y": 1.375}, + {"matrix": [6, 8], "x": 21.25, "y": 1.375}, + + {"matrix": [2, 7], "x": 1, "y": 2.375}, + + {"matrix": [2, 5], "x": 3.25, "y": 2.375}, + {"matrix": [2, 4], "x": 4.25, "y": 2.375}, + {"matrix": [2, 3], "x": 5.25, "y": 2.125}, + {"matrix": [2, 2], "x": 6.25, "y": 2}, + {"matrix": [2, 1], "x": 7.25, "y": 2.125}, + {"matrix": [2, 0], "x": 8.25, "y": 2.25}, + + {"matrix": [7, 0], "x": 13, "y": 2.25}, + {"matrix": [7, 1], "x": 14, "y": 2.125}, + {"matrix": [7, 2], "x": 15, "y": 2}, + {"matrix": [7, 3], "x": 16, "y": 2.125}, + {"matrix": [7, 4], "x": 17, "y": 2.375}, + {"matrix": [7, 5], "x": 18, "y": 2.375}, + + {"matrix": [7, 7], "x": 20.25, "y": 2.375}, + + {"matrix": [3, 8], "x": 0, "y": 3.375}, + {"matrix": [3, 7], "x": 1, "y": 3.375}, + {"matrix": [3, 6], "x": 2, "y": 3.375}, + + {"matrix": [3, 5], "x": 3.25, "y": 3.375}, + {"matrix": [3, 4], "x": 4.25, "y": 3.375}, + {"matrix": [3, 3], "x": 5.25, "y": 3.125}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [3, 1], "x": 7.25, "y": 3.125}, + {"matrix": [3, 0], "x": 8.25, "y": 3.25}, + + {"matrix": [8, 0], "x": 13, "y": 3.25}, + {"matrix": [8, 1], "x": 14, "y": 3.125}, + {"matrix": [8, 2], "x": 15, "y": 3}, + {"matrix": [8, 3], "x": 16, "y": 3.125}, + {"matrix": [8, 4], "x": 17, "y": 3.375}, + {"matrix": [8, 5], "x": 18, "y": 3.375}, + + {"matrix": [8, 6], "x": 19.25, "y": 3.375}, + {"matrix": [8, 7], "x": 20.25, "y": 3.375}, + {"matrix": [8, 8], "x": 21.25, "y": 3.375}, + + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 2], "x": 6.75, "y": 4.25}, + {"matrix": [4, 1], "x": 7.75, "y": 4.5}, + {"matrix": [4, 0], "x": 9.5, "y": 3.75, "h": 2, "r": 30}, + + {"matrix": [9, 0], "x": 11.75, "y": 3.75, "h": 2, "r": -30}, + {"matrix": [9, 1], "x": 13.5, "y": 4.5}, + {"matrix": [9, 2], "x": 14.5, "y": 4.25}, + {"matrix": [9, 3], "x": 15.5, "y": 4.25} ] } } diff --git a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h b/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h deleted file mode 100644 index 5fda55504cca..000000000000 --- a/keyboards/afternoonlabs/summer_breeze/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Afternoon Labs - * - * 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( \ - LW00, LW01, LW02, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, MC0, MC1, MC2, \ - LW10, LW11, LW12, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, MC3, MC4, MC5, \ - LW21, L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, AUP, \ - LW30, LW31, LW32, L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, ALT, ADN, ART, \ - LT0, LT1, LT2, LT3, RT0, RT1, RT2, RT3 \ -) \ -{ \ - { L05, L04, L03, L02, L01, L00, LW02, LW01, LW00 }, \ - { L15, L14, L13, L12, L11, L10, LW12, LW11, LW10 }, \ - { L25, L24, L23, L22, L21, L20, KC_NO, LW21, KC_NO }, \ - { L35, L34, L33, L32, L31, L30, LW32, LW31, LW30 }, \ - { LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, MC0, MC1, MC2 }, \ - { R10, R11, R12, R13, R14, R15, MC3, MC4, MC5 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, AUP, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, ALT, ADN, ART }, \ - { RT0, RT1, RT2, RT3, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/ai03/jp60/info.json b/keyboards/ai03/jp60/info.json index c7b55c53be96..922dacafa94a 100644 --- a/keyboards/ai03/jp60/info.json +++ b/keyboards/ai03/jp60/info.json @@ -18,337 +18,74 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "\"", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "&", - "x": 6, - "y": 0 - }, - { - "label": "'", - "x": 7, - "y": 0 - }, - { - "label": "(", - "x": 8, - "y": 0 - }, - { - "label": ")", - "x": 9, - "y": 0 - }, - { - "label": "", - "x": 10, - "y": 0 - }, - { - "label": "=", - "x": 11, - "y": 0 - }, - { - "label": "~", - "x": 12, - "y": 0 - }, - { - "label": "|", - "x": 13, - "y": 0 - }, - { - "label": "Back Space", - "x": 14, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "`", - "x": 11.5, - "y": 1 - }, - { - "label": "{", - "x": 12.5, - "y": 1 - }, - { - "label": "Enter", - "x": 13.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "Fn", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": "+", - "x": 10.75, - "y": 2 - }, - { - "label": "*", - "x": 11.75, - "y": 2 - }, - { - "label": "}", - "x": 12.75, - "y": 2 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": "<", - "x": 9.25, - "y": 3 - }, - { - "label": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "_", - "x": 12.25, - "y": 3 - }, - { - "label": "Shift", - "x": 13.25, - "y": 3, - "w": 1.75 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 4 - }, - { - "label": "Alt", - "x": 2.25, - "y": 4 - }, - { - "label": "\u7121\u5909\u63db", - "x": 3.25, - "y": 4, - "w": 1.25 - }, - { - "label": "", - "x": 4.5, - "y": 4, - "w": 6 - }, - { - "label": "\u5909\u63db", - "x": 10.5, - "y": 4, - "w": 1.25 - }, - { - "label": "\u304b\u306a", - "x": 11.75, - "y": 4 - }, - { - "label": "\u534a\u89d2 \u5168\u89d2 \u6f22\u5b57", - "x": 12.75, - "y": 4 - }, - { - "label": "Caps Lock", - "x": 13.75, - "y": 4, - "w": 1.25 - } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 0], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [1, 13], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 4.5, "y": 4, "w": 6}, + {"matrix": [4, 10], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.75, "y": 4}, + {"matrix": [4, 12], "x": 12.75, "y": 4}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/ai03/jp60/jp60.h b/keyboards/ai03/jp60/jp60.h deleted file mode 100644 index 9635e2f3cea4..000000000000 --- a/keyboards/ai03/jp60/jp60.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 ai03 - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K113, K213, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K403, K407, K410, K411, K412, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, KC_NO, KC_NO, KC_NO, K407, KC_NO, KC_NO, K410, K411, K412, K413 } \ -} diff --git a/keyboards/ai03/lunar/info.json b/keyboards/ai03/lunar/info.json index 2b97d0042ce3..e2d0e78c64c9 100644 --- a/keyboards/ai03/lunar/info.json +++ b/keyboards/ai03/lunar/info.json @@ -18,76 +18,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"BackspaceL", "x":13, "y":0}, - {"label":"BackspaceR", "x":14, "y":0}, - {"label":"Insert", "x":15, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Delete", "x":15, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Home", "x":15, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"End", "x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4, "w":1.25}, - {"label":"Alt", "x":2.75, "y":4, "w":1.5}, - {"x":4.25, "y":4, "w":2.25}, - {"x":6.5, "y":4, "w":1.5}, - {"x":8, "y":4, "w":2.75}, - {"label":"Alt", "x":10.75, "y":4, "w":1.25}, - {"label":"Win", "x":12, "y":4}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/ai03/lunar/lunar.h b/keyboards/ai03/lunar/lunar.h deleted file mode 100644 index 2e66ecb5c56a..000000000000 --- a/keyboards/ai03/lunar/lunar.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, \ - K400, K401, K402, K403, K405, K407, K409, K410, K411, K413, K414 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314 }, \ - { K400, K401, K402, K403, KC_NO, K405, KC_NO, K407, KC_NO, K409, K410, K411, KC_NO, K413, K414 } \ -} diff --git a/keyboards/ai03/orbit/info.json b/keyboards/ai03/orbit/info.json index 981f3cd68527..6a4ee1abf3f0 100644 --- a/keyboards/ai03/orbit/info.json +++ b/keyboards/ai03/orbit/info.json @@ -30,81 +30,83 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.63}, - {"x":1, "y":0.38}, - {"x":2, "y":0.38}, - {"x":3, "y":0.13}, - {"x":4, "y":0}, - {"x":5, "y":0.13}, - {"x":6, "y":0.25}, - {"x":9, "y":0.25}, - {"x":10, "y":0.13}, - {"x":11, "y":0}, - {"x":12, "y":0.13}, - {"x":13, "y":0.38}, - {"x":14, "y":0.38}, - {"x":15, "y":0.63}, + {"matrix": [0, 0], "x": 0, "y": 0.63}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0.38}, + {"matrix": [0, 3], "x": 3, "y": 0.13}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.13}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, - {"x":0, "y":1.63}, - {"x":1, "y":1.38}, - {"x":2, "y":1.38}, - {"x":3, "y":1.13}, - {"x":4, "y":1}, - {"x":5, "y":1.13}, - {"x":6, "y":1.25}, - {"x":9, "y":1.25}, - {"x":10, "y":1.13}, - {"x":11, "y":1}, - {"x":12, "y":1.13}, - {"x":13, "y":1.38}, - {"x":14, "y":1.38}, - {"x":15, "y":1.63}, + {"matrix": [5, 0], "x": 9, "y": 0.25}, + {"matrix": [5, 1], "x": 10, "y": 0.13}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0.13}, + {"matrix": [5, 4], "x": 13, "y": 0.38}, + {"matrix": [5, 5], "x": 14, "y": 0.38}, + {"matrix": [5, 6], "x": 15, "y": 0.63}, - {"x":0, "y":2.63}, - {"x":1, "y":2.38}, - {"x":2, "y":2.38}, - {"x":3, "y":2.13}, - {"x":4, "y":2}, - {"x":5, "y":2.13}, - {"x":6, "y":2.25}, - {"x":9, "y":2.25}, - {"x":10, "y":2.13}, - {"x":11, "y":2}, - {"x":12, "y":2.13}, - {"x":13, "y":2.38}, - {"x":14, "y":2.38}, - {"x":15, "y":2.63}, + {"matrix": [1, 0], "x": 0, "y": 1.63}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1.38}, + {"matrix": [1, 3], "x": 3, "y": 1.13}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.13}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"x":0, "y":3.63}, - {"x":1, "y":3.38}, - {"x":2, "y":3.38}, - {"x":3, "y":3.13}, - {"x":4, "y":3}, - {"x":5, "y":3.13}, - {"x":6, "y":3.25}, - {"x":9, "y":3.25}, - {"x":10, "y":3.13}, - {"x":11, "y":3}, - {"x":12, "y":3.13}, - {"x":13, "y":3.38}, - {"x":14, "y":3.38}, - {"x":15, "y":3.63}, + {"matrix": [6, 0], "x": 9, "y": 1.25}, + {"matrix": [6, 1], "x": 10, "y": 1.13}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1.13}, + {"matrix": [6, 4], "x": 13, "y": 1.38}, + {"matrix": [6, 5], "x": 14, "y": 1.38}, + {"matrix": [6, 6], "x": 15, "y": 1.63}, - {"x":1, "y":4.38}, - {"x":2, "y":4.38}, - {"x":3, "y":4.13}, - {"x":4, "y":4}, + {"matrix": [2, 0], "x": 0, "y": 2.63}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2.38}, + {"matrix": [2, 3], "x": 3, "y": 2.13}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.13}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, - {"x":5.5, "y":4.25}, - {"x":6.5, "y":4.5, "h":1.5}, + {"matrix": [7, 0], "x": 9, "y": 2.25}, + {"matrix": [7, 1], "x": 10, "y": 2.13}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2.13}, + {"matrix": [7, 4], "x": 13, "y": 2.38}, + {"matrix": [7, 5], "x": 14, "y": 2.38}, + {"matrix": [7, 6], "x": 15, "y": 2.63}, - {"x":8.5, "y":4.5, "h":1.5}, - {"x":9.5, "y":4.25}, + {"matrix": [3, 0], "x": 0, "y": 3.63}, + {"matrix": [3, 1], "x": 1, "y": 3.38}, + {"matrix": [3, 2], "x": 2, "y": 3.38}, + {"matrix": [3, 3], "x": 3, "y": 3.13}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.13}, + {"matrix": [3, 6], "x": 6, "y": 3.25}, - {"x":11, "y":4}, - {"x":12, "y":4.13}, - {"x":13, "y":4.38}, - {"x":14, "y":4.38} + {"matrix": [8, 0], "x": 9, "y": 3.25}, + {"matrix": [8, 1], "x": 10, "y": 3.13}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3.13}, + {"matrix": [8, 4], "x": 13, "y": 3.38}, + {"matrix": [8, 5], "x": 14, "y": 3.38}, + {"matrix": [8, 6], "x": 15, "y": 3.63}, + + {"matrix": [4, 1], "x": 1, "y": 4.38}, + {"matrix": [4, 2], "x": 2, "y": 4.38}, + {"matrix": [4, 3], "x": 3, "y": 4.13}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4.25}, + {"matrix": [4, 6], "x": 6.5, "y": 4.5, "h": 1.5}, + + {"matrix": [9, 0], "x": 8.5, "y": 4.5, "h": 1.5}, + {"matrix": [9, 1], "x": 9.5, "y": 4.25}, + {"matrix": [9, 2], "x": 11, "y": 4}, + {"matrix": [9, 3], "x": 12, "y": 4.13}, + {"matrix": [9, 4], "x": 13, "y": 4.38}, + {"matrix": [9, 5], "x": 14, "y": 4.38} ] } } diff --git a/keyboards/ai03/orbit/orbit.h b/keyboards/ai03/orbit/orbit.h index 7f3b1aca32b2..7b9c238ad418 100644 --- a/keyboards/ai03/orbit/orbit.h +++ b/keyboards/ai03/orbit/orbit.h @@ -18,35 +18,6 @@ #include "quantum.h" -#define XXX KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { XXX, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, XXX } \ -} - void led_toggle(uint8_t id, bool on); void set_all_leds(bool leds[6]); void set_layer_indicators(uint8_t layer); diff --git a/keyboards/ai03/orbit_x/info.json b/keyboards/ai03/orbit_x/info.json index dbc9f40d19e9..dca371faf253 100644 --- a/keyboards/ai03/orbit_x/info.json +++ b/keyboards/ai03/orbit_x/info.json @@ -27,54 +27,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.38}, - {"x":1, "y":0.38}, - {"x":2, "y":0.13}, - {"x":3, "y":0}, - {"x":4, "y":0.13}, - {"x":5, "y":0.25}, - {"x":7.5, "y":0.25}, - {"x":8.5, "y":0.13}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0.13}, - {"x":11.5, "y":0.38}, - {"x":12.5, "y":0.38}, - {"x":0, "y":1.38}, - {"x":1, "y":1.38}, - {"x":2, "y":1.13}, - {"x":3, "y":1}, - {"x":4, "y":1.13}, - {"x":5, "y":1.25}, - {"x":7.5, "y":1.25}, - {"x":8.5, "y":1.13}, - {"x":9.5, "y":1}, - {"x":10.5, "y":1.13}, - {"x":11.5, "y":1.38}, - {"x":12.5, "y":1.38}, - {"x":0, "y":2.38}, - {"x":1, "y":2.38}, - {"x":2, "y":2.13}, - {"x":3, "y":2}, - {"x":4, "y":2.13}, - {"x":5, "y":2.25}, - {"x":7.5, "y":2.25}, - {"x":8.5, "y":2.13}, - {"x":9.5, "y":2}, - {"x":10.5, "y":2.13}, - {"x":11.5, "y":2.38}, - {"x":12.5, "y":2.38}, - {"x":0, "y":3.38}, - {"x":1, "y":3.38}, - {"x":2, "y":3.13}, - {"x":3, "y":3}, - {"x":4.25, "y":3.38}, - {"x":5.25, "y":3.25, "h":1.5}, - {"x":7.25, "y":3.25, "h":1.5}, - {"x":8.25, "y":3.38}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3.13}, - {"x":11.5, "y":3.38}, - {"x":12.5, "y":3.38} + {"matrix": [0, 0], "x": 0, "y": 0.38}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0.13}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.13}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [4, 0], "x": 7.5, "y": 0.25}, + {"matrix": [4, 1], "x": 8.5, "y": 0.13}, + {"matrix": [4, 2], "x": 9.5, "y": 0}, + {"matrix": [4, 3], "x": 10.5, "y": 0.13}, + {"matrix": [4, 4], "x": 11.5, "y": 0.38}, + {"matrix": [4, 5], "x": 12.5, "y": 0.38}, + + {"matrix": [1, 0], "x": 0, "y": 1.38}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1.13}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.13}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [5, 0], "x": 7.5, "y": 1.25}, + {"matrix": [5, 1], "x": 8.5, "y": 1.13}, + {"matrix": [5, 2], "x": 9.5, "y": 1}, + {"matrix": [5, 3], "x": 10.5, "y": 1.13}, + {"matrix": [5, 4], "x": 11.5, "y": 1.38}, + {"matrix": [5, 5], "x": 12.5, "y": 1.38}, + + {"matrix": [2, 0], "x": 0, "y": 2.38}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2.13}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.13}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [6, 0], "x": 7.5, "y": 2.25}, + {"matrix": [6, 1], "x": 8.5, "y": 2.13}, + {"matrix": [6, 2], "x": 9.5, "y": 2}, + {"matrix": [6, 3], "x": 10.5, "y": 2.13}, + {"matrix": [6, 4], "x": 11.5, "y": 2.38}, + {"matrix": [6, 5], "x": 12.5, "y": 2.38}, + + {"matrix": [3, 0], "x": 0, "y": 3.38}, + {"matrix": [3, 1], "x": 1, "y": 3.38}, + {"matrix": [3, 2], "x": 2, "y": 3.13}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3.38}, + {"matrix": [3, 5], "x": 5.25, "y": 3.25, "h": 1.5}, + + {"matrix": [7, 0], "x": 7.25, "y": 3.25, "h": 1.5}, + {"matrix": [7, 1], "x": 8.25, "y": 3.38}, + {"matrix": [7, 2], "x": 9.5, "y": 3}, + {"matrix": [7, 3], "x": 10.5, "y": 3.13}, + {"matrix": [7, 4], "x": 11.5, "y": 3.38}, + {"matrix": [7, 5], "x": 12.5, "y": 3.38} ] } } diff --git a/keyboards/ai03/orbit_x/orbit_x.h b/keyboards/ai03/orbit_x/orbit_x.h deleted file mode 100644 index a1ae8304b270..000000000000 --- a/keyboards/ai03/orbit_x/orbit_x.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ -} diff --git a/keyboards/ai03/quasar/info.json b/keyboards/ai03/quasar/info.json index 68dc3c4a6fc5..85551af773d1 100644 --- a/keyboards/ai03/quasar/info.json +++ b/keyboards/ai03/quasar/info.json @@ -18,91 +18,104 @@ "layouts": { "LAYOUT": { "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.5, "y":0}, - {"label":"Scroll Lock", "x":16.5, "y":0}, - {"label":"Pause", "x":17.5, "y":0}, - {"label":"~", "x":0, "y":1.75}, - {"label":"!", "x":1, "y":1.75}, - {"label":"@", "x":2, "y":1.75}, - {"label":"#", "x":3, "y":1.75}, - {"label":"$", "x":4, "y":1.75}, - {"label":"%", "x":5, "y":1.75}, - {"label":"^", "x":6, "y":1.75}, - {"label":"&", "x":7, "y":1.75}, - {"label":"*", "x":8, "y":1.75}, - {"label":"(", "x":9, "y":1.75}, - {"label":")", "x":10, "y":1.75}, - {"label":"_", "x":11, "y":1.75}, - {"label":"+", "x":12, "y":1.75}, - {"label":"Backspace", "x":13, "y":1.75, "w":2}, - {"label":"Insert", "x":15.5, "y":1.75}, - {"label":"Home", "x":16.5, "y":1.75}, - {"label":"PgUp", "x":17.5, "y":1.75}, - {"label":"Tab", "x":0, "y":2.75, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.75}, - {"label":"W", "x":2.5, "y":2.75}, - {"label":"E", "x":3.5, "y":2.75}, - {"label":"R", "x":4.5, "y":2.75}, - {"label":"T", "x":5.5, "y":2.75}, - {"label":"Y", "x":6.5, "y":2.75}, - {"label":"U", "x":7.5, "y":2.75}, - {"label":"I", "x":8.5, "y":2.75}, - {"label":"O", "x":9.5, "y":2.75}, - {"label":"P", "x":10.5, "y":2.75}, - {"label":"{", "x":11.5, "y":2.75}, - {"label":"}", "x":12.5, "y":2.75}, - {"label":"|", "x":13.5, "y":2.75, "w":1.5}, - {"label":"Delete", "x":15.5, "y":2.75}, - {"label":"End", "x":16.5, "y":2.75}, - {"label":"PgDn", "x":17.5, "y":2.75}, - {"label":"Caps Lock", "x":0, "y":3.75, "w":1.25}, - {"label":"A", "x":1.75, "y":3.75}, - {"label":"S", "x":2.75, "y":3.75}, - {"label":"D", "x":3.75, "y":3.75}, - {"label":"F", "x":4.75, "y":3.75}, - {"label":"G", "x":5.75, "y":3.75}, - {"label":"H", "x":6.75, "y":3.75}, - {"label":"J", "x":7.75, "y":3.75}, - {"label":"K", "x":8.75, "y":3.75}, - {"label":"L", "x":9.75, "y":3.75}, - {"label":":", "x":10.75, "y":3.75}, - {"label":"\"", "x":11.75, "y":3.75}, - {"label":"Enter", "x":12.75, "y":3.75, "w":2.25}, - {"label":"Shift", "x":0, "y":4.75, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.75}, - {"label":"X", "x":3.25, "y":4.75}, - {"label":"C", "x":4.25, "y":4.75}, - {"label":"V", "x":5.25, "y":4.75}, - {"label":"B", "x":6.25, "y":4.75}, - {"label":"N", "x":7.25, "y":4.75}, - {"label":"M", "x":8.25, "y":4.75}, - {"label":"<", "x":9.25, "y":4.75}, - {"label":">", "x":10.25, "y":4.75}, - {"label":"?", "x":11.25, "y":4.75}, - {"label":"Shift", "x":12.25, "y":4.75, "w":2.75}, - {"label":"\u2191", "x":16.5, "y":4.75}, - {"label":"Ctrl", "x":0, "y":5.75, "w":1.5}, - {"label":"Alt", "x":2.5, "y":5.75, "w":1.5}, - {"x":4, "y":5.75, "w":7}, - {"label":"Alt", "x":11, "y":5.75, "w":1.5}, - {"label":"Ctrl", "x":13.5, "y":5.75, "w":1.5}, - {"label":"\u2190", "x":15.5, "y":5.75}, - {"label":"\u2193", "x":16.5, "y":5.75}, - {"label":"\u2192", "x":17.5, "y":5.75} - ] + {"matrix": [7, 2], "x": 0, "y": 0}, + + {"matrix": [5, 3], "x": 2, "y": 0}, + {"matrix": [5, 4], "x": 3, "y": 0}, + {"matrix": [6, 4], "x": 4, "y": 0}, + {"matrix": [7, 4], "x": 5, "y": 0}, + + {"matrix": [7, 6], "x": 6.5, "y": 0}, + {"matrix": [7, 8], "x": 7.5, "y": 0}, + {"matrix": [6, 9], "x": 8.5, "y": 0}, + {"matrix": [5, 9], "x": 9.5, "y": 0}, + + {"matrix": [5, 6], "x": 11, "y": 0}, + {"matrix": [4, 6], "x": 12, "y": 0}, + {"matrix": [4, 11], "x": 13, "y": 0}, + {"matrix": [4, 12], "x": 14, "y": 0}, + + {"matrix": [4, 15], "x": 15.5, "y": 0}, + {"matrix": [3, 15], "x": 16.5, "y": 0}, + {"matrix": [1, 14], "x": 17.5, "y": 0}, + + {"matrix": [5, 2], "x": 0, "y": 1.75}, + {"matrix": [4, 2], "x": 1, "y": 1.75}, + {"matrix": [4, 3], "x": 2, "y": 1.75}, + {"matrix": [4, 4], "x": 3, "y": 1.75}, + {"matrix": [4, 5], "x": 4, "y": 1.75}, + {"matrix": [5, 5], "x": 5, "y": 1.75}, + {"matrix": [5, 7], "x": 6, "y": 1.75}, + {"matrix": [4, 7], "x": 7, "y": 1.75}, + {"matrix": [4, 8], "x": 8, "y": 1.75}, + {"matrix": [4, 9], "x": 9, "y": 1.75}, + {"matrix": [4, 10], "x": 10, "y": 1.75}, + {"matrix": [5, 10], "x": 11, "y": 1.75}, + {"matrix": [5, 8], "x": 12, "y": 1.75}, + {"matrix": [6, 6], "x": 13, "y": 1.75, "w": 2}, + + {"matrix": [5, 12], "x": 15.5, "y": 1.75}, + {"matrix": [5, 14], "x": 16.5, "y": 1.75}, + {"matrix": [5, 13], "x": 17.5, "y": 1.75}, + + {"matrix": [6, 2], "x": 0, "y": 2.75, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.75}, + {"matrix": [3, 3], "x": 2.5, "y": 2.75}, + {"matrix": [3, 4], "x": 3.5, "y": 2.75}, + {"matrix": [3, 5], "x": 4.5, "y": 2.75}, + {"matrix": [6, 5], "x": 5.5, "y": 2.75}, + {"matrix": [6, 7], "x": 6.5, "y": 2.75}, + {"matrix": [3, 7], "x": 7.5, "y": 2.75}, + {"matrix": [3, 8], "x": 8.5, "y": 2.75}, + {"matrix": [3, 9], "x": 9.5, "y": 2.75}, + {"matrix": [3, 10], "x": 10.5, "y": 2.75}, + {"matrix": [6, 10], "x": 11.5, "y": 2.75}, + {"matrix": [6, 8], "x": 12.5, "y": 2.75}, + {"matrix": [2, 6], "x": 13.5, "y": 2.75, "w": 1.5}, + + {"matrix": [5, 11], "x": 15.5, "y": 2.75}, + {"matrix": [4, 14], "x": 16.5, "y": 2.75}, + {"matrix": [4, 13], "x": 17.5, "y": 2.75}, + + {"matrix": [6, 3], "x": 0, "y": 3.75, "w": 1.25}, + {"matrix": [2, 2], "x": 1.75, "y": 3.75}, + {"matrix": [2, 3], "x": 2.75, "y": 3.75}, + {"matrix": [2, 4], "x": 3.75, "y": 3.75}, + {"matrix": [2, 5], "x": 4.75, "y": 3.75}, + {"matrix": [7, 5], "x": 5.75, "y": 3.75}, + {"matrix": [7, 7], "x": 6.75, "y": 3.75}, + {"matrix": [2, 7], "x": 7.75, "y": 3.75}, + {"matrix": [2, 8], "x": 8.75, "y": 3.75}, + {"matrix": [2, 9], "x": 9.75, "y": 3.75}, + {"matrix": [2, 10], "x": 10.75, "y": 3.75}, + {"matrix": [7, 10], "x": 11.75, "y": 3.75}, + {"matrix": [1, 6], "x": 12.75, "y": 3.75, "w": 2.25}, + + {"matrix": [6, 1], "x": 0, "y": 4.75, "w": 2.25}, + {"matrix": [1, 2], "x": 2.25, "y": 4.75}, + {"matrix": [1, 3], "x": 3.25, "y": 4.75}, + {"matrix": [1, 4], "x": 4.25, "y": 4.75}, + {"matrix": [1, 5], "x": 5.25, "y": 4.75}, + {"matrix": [0, 5], "x": 6.25, "y": 4.75}, + {"matrix": [0, 7], "x": 7.25, "y": 4.75}, + {"matrix": [1, 7], "x": 8.25, "y": 4.75}, + {"matrix": [1, 8], "x": 9.25, "y": 4.75}, + {"matrix": [1, 9], "x": 10.25, "y": 4.75}, + {"matrix": [0, 10], "x": 11.25, "y": 4.75}, + {"matrix": [1, 1], "x": 12.25, "y": 4.75, "w": 2.75}, + + {"matrix": [7, 14], "x": 16.5, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.75, "w": 1.5}, + {"matrix": [7, 15], "x": 2.5, "y": 5.75, "w": 1.5}, + {"matrix": [0, 6], "x": 4, "y": 5.75, "w": 7}, + {"matrix": [0, 15], "x": 11, "y": 5.75, "w": 1.5}, + {"matrix": [1, 0], "x": 13.5, "y": 5.75, "w": 1.5}, + + {"matrix": [0, 14], "x": 15.5, "y": 5.75}, + {"matrix": [0, 11], "x": 16.5, "y": 5.75}, + {"matrix": [0, 12], "x": 17.5, "y": 5.75} + ] } } } diff --git a/keyboards/ai03/quasar/quasar.h b/keyboards/ai03/quasar/quasar.h deleted file mode 100644 index 4125f81b5a4e..000000000000 --- a/keyboards/ai03/quasar/quasar.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K702, K503, K504, K604, K704, K706, K708, K609, K509, K506, K406, K411, K412, K415, K315, K114, \ - K502, K402, K403, K404, K405, K505, K507, K407, K408, K409, K410, K510, K508, K606, K512, K514, K513, \ - K602, K302, K303, K304, K305, K605, K607, K307, K308, K309, K310, K610, K608, K206, K511, K414, K413, \ - K603, K202, K203, K204, K205, K705, K707, K207, K208, K209, K210, K710, K106, \ - K601, K102, K103, K104, K105, K005, K007, K107, K108, K109, K010, K101, K714, \ - K500, K715, K006, K015, K100, K014, K011, K012 \ -) \ -{ \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K005, K006, K007, KC_NO, KC_NO, K010, K011, K012, KC_NO, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, KC_NO, KC_NO, KC_NO, K114, KC_NO }, \ - { KC_NO, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K302, K303, K304, K305, KC_NO, K307, K308, K309, K310, KC_NO, KC_NO, KC_NO, KC_NO, K315 }, \ - { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415 }, \ - { K500, KC_NO, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, KC_NO }, \ - { KC_NO, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K702, KC_NO, K704, K705, K706, K707, K708, KC_NO, K710, KC_NO, KC_NO, KC_NO, K714, K715 } \ -} diff --git a/keyboards/ai03/voyager60_alps/info.json b/keyboards/ai03/voyager60_alps/info.json index a0641fed377c..0c6ff0466793 100644 --- a/keyboards/ai03/voyager60_alps/info.json +++ b/keyboards/ai03/voyager60_alps/info.json @@ -20,7 +20,78 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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":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":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, "w":2.25}, {"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":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":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/ai03/voyager60_alps/voyager60_alps.h b/keyboards/ai03/voyager60_alps/voyager60_alps.h deleted file mode 100644 index fa178316e494..000000000000 --- a/keyboards/ai03/voyager60_alps/voyager60_alps.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K404, K406, K408, K410, K411, K412, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, KC_NO, K404, KC_NO, K406, KC_NO, K408, KC_NO, K410, K411, K412, K413 } \ -} diff --git a/keyboards/akb/eb46/eb46.h b/keyboards/akb/eb46/eb46.h deleted file mode 100644 index 8dd5290b8db7..000000000000 --- a/keyboards/akb/eb46/eb46.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 Elliot Powell - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define xxx KC_NO - -#define LAYOUT(\ - k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b,\ - k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, \ - k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, \ - k300, k30, k31, k32, k33, k36, k38, k39, k3a \ -) \ -{ \ - {k000, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b},\ - {k100, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, xxx},\ - {k200, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, xxx},\ - {k300, k30, k31, k32, k33, xxx, xxx, k36, xxx, k38, k39, k3a, xxx} \ -} diff --git a/keyboards/akb/eb46/info.json b/keyboards/akb/eb46/info.json index d5c4312cc60f..fafd42cd907a 100644 --- a/keyboards/akb/eb46/info.json +++ b/keyboards/akb/eb46/info.json @@ -17,52 +17,59 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "F1", "x": 0, "y": 0 }, - { "label": "Esc", "x": 1.25, "y": 0 }, - { "label": "Q", "x": 2.25, "y": 0 }, - { "label": "W", "x": 3.25, "y": 0 }, - { "label": "E", "x": 4.25, "y": 0 }, - { "label": "R", "x": 5.25, "y": 0 }, - { "label": "T", "x": 6.25, "y": 0 }, - { "label": "Y", "x": 7.25, "y": 0 }, - { "label": "U", "x": 8.25, "y": 0 }, - { "label": "I", "x": 9.25, "y": 0 }, - { "label": "O", "x": 10.25, "y": 0 }, - { "label": "P", "x": 11.25, "y": 0 }, - { "label": "BackSpace", "x": 12.25, "y": 0 }, - { "label": "F2", "x": 0, "y": 1 }, - { "label": "Tab", "x": 1.25, "y": 1, "w": 1.25 }, - { "label": "A", "x": 2.5, "y": 1 }, - { "label": "S", "x": 3.5, "y": 1 }, - { "label": "D", "x": 4.5, "y": 1 }, - { "label": "F", "x": 5.5, "y": 1 }, - { "label": "G", "x": 6.5, "y": 1 }, - { "label": "H", "x": 7.5, "y": 1 }, - { "label": "J", "x": 8.5, "y": 1 }, - { "label": "K", "x": 9.5, "y": 1 }, - { "label": "L", "x": 10.5, "y": 1 }, - { "label": "Enter", "x": 11.5, "y": 1, "w": 1.75 }, - { "label": "F3", "x": 0, "y": 2 }, - { "label": "Shift", "x": 1.25, "y": 2, "w": 1.75 }, - { "label": "Z", "x": 3, "y": 2 }, - { "label": "X", "x": 4, "y": 2 }, - { "label": "C", "x": 5, "y": 2 }, - { "label": "V", "x": 6, "y": 2 }, - { "label": "B", "x": 7, "y": 2 }, - { "label": "N", "x": 8, "y": 2 }, - { "label": "M", "x": 9, "y": 2 }, - { "label": "<", "x": 10, "y": 2 }, - { "label": ">", "x": 11, "y": 2 }, - { "label": "RShift", "x": 12, "y": 2, "w": 1.25 }, - { "label": "F4", "x": 0, "y": 3 }, - { "label": "Ctrl", "x": 1.25, "y": 3, "w": 1.25 }, - { "label": "Win", "x": 2.5, "y": 3 }, - { "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 }, - { "label": "FN0", "x": 4.75, "y": 3, "w": 2.25 }, - { "label": "Space", "x": 7, "y": 3, "w": 2.75 }, - { "label": "Menu", "x": 9.75, "y": 3 }, - { "label": "RAlt", "x": 10.75, "y": 3, "w": 1.25 }, - { "label": "Super", "x": 12.25, "y": 3 } + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": [2, 11], "x": 12, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 7, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 12.25, "y": 3} ] } } diff --git a/keyboards/akb/raine/info.json b/keyboards/akb/raine/info.json index 9fe50b25af4e..71490b1e6a25 100644 --- a/keyboards/akb/raine/info.json +++ b/keyboards/akb/raine/info.json @@ -17,80 +17,91 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "1", "x": 1, "y": 0 }, - { "label": "2", "x": 2, "y": 0 }, - { "label": "3", "x": 3, "y": 0 }, - { "label": "4", "x": 4, "y": 0 }, - { "label": "5", "x": 5, "y": 0 }, - { "label": "6", "x": 6, "y": 0 }, - { "label": "7", "x": 7, "y": 0 }, - { "label": "8", "x": 8, "y": 0 }, - { "label": "9", "x": 9, "y": 0 }, - { "label": "0", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "BSP", "x": 12, "y": 0 }, - { "label": "Num Lock", "x": 13.25, "y": 0 }, - { "label": "Scroll Lock", "x": 14.25, "y": 0 }, - { "label": "Insert", "x": 15.25, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "|", "x": 11.5, "y": 1, "w": 1.5 }, - { "label": "7", "x": 13.25, "y": 1 }, - { "label": "8", "x": 14.25, "y": 1 }, - { "label": "9", "x": 15.25, "y": 1 }, - { "label": "Caps", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": "~", "x": 10.75, "y": 2 }, - { "label": "ENTER", "x": 11.75, "y": 2, "w": 1.25 }, - { "label": "4", "x": 13.25, "y": 2 }, - { "label": "5", "x": 14.25, "y": 2 }, - { "label": "6", "x": 15.25, "y": 2 }, - { "label": "Shift", "x": 0, "y": 3, "w": 1.25 }, - { "label": "|", "x": 1.25, "y": 3 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "?", "x": 9.25, "y": 3 }, - { "label": "Shift", "x": 10.25, "y": 3, "w": 1.5 }, - { "x": 12, "y": 3.25 }, - { "label": "1", "x": 13.25, "y": 3 }, - { "label": "2", "x": 14.25, "y": 3 }, - { "label": "3", "x": 15.25, "y": 3 }, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 4}, - { "label": "Alt", "x": 2.25, "y": 4, "w": 1.25 }, - { "label": "SPLEFT", "x": 3.5, "y": 4, "w": 2.25 }, - { "label": "7U", "x": 5.75, "y": 4 }, - { "label": "SPRIGHT", "x": 6.75, "y": 4, "w": 1.75 }, - { "label": "alt", "x": 8.5, "y": 4}, - { "label": "Menu", "x": 9.5, "y": 4, "w": 1.25 }, - { "x": 11, "y": 4.25 }, - { "x": 12, "y": 4.25 }, - { "x": 13, "y": 4.25 }, - { "label": "0", "x": 14.25, "y": 4 }, - { "label": "Del", "x": 15.25, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 13], "x": 13.25, "y": 1}, + {"matrix": [1, 14], "x": 14.25, "y": 1}, + {"matrix": [1, 15], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 14], "x": 14.25, "y": 2}, + {"matrix": [2, 15], "x": 15.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3, "w": 1.5}, + + {"matrix": [3, 12], "x": 12, "y": 3.25}, + + {"matrix": [3, 13], "x": 13.25, "y": 3}, + {"matrix": [3, 14], "x": 14.25, "y": 3}, + {"matrix": [3, 15], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4, "w": 1.75}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 10], "x": 11, "y": 4.25}, + {"matrix": [4, 12], "x": 12, "y": 4.25}, + {"matrix": [4, 13], "x": 13, "y": 4.25}, + + {"matrix": [4, 14], "x": 14.25, "y": 4}, + {"matrix": [4, 15], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/akb/raine/raine.h b/keyboards/akb/raine/raine.h deleted file mode 100644 index ec72a6058289..000000000000 --- a/keyboards/akb/raine/raine.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2019 Elliot Powell - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K113, K114, K115, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K311, K312, K313, K314, K315, \ - K400, K401, K402, K404, K405, K407, K408, K409, K410, K412, K413, K414, K415 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, KC_NO, K113, K114, K115 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K311, KC_NO, K312, K313, K314, K315 }, \ - { K400, K401, K402, KC_NO, K404, K405, KC_NO, K407, K408, K409, K410, KC_NO, K412, K413, K414, K415 } \ -} diff --git a/keyboards/aleblazer/zodiark/info.json b/keyboards/aleblazer/zodiark/info.json index 3df4fb4c3469..73ce2b1c18d6 100644 --- a/keyboards/aleblazer/zodiark/info.json +++ b/keyboards/aleblazer/zodiark/info.json @@ -39,80 +39,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.53}, - {"x":1, "y":0.53}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":12, "y":0.25}, - {"x":13, "y":0.125}, - {"x":14, "y":0}, - {"x":15, "y":0.125}, - {"x":16, "y":0.53}, - {"x":17, "y":0.53}, + {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0.53}, + {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0.53}, + {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0.125}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0.125}, + {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0.25}, - {"x":0, "y":1.53}, - {"x":1, "y":1.53}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":6, "y":1.7}, - {"x":11, "y":1.7}, - {"x":12, "y":1.25}, - {"x":13, "y":1.125}, - {"x":14, "y":1}, - {"x":15, "y":1.125}, - {"x":16, "y":1.53}, - {"x":17, "y":1.53}, + {"label": "R01", "matrix": [5, 5], "x": 12, "y": 0.25}, + {"label": "R02", "matrix": [5, 4], "x": 13, "y": 0.125}, + {"label": "R03", "matrix": [5, 3], "x": 14, "y": 0}, + {"label": "R04", "matrix": [5, 2], "x": 15, "y": 0.125}, + {"label": "R05", "matrix": [5, 1], "x": 16, "y": 0.53}, + {"label": "R06", "matrix": [5, 0], "x": 17, "y": 0.53}, - {"x":0, "y":2.53}, - {"x":1, "y":2.53}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":6, "y":2.7}, - {"x":11, "y":2.7}, - {"x":12, "y":2.25}, - {"x":13, "y":2.125}, - {"x":14, "y":2}, - {"x":15, "y":2.125}, - {"x":16, "y":2.53}, - {"x":17, "y":2.53}, + {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1.53}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1.53}, + {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1.125}, + {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1.125}, + {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1.25}, - {"x":0, "y":3.53}, - {"x":1, "y":3.53}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6.5, "y":4.25}, - {"x":7.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":12, "y":3.25}, - {"x":13, "y":3.125}, - {"x":14, "y":3}, - {"x":15, "y":3.125}, - {"x":16, "y":3.53}, - {"x":17, "y":3.53}, + {"label": "L06", "matrix": [0, 6], "x": 6, "y": 1.7}, - {"x":0, "y":4.53}, - {"x":1, "y":4.53}, - {"x":2, "y":4.125}, - {"x":3, "y":4}, - {"x":4, "y":4.125}, - {"x":6, "y":5.25, "w":1.5}, - {"x":7.5, "y":5.25}, - {"x":9.5, "y":5.25}, - {"x":10.5, "y":5.25, "w":1.5}, - {"x":13, "y":4.125}, - {"x":14, "y":4}, - {"x":15, "y":4.125}, - {"x":16, "y":4.53}, - {"x":17, "y":4.53} + {"label": "R00", "matrix": [5, 6], "x": 11, "y": 1.7}, + + {"label": "R11", "matrix": [6, 5], "x": 12, "y": 1.25}, + {"label": "R12", "matrix": [6, 4], "x": 13, "y": 1.125}, + {"label": "R13", "matrix": [6, 3], "x": 14, "y": 1}, + {"label": "R14", "matrix": [6, 2], "x": 15, "y": 1.125}, + {"label": "R15", "matrix": [6, 1], "x": 16, "y": 1.53}, + {"label": "R16", "matrix": [6, 0], "x": 17, "y": 1.53}, + + {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2.53}, + {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2.53}, + {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2.125}, + {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2.125}, + {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2.25}, + + {"label": "L16", "matrix": [1, 6], "x": 6, "y": 2.7}, + + {"label": "R10", "matrix": [6, 6], "x": 11, "y": 2.7}, + + {"label": "R21", "matrix": [7, 5], "x": 12, "y": 2.25}, + {"label": "R22", "matrix": [7, 4], "x": 13, "y": 2.125}, + {"label": "R23", "matrix": [7, 3], "x": 14, "y": 2}, + {"label": "R24", "matrix": [7, 2], "x": 15, "y": 2.125}, + {"label": "R25", "matrix": [7, 1], "x": 16, "y": 2.53}, + {"label": "R26", "matrix": [7, 0], "x": 17, "y": 2.53}, + + {"label": "L30", "matrix": [3, 0], "x": 0, "y": 3.53}, + {"label": "L31", "matrix": [3, 1], "x": 1, "y": 3.53}, + {"label": "L32", "matrix": [3, 2], "x": 2, "y": 3.125}, + {"label": "L33", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "L34", "matrix": [3, 4], "x": 4, "y": 3.125}, + {"label": "L35", "matrix": [3, 5], "x": 5, "y": 3.25}, + + {"label": "L26", "matrix": [2, 6], "x": 6.5, "y": 4.25}, + {"label": "L36", "matrix": [3, 6], "x": 7.5, "y": 4.25}, + + {"label": "R30", "matrix": [8, 6], "x": 9.5, "y": 4.25}, + {"label": "R20", "matrix": [7, 6], "x": 10.5, "y": 4.25}, + + {"label": "R31", "matrix": [8, 5], "x": 12, "y": 3.25}, + {"label": "R32", "matrix": [8, 4], "x": 13, "y": 3.125}, + {"label": "R33", "matrix": [8, 3], "x": 14, "y": 3}, + {"label": "R34", "matrix": [8, 2], "x": 15, "y": 3.125}, + {"label": "R35", "matrix": [8, 1], "x": 16, "y": 3.53}, + {"label": "R36", "matrix": [8, 0], "x": 17, "y": 3.53}, + + {"label": "L40", "matrix": [4, 0], "x": 0, "y": 4.53}, + {"label": "L41", "matrix": [4, 1], "x": 1, "y": 4.53}, + {"label": "L42", "matrix": [4, 2], "x": 2, "y": 4.125}, + {"label": "L43", "matrix": [4, 3], "x": 3, "y": 4}, + {"label": "L44", "matrix": [4, 4], "x": 4, "y": 4.125}, + {"label": "L45", "matrix": [4, 5], "x": 6, "y": 5.25, "w": 1.5}, + {"label": "L46", "matrix": [4, 6], "x": 7.5, "y": 5.25}, + + {"label": "R40", "matrix": [9, 6], "x": 9.5, "y": 5.25}, + {"label": "R41", "matrix": [9, 5], "x": 10.5, "y": 5.25, "w": 1.5}, + {"label": "R42", "matrix": [9, 4], "x": 13, "y": 4.125}, + {"label": "R43", "matrix": [9, 3], "x": 14, "y": 4}, + {"label": "R44", "matrix": [9, 2], "x": 15, "y": 4.125}, + {"label": "R45", "matrix": [9, 1], "x": 16, "y": 4.53}, + {"label": "R46", "matrix": [9, 0], "x": 17, "y": 4.53} ] } } diff --git a/keyboards/aleblazer/zodiark/zodiark.c b/keyboards/aleblazer/zodiark/zodiark.c index 59429bf38941..8829ac8f3cbb 100644 --- a/keyboards/aleblazer/zodiark/zodiark.c +++ b/keyboards/aleblazer/zodiark/zodiark.c @@ -14,7 +14,7 @@ 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 . */ -#include "zodiark.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/aleblazer/zodiark/zodiark.h b/keyboards/aleblazer/zodiark/zodiark.h deleted file mode 100644 index 5c25cea54708..000000000000 --- a/keyboards/aleblazer/zodiark/zodiark.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 Spencer Deven - -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 3 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( \ - L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L06, R00, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L16, R10, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L26, L36, R30, R20, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} diff --git a/keyboards/alf/x11/info.json b/keyboards/alf/x11/info.json index 2eb6697f9c83..bca26ecb0a11 100644 --- a/keyboards/alf/x11/info.json +++ b/keyboards/alf/x11/info.json @@ -31,104 +31,107 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":2, "y":0}, - {"label":"K02", "x":3, "y":0}, - {"label":"K03", "x":4, "y":0}, - {"label":"K04", "x":5, "y":0}, - {"label":"K05", "x":6.5, "y":0}, - {"label":"K06", "x":7.5, "y":0}, - {"label":"K07", "x":8.5, "y":0}, - {"label":"K08", "x":9.5, "y":0}, - {"label":"K09", "x":11, "y":0}, - {"label":"K0A", "x":12, "y":0}, - {"label":"K0B", "x":13, "y":0}, - {"label":"K0C", "x":14, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"K62", "x":15.25, "y":0}, - {"label":"K61", "x":16.25, "y":0}, - {"label":"K60", "x":17.25, "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}, - {"label":"K10", "x":0, "y":1.5}, - {"label":"K11", "x":1, "y":1.5}, - {"label":"K12", "x":2, "y":1.5}, - {"label":"K13", "x":3, "y":1.5}, - {"label":"K14", "x":4, "y":1.5}, - {"label":"K15", "x":5, "y":1.5}, - {"label":"K16", "x":6, "y":1.5}, - {"label":"K17", "x":7, "y":1.5}, - {"label":"K18", "x":8, "y":1.5}, - {"label":"K19", "x":9, "y":1.5}, - {"label":"K1A", "x":10, "y":1.5}, - {"label":"K1B", "x":11, "y":1.5}, - {"label":"K1C", "x":12, "y":1.5}, - {"label":"K5A", "x":13, "y":1.5, "w":2}, + {"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":"K63", "x":15.25, "y":1.5}, - {"label":"K65", "x":16.25, "y":1.5}, - {"label":"K67", "x":17.25, "y":1.5}, + {"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":"K20", "x":0, "y":2.5, "w":1.5}, - {"label":"K21", "x":1.5, "y":2.5}, - {"label":"K22", "x":2.5, "y":2.5}, - {"label":"K23", "x":3.5, "y":2.5}, - {"label":"K24", "x":4.5, "y":2.5}, - {"label":"K25", "x":5.5, "y":2.5}, - {"label":"K26", "x":6.5, "y":2.5}, - {"label":"K27", "x":7.5, "y":2.5}, - {"label":"K28", "x":8.5, "y":2.5}, - {"label":"K29", "x":9.5, "y":2.5}, - {"label":"K2A", "x":10.5, "y":2.5}, - {"label":"K2B", "x":11.5, "y":2.5}, - {"label":"K2C", "x":12.5, "y":2.5}, - {"label":"K4C", "x":13.5, "y":2.5, "w":1.5}, + {"matrix": [6, 2], "x": 15.25, "y": 0}, + {"matrix": [6, 1], "x": 16.25, "y": 0}, + {"matrix": [6, 0], "x": 17.25, "y": 0}, - {"label":"K64", "x":15.25, "y":2.5}, - {"label":"K66", "x":16.25, "y":2.5}, - {"label":"K68", "x":17.25, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [5, 10], "x": 13, "y": 1.5, "w": 2}, - {"label":"K30", "x":0, "y":3.5, "w":1.75}, - {"label":"K31", "x":1.75, "y":3.5}, - {"label":"K32", "x":2.75, "y":3.5}, - {"label":"K33", "x":3.75, "y":3.5}, - {"label":"K34", "x":4.75, "y":3.5}, - {"label":"K35", "x":5.75, "y":3.5}, - {"label":"K36", "x":6.75, "y":3.5}, - {"label":"K37", "x":7.75, "y":3.5}, - {"label":"K38", "x":8.75, "y":3.5}, - {"label":"K39", "x":9.75, "y":3.5}, - {"label":"K3A", "x":10.75, "y":3.5}, - {"label":"K3B", "x":11.75, "y":3.5}, - {"label":"K3C", "x":12.75, "y":3.5, "w":2.25}, + {"matrix": [6, 3], "x": 15.25, "y": 1.5}, + {"matrix": [6, 5], "x": 16.25, "y": 1.5}, + {"matrix": [6, 7], "x": 17.25, "y": 1.5}, - {"label":"K40", "x":0, "y":4.5, "w":2.25}, - {"label":"K41", "x":2.25, "y":4.5}, - {"label":"K42", "x":3.25, "y":4.5}, - {"label":"K43", "x":4.25, "y":4.5}, - {"label":"K44", "x":5.25, "y":4.5}, - {"label":"K45", "x":6.25, "y":4.5}, - {"label":"K46", "x":7.25, "y":4.5}, - {"label":"K47", "x":8.25, "y":4.5}, - {"label":"K48", "x":9.25, "y":4.5}, - {"label":"K49", "x":10.25, "y":4.5}, - {"label":"K4A", "x":11.25, "y":4.5}, - {"label":"K4B", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K69", "x":14, "y":4.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [4, 12], "x": 13.5, "y": 2.5, "w": 1.5}, - {"label":"K58", "x":16.25, "y":4.5}, + {"matrix": [6, 4], "x": 15.25, "y": 2.5}, + {"matrix": [6, 6], "x": 16.25, "y": 2.5}, + {"matrix": [6, 8], "x": 17.25, "y": 2.5}, - {"label":"K50", "x":0, "y":5.5, "w":1.25}, - {"label":"K51", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K53", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K54", "x":10, "y":5.5, "w":1.25}, - {"label":"K55", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K56", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K57", "x":13.75, "y":5.5, "w":1.25}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, - {"label":"K6A", "x":15.25, "y":5.5}, - {"label":"K59", "x":16.25, "y":5.5}, - {"label":"K6B", "x":17.25, "y":5.5} + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [6, 9], "x": 14, "y": 4.5}, + + {"matrix": [5, 8], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [6, 10], "x": 15.25, "y": 5.5}, + {"matrix": [5, 9], "x": 16.25, "y": 5.5}, + {"matrix": [6, 11], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/alf/x11/x11.h b/keyboards/alf/x11/x11.h deleted file mode 100644 index 2a1d886fddde..000000000000 --- a/keyboards/alf/x11/x11.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2019 MechMerlin - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K62, K61, K60, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K5A, K63, K65, K67, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K4C, K64, K66, K68, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K69, K58, \ - K50, K51, K52, K53, K54, K55, K56, K57, K6A, K59, K6B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, KC_NO, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, KC_NO }, \ -} diff --git a/keyboards/alpha/alpha.h b/keyboards/alpha/alpha.h deleted file mode 100755 index 204e03822bb5..000000000000 --- a/keyboards/alpha/alpha.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k25, k27, k28, k29 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, XXX, k25, XXX, k27, k28, k29 } \ -} diff --git a/keyboards/alpha/info.json b/keyboards/alpha/info.json index d7f32ec15602..ede9ad92f90d 100644 --- a/keyboards/alpha/info.json +++ b/keyboards/alpha/info.json @@ -19,7 +19,38 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0.5, "y":2}, {"x":1.5, "y":2}, {"x":2.5, "y":2}, {"x":3.5, "y":2}, {"x":4.5, "y":2, "w":2}, {"x":6.5, "y":2}, {"x":7.5, "y":2}, {"x":8.5, "y":2}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0.5, "y": 2}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2, "w": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2} + ] } } } diff --git a/keyboards/alpine65/alpine65.h b/keyboards/alpine65/alpine65.h deleted file mode 100644 index 4e11bfa086bb..000000000000 --- a/keyboards/alpine65/alpine65.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2015 Á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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C , K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, ___}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, ___, K2E}, \ - { K30, ___, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D, K4E} \ -} diff --git a/keyboards/alpine65/info.json b/keyboards/alpine65/info.json index 2218f951fab3..4919b91fecf4 100644 --- a/keyboards/alpine65/info.json +++ b/keyboards/alpine65/info.json @@ -21,77 +21,81 @@ "layouts": { "LAYOUT": { "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, "w":2}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"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.25, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w":2.25}, - {"x":15.25, "y":2.25}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, - {"x":0, "y":3, "w":2.25}, - {"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.25, "y":3.25}, - {"x":15.25, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - {"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}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13.25, "y":4.25}, - {"x":14.25, "y":4.25}, - {"x":15.25, "y":4.25} + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + {"matrix": [3, 14], "x": 15.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + + {"matrix": [4, 12], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25} ] } } diff --git a/keyboards/amjkeyboard/amj84/amj84.h b/keyboards/amjkeyboard/amj84/amj84.h deleted file mode 100644 index 19718da8cdcd..000000000000 --- a/keyboards/amjkeyboard/amj84/amj84.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 peepeetee (@peepeetee) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K55, K58, K59, K5A, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52,KC_NO,KC_NO,K55,KC_NO,KC_NO,K58,K59,K5A, K5B, K5C, K5D, K5E } \ -} diff --git a/keyboards/amjkeyboard/amj84/info.json b/keyboards/amjkeyboard/amj84/info.json index aeb61944458f..26a3fad1bc83 100644 --- a/keyboards/amjkeyboard/amj84/info.json +++ b/keyboards/amjkeyboard/amj84/info.json @@ -22,92 +22,97 @@ "layouts": { "LAYOUT": { "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 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "w": 2, "x": 13, "y": 1 }, - { "x": 15, "y": 1 }, - { "w": 1.5, "x": 0, "y": 2 }, - { "x": 1.5, "y": 2 }, - { "x": 2.5, "y": 2 }, - { "x": 3.5, "y": 2 }, - { "x": 4.5, "y": 2 }, - { "x": 5.5, "y": 2 }, - { "x": 6.5, "y": 2 }, - { "x": 7.5, "y": 2 }, - { "x": 8.5, "y": 2 }, - { "x": 9.5, "y": 2 }, - { "x": 10.5, "y": 2 }, - { "x": 11.5, "y": 2 }, - { "x": 12.5, "y": 2 }, - { "w": 1.5, "x": 13.5, "y": 2 }, - { "x": 15, "y": 2 }, - { "w": 1.75, "x": 0, "y": 3 }, - { "x": 1.75, "y": 3 }, - { "x": 2.75, "y": 3 }, - { "x": 3.75, "y": 3 }, - { "x": 4.75, "y": 3 }, - { "x": 5.75, "y": 3 }, - { "x": 6.75, "y": 3 }, - { "x": 7.75, "y": 3 }, - { "x": 8.75, "y": 3 }, - { "x": 9.75, "y": 3 }, - { "x": 10.75, "y": 3 }, - { "x": 11.75, "y": 3 }, - { "x": 12.75, "y": 3 }, - { "w": 1.25, "x": 13.75, "y": 3 }, - { "x": 15, "y": 3 }, - { "w": 2.25, "x": 0, "y": 4 }, - { "x": 2.25, "y": 4 }, - { "x": 3.25, "y": 4 }, - { "x": 4.25, "y": 4 }, - { "x": 5.25, "y": 4 }, - { "x": 6.25, "y": 4 }, - { "x": 7.25, "y": 4 }, - { "x": 8.25, "y": 4 }, - { "x": 9.25, "y": 4 }, - { "x": 10.25, "y": 4 }, - { "x": 11.25, "y": 4 }, - { "w": 1.75, "x": 12.25, "y": 4 }, - { "x": 14, "y": 4 }, - { "x": 15, "y": 4 }, - { "w": 1.25, "x": 0, "y": 5 }, - { "w": 1.25, "x": 1.25, "y": 5 }, - { "w": 1.25, "x": 2.5, "y": 5 }, - { "w": 5.25, "x": 3.75, "y": 5 }, - { "x": 9, "y": 5 }, - { "x": 10, "y": 5 }, - { "x": 11, "y": 5 }, - { "x": 12, "y": 5 }, - { "x": 13, "y": 5 }, - { "x": 14, "y": 5 }, - { "x": 15, "y": 5 } + {"label": "K00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "K05", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "K06", "matrix": [0, 6], "x": 6, "y": 0}, + {"label": "K07", "matrix": [0, 7], "x": 7, "y": 0}, + {"label": "K08", "matrix": [0, 8], "x": 8, "y": 0}, + {"label": "K09", "matrix": [0, 9], "x": 9, "y": 0}, + {"label": "K0A", "matrix": [0, 10], "x": 10, "y": 0}, + {"label": "K0B", "matrix": [0, 11], "x": 11, "y": 0}, + {"label": "K0C", "matrix": [0, 12], "x": 12, "y": 0}, + {"label": "K0D", "matrix": [0, 13], "x": 13, "y": 0}, + {"label": "K0E", "matrix": [0, 14], "x": 14, "y": 0}, + {"label": "K10", "matrix": [1, 0], "x": 15, "y": 0}, + + {"label": "K11", "matrix": [1, 1], "x": 0, "y": 1}, + {"label": "K12", "matrix": [1, 2], "x": 1, "y": 1}, + {"label": "K13", "matrix": [1, 3], "x": 2, "y": 1}, + {"label": "K14", "matrix": [1, 4], "x": 3, "y": 1}, + {"label": "K15", "matrix": [1, 5], "x": 4, "y": 1}, + {"label": "K16", "matrix": [1, 6], "x": 5, "y": 1}, + {"label": "K17", "matrix": [1, 7], "x": 6, "y": 1}, + {"label": "K18", "matrix": [1, 8], "x": 7, "y": 1}, + {"label": "K19", "matrix": [1, 9], "x": 8, "y": 1}, + {"label": "K1A", "matrix": [1, 10], "x": 9, "y": 1}, + {"label": "K1B", "matrix": [1, 11], "x": 10, "y": 1}, + {"label": "K1C", "matrix": [1, 12], "x": 11, "y": 1}, + {"label": "K1D", "matrix": [1, 13], "x": 12, "y": 1}, + {"label": "K1E", "matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"label": "K20", "matrix": [2, 0], "x": 15, "y": 1}, + + {"label": "K21", "matrix": [2, 1], "x": 0, "y": 2, "w": 1.5}, + {"label": "K22", "matrix": [2, 2], "x": 1.5, "y": 2}, + {"label": "K23", "matrix": [2, 3], "x": 2.5, "y": 2}, + {"label": "K24", "matrix": [2, 4], "x": 3.5, "y": 2}, + {"label": "K25", "matrix": [2, 5], "x": 4.5, "y": 2}, + {"label": "K26", "matrix": [2, 6], "x": 5.5, "y": 2}, + {"label": "K27", "matrix": [2, 7], "x": 6.5, "y": 2}, + {"label": "K28", "matrix": [2, 8], "x": 7.5, "y": 2}, + {"label": "K29", "matrix": [2, 9], "x": 8.5, "y": 2}, + {"label": "K2A", "matrix": [2, 10], "x": 9.5, "y": 2}, + {"label": "K2B", "matrix": [2, 11], "x": 10.5, "y": 2}, + {"label": "K2C", "matrix": [2, 12], "x": 11.5, "y": 2}, + {"label": "K2D", "matrix": [2, 13], "x": 12.5, "y": 2}, + {"label": "K2E", "matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"label": "K30", "matrix": [3, 0], "x": 15, "y": 2}, + + {"label": "K31", "matrix": [3, 1], "x": 0, "y": 3, "w": 1.75}, + {"label": "K32", "matrix": [3, 2], "x": 1.75, "y": 3}, + {"label": "K33", "matrix": [3, 3], "x": 2.75, "y": 3}, + {"label": "K34", "matrix": [3, 4], "x": 3.75, "y": 3}, + {"label": "K35", "matrix": [3, 5], "x": 4.75, "y": 3}, + {"label": "K36", "matrix": [3, 6], "x": 5.75, "y": 3}, + {"label": "K37", "matrix": [3, 7], "x": 6.75, "y": 3}, + {"label": "K38", "matrix": [3, 8], "x": 7.75, "y": 3}, + {"label": "K39", "matrix": [3, 9], "x": 8.75, "y": 3}, + {"label": "K3A", "matrix": [3, 10], "x": 9.75, "y": 3}, + {"label": "K3B", "matrix": [3, 11], "x": 10.75, "y": 3}, + {"label": "K3C", "matrix": [3, 12], "x": 11.75, "y": 3}, + {"label": "K3D", "matrix": [3, 13], "x": 12.75, "y": 3}, + {"label": "K3E", "matrix": [3, 14], "x": 13.75, "y": 3, "w": 1.25}, + {"label": "K40", "matrix": [4, 0], "x": 15, "y": 3}, + + {"label": "K41", "matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, + {"label": "K42", "matrix": [4, 2], "x": 2.25, "y": 4}, + {"label": "K43", "matrix": [4, 3], "x": 3.25, "y": 4}, + {"label": "K44", "matrix": [4, 4], "x": 4.25, "y": 4}, + {"label": "K45", "matrix": [4, 5], "x": 5.25, "y": 4}, + {"label": "K46", "matrix": [4, 6], "x": 6.25, "y": 4}, + {"label": "K47", "matrix": [4, 7], "x": 7.25, "y": 4}, + {"label": "K48", "matrix": [4, 8], "x": 8.25, "y": 4}, + {"label": "K49", "matrix": [4, 9], "x": 9.25, "y": 4}, + {"label": "K4A", "matrix": [4, 10], "x": 10.25, "y": 4}, + {"label": "K4B", "matrix": [4, 11], "x": 11.25, "y": 4}, + {"label": "K4C", "matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"label": "K4D", "matrix": [4, 13], "x": 14, "y": 4}, + {"label": "K4E", "matrix": [4, 14], "x": 15, "y": 4}, + + {"label": "K50", "matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"label": "K51", "matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"label": "K52", "matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"label": "K55", "matrix": [5, 5], "x": 3.75, "y": 5, "w": 5.25}, + {"label": "K58", "matrix": [5, 8], "x": 9, "y": 5}, + {"label": "K59", "matrix": [5, 9], "x": 10, "y": 5}, + {"label": "K5A", "matrix": [5, 10], "x": 11, "y": 5}, + {"label": "K5B", "matrix": [5, 11], "x": 12, "y": 5}, + {"label": "K5C", "matrix": [5, 12], "x": 13, "y": 5}, + {"label": "K5D", "matrix": [5, 13], "x": 14, "y": 5}, + {"label": "K5E", "matrix": [5, 14], "x": 15, "y": 5} ] } } diff --git a/keyboards/arabica37/rev1/info.json b/keyboards/arabica37/rev1/info.json index 775257c8de14..a543a83fd9ad 100644 --- a/keyboards/arabica37/rev1/info.json +++ b/keyboards/arabica37/rev1/info.json @@ -24,58 +24,59 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.25, "y":0.75}, - {"label":"Q", "x":1.25, "y":0.75}, - {"label":"W", "x":2.25, "y":0.25}, - {"label":"E", "x":3.25, "y":0}, - {"label":"R", "x":4.25, "y":0.25}, - {"label":"T", "x":5.25, "y":0.5}, + {"matrix": [0, 0], "x": 0.25, "y": 0.75}, + {"matrix": [0, 1], "x": 1.25, "y": 0.75}, + {"matrix": [0, 2], "x": 2.25, "y": 0.25}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0.25}, + {"matrix": [0, 5], "x": 5.25, "y": 0.5}, - {"label":"Y", "x":9, "y":0.5}, - {"label":"U", "x":10, "y":0.25}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.25}, - {"label":"P", "x":13, "y":0.75}, - {"label":"Backspace", "x":14, "y":0.75}, + {"matrix": [4, 5], "x": 9, "y": 0.5}, + {"matrix": [4, 4], "x": 10, "y": 0.25}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0.25}, + {"matrix": [4, 1], "x": 13, "y": 0.75}, + {"matrix": [4, 0], "x": 14, "y": 0.75}, - {"label":"Ctrl", "x":0.25, "y":1.75}, - {"label":"A", "x":1.25, "y":1.75}, - {"label":"S", "x":2.25, "y":1.25}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1.25}, - {"label":"G", "x":5.25, "y":1.5}, + {"matrix": [1, 0], "x": 0.25, "y": 1.75}, + {"matrix": [1, 1], "x": 1.25, "y": 1.75}, + {"matrix": [1, 2], "x": 2.25, "y": 1.25}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1.25}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, - {"label":"H", "x":9, "y":1.5}, - {"label":"J", "x":10, "y":1.25}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.25}, - {"label":";", "x":13, "y":1.75}, - {"label":"'", "x":14, "y":1.75}, + {"matrix": [5, 5], "x": 9, "y": 1.5}, + {"matrix": [5, 4], "x": 10, "y": 1.25}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1.25}, + {"matrix": [5, 1], "x": 13, "y": 1.75}, + {"matrix": [5, 0], "x": 14, "y": 1.75}, - {"label":"Adjust", "x":0.25, "y":2.75}, - {"label":"Z", "x":1.25, "y":2.75}, - {"label":"X", "x":2.25, "y":2.25}, - {"label":"C", "x":3.25, "y":2}, - {"label":"V", "x":4.25, "y":2.25}, - {"label":"B", "x":5.25, "y":2.5}, + {"matrix": [2, 0], "x": 0.25, "y": 2.75}, + {"matrix": [2, 1], "x": 1.25, "y": 2.75}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25}, + {"matrix": [2, 5], "x": 5.25, "y": 2.5}, - {"label":"N", "x":9, "y":2.5}, - {"label":"M", "x":10, "y":2.25}, - {"label":",", "x":11, "y":2}, - {"label":".", "x":12, "y":2.25}, - {"label":"/", "x":13, "y":2.75}, - {"label":"\\", "x":14, "y":2.75}, + {"matrix": [6, 5], "x": 9, "y": 2.5}, + {"matrix": [6, 4], "x": 10, "y": 2.25}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2.25}, + {"matrix": [6, 1], "x": 13, "y": 2.75}, + {"matrix": [6, 0], "x": 14, "y": 2.75}, - {"label":"Shift", "x":0, "y":3.75, "w":2.25}, - {"label":"Lower", "x":4.375, "y":3.75, "w":1.5}, - {"label":"GUI", "x":5.875, "y":3.75, "w":1.25}, + {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 2.25}, + {"matrix": [3, 4], "x": 4.375, "y": 3.75, "w": 1.5}, + {"matrix": [3, 5], "x": 5.875, "y": 3.75, "w": 1.25}, - {"label":"Alt", "x":8.125, "y":3.75, "w":1.25}, - {"label":"Raise", "x":9.375, "y":3.75, "w":1.5}, - {"label":"Shift", "x":13, "y":3.75, "w":2.25}, + {"matrix": [7, 5], "x": 8.125, "y": 3.75, "w": 1.25}, + {"matrix": [7, 4], "x": 9.375, "y": 3.75, "w": 1.5}, + {"matrix": [7, 0], "x": 13, "y": 3.75, "w": 2.25}, - {"label":"Space", "x":5.125, "y":4.75, "w":1.25}, - {"label":"Enter", "x":8.875, "y":4.75, "w":1.25} + {"matrix": [3, 3], "x": 5.125, "y": 4.75, "w": 1.25}, + + {"matrix": [7, 3], "x": 8.875, "y": 4.75, "w": 1.25} ] } } diff --git a/keyboards/arabica37/rev1/rev1.h b/keyboards/arabica37/rev1/rev1.h deleted file mode 100644 index 8d247242f66d..000000000000 --- a/keyboards/arabica37/rev1/rev1.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L26, L31, L32, R26, R30, R32, \ - L30, R31 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L26, KC_NO, KC_NO, L30, L31, L32 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R32, KC_NO, KC_NO, R31, R30, R26 } \ - } diff --git a/keyboards/arisu/arisu.h b/keyboards/arisu/arisu.h deleted file mode 100644 index 1d123502ad4a..000000000000 --- a/keyboards/arisu/arisu.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 Fate - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ - k40, k42, k44, k45, k47, k49, k4C, k4D, k4E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ - { k40, XXX, k42, XXX, k44, k45, XXX, k47, XXX, k49, XXX, XXX, k4C, k4D, k4E } \ -} diff --git a/keyboards/arisu/info.json b/keyboards/arisu/info.json index 941f9a467d92..4e59c2c211a4 100644 --- a/keyboards/arisu/info.json +++ b/keyboards/arisu/info.json @@ -18,77 +18,86 @@ "layouts": { "LAYOUT": { "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":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":16, "y":0}, - {"x":17.3, "y":0}, + {"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}, - {"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":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}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1, "w":1.5}, - {"x":17.3, "y":1}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "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, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, - {"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":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}, - {"x":14.75, "y":2, "w":2.25}, - {"x":17.3, "y":2}, + {"matrix": [1, 14], "x": 17.3, "y": 0}, - {"x":0, "y":3, "w":2.25}, - {"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":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3, "w":1.75}, - {"x":16.3, "y":3.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"x":0, "y":4, "w":1.5}, - {"x":3.25, "y":4, "w":1.5}, - {"x":4.75, "y":4, "w":2}, - {"x":6.75, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":2.75}, - {"x":11.5, "y":4, "w":1.5}, - {"x":15.3, "y":4.25}, - {"x":16.3, "y":4.25}, - {"x":17.3, "y":4.25} + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1}, + {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 17.3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.75, "y": 2}, + {"matrix": [2, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 8], "x": 10.75, "y": 2}, + {"matrix": [2, 9], "x": 11.75, "y": 2}, + {"matrix": [2, 10], "x": 12.75, "y": 2}, + {"matrix": [2, 11], "x": 13.75, "y": 2}, + {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 17.3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 9.25, "y": 3}, + {"matrix": [3, 7], "x": 10.25, "y": 3}, + {"matrix": [3, 8], "x": 11.25, "y": 3}, + {"matrix": [3, 9], "x": 12.25, "y": 3}, + {"matrix": [3, 10], "x": 13.25, "y": 3}, + {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.3, "y": 4.25}, + {"matrix": [4, 13], "x": 16.3, "y": 4.25}, + {"matrix": [4, 14], "x": 17.3, "y": 4.25} ] } } diff --git a/keyboards/at_at/660m/660m.c b/keyboards/at_at/660m/660m.c index 92ccc067f80c..2340a0d9a693 100644 --- a/keyboards/at_at/660m/660m.c +++ b/keyboards/at_at/660m/660m.c @@ -1,4 +1,4 @@ -#include "660m.h" +#include "quantum.h" void board_init(void) { SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; diff --git a/keyboards/at_at/660m/660m.h b/keyboards/at_at/660m/660m.h deleted file mode 100644 index 78b6ea4aeecf..000000000000 --- a/keyboards/at_at/660m/660m.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define KNO KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0F, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, KNO, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, KNO, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, KNO, k2D, KNO, KNO }, \ - { k30, KNO, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KNO, k3E, KNO }, \ - { k40, k41, k42, KNO, KNO, KNO, k46, KNO, KNO, KNO, k4A, k4B, k4C, k4D, k4E, k4F } \ -} diff --git a/keyboards/at_at/660m/info.json b/keyboards/at_at/660m/info.json index 4fdd84daeb02..97f38080dc74 100644 --- a/keyboards/at_at/660m/info.json +++ b/keyboards/at_at/660m/info.json @@ -18,11 +18,78 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Ins", "x":15.5, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Del", "x":15.5, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"label":"↑", "x":14.5, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"x":3.5, "y":4, "w":6.25}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Fn", "x":11, "y":4, "w":1.25}, {"label":"Ctrl", "x":12.25, "y":4, "w":1.25}, {"label":"←", "x":13.5, "y":4}, {"label":"↓", "x":14.5, "y":4}, {"label":"→", "x":15.5, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 15], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 14.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.5, "y": 4}, + {"matrix": [4, 14], "x": 14.5, "y": 4}, + {"matrix": [4, 15], "x": 15.5, "y": 4} ] } } diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.c b/keyboards/atlantis/ak81_ve/ak81_ve.c index 2426d70fe8ee..2eda87b5b060 100644 --- a/keyboards/atlantis/ak81_ve/ak81_ve.c +++ b/keyboards/atlantis/ak81_ve/ak81_ve.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ak81_ve.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/atlantis/ak81_ve/ak81_ve.h b/keyboards/atlantis/ak81_ve/ak81_ve.h deleted file mode 100644 index d29532068957..000000000000 --- a/keyboards/atlantis/ak81_ve/ak81_ve.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 @fOmey - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \ - K500, K501, K502, K506, K510, K511, K512, K513, K514 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, KC_NO, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \ - { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514 } \ -} diff --git a/keyboards/atlantis/ak81_ve/info.json b/keyboards/atlantis/ak81_ve/info.json index f7c0c0b3a863..b5ef4538d8ee 100644 --- a/keyboards/atlantis/ak81_ve/info.json +++ b/keyboards/atlantis/ak81_ve/info.json @@ -32,87 +32,102 @@ "layouts": { "LAYOUT": { "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": "Del", "x": 16.25, "y": 0 }, - { "label": "~", "x": 0, "y": 1 }, - { "label": "!", "x": 1, "y": 1 }, - { "label": "@", "x": 2, "y": 1 }, - { "label": "#", "x": 3, "y": 1 }, - { "label": "$", "x": 4, "y": 1 }, - { "label": "%", "x": 5, "y": 1 }, - { "label": "^", "x": 6, "y": 1 }, - { "label": "&", "x": 7, "y": 1 }, - { "label": "*", "x": 8, "y": 1 }, - { "label": "(", "x": 9, "y": 1 }, - { "label": ")", "x": 10, "y": 1 }, - { "label": "_", "x": 11, "y": 1 }, - { "label": "+", "x": 12, "y": 1 }, - { "label": "Backspace", "w": 2, "x": 13, "y": 1 }, - { "label": "Home", "x": 16.25, "y": 1 }, - { "label": "Tab", "w": 1.5, "x": 0, "y": 2 }, - { "label": "Q", "x": 1.5, "y": 2 }, - { "label": "W", "x": 2.5, "y": 2 }, - { "label": "E", "x": 3.5, "y": 2 }, - { "label": "R", "x": 4.5, "y": 2 }, - { "label": "T", "x": 5.5, "y": 2 }, - { "label": "Y", "x": 6.5, "y": 2 }, - { "label": "U", "x": 7.5, "y": 2 }, - { "label": "I", "x": 8.5, "y": 2 }, - { "label": "O", "x": 9.5, "y": 2 }, - { "label": "P", "x": 10.5, "y": 2 }, - { "label": "{", "x": 11.5, "y": 2 }, - { "label": "}", "x": 12.5, "y": 2 }, - { "label": "|", "w": 1.5, "x": 13.5, "y": 2 }, - { "label": "PageUp", "x": 16.25, "y": 2 }, - { "label": "Capslock", "w": 1.75, "x": 0, "y": 3 }, - { "label": "A", "x": 1.75, "y": 3 }, - { "label": "S", "x": 2.75, "y": 3 }, - { "label": "D", "x": 3.75, "y": 3 }, - { "label": "F", "x": 4.75, "y": 3 }, - { "label": "G", "x": 5.75, "y": 3 }, - { "label": "H", "x": 6.75, "y": 3 }, - { "label": "J", "x": 7.75, "y": 3 }, - { "label": "K", "x": 8.75, "y": 3 }, - { "label": "L", "x": 9.75, "y": 3 }, - { "label": ":", "x": 10.75, "y": 3 }, - { "label": "\"", "x": 11.75, "y": 3 }, - { "label": "Enter", "w": 2.25, "x": 12.75, "y": 3 }, - { "label": "PageDown", "x": 16.25, "y": 3 }, - { "label": "Shift", "w": 2.25, "x": 0, "y": 4 }, - { "label": "Z", "x": 2.25, "y": 4 }, - { "label": "X", "x": 3.25, "y": 4 }, - { "label": "C", "x": 4.25, "y": 4 }, - { "label": "V", "x": 5.25, "y": 4 }, - { "label": "B", "x": 6.25, "y": 4 }, - { "label": "N", "x": 7.25, "y": 4 }, - { "label": "M", "x": 8.25, "y": 4 }, - { "label": ",", "x": 9.25, "y": 4 }, - { "label": ".", "x": 10.25, "y": 4 }, - { "label": "?", "x": 11.25, "y": 4 }, - { "label": "Shift", "w": 1.75, "x": 12.25, "y": 4 }, - { "label": "Up", "x": 14.25, "y": 4.25 }, - { "label": "End", "x": 16.25, "y": 4 }, - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5 }, - { "label": "Win", "w": 1.25, "x": 1.25, "y": 5 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5 }, - { "w": 6.25, "x": 3.75, "y": 5 }, - { "label": "Alt", "w": 1.25, "x": 10, "y": 5 }, - { "label": "Fn", "w": 1.25, "x": 11.25, "y": 5 }, - { "label": "Left", "x": 13.25, "y": 5.25 }, - { "label": "Down", "x": 14.25, "y": 5.25 }, - { "label": "Right", "x": 15.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, 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": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + + {"matrix": [1, 14], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [2, 14], "x": 16.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [3, 14], "x": 16.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + + {"matrix": [4, 14], "x": 16.25, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.25}, + {"matrix": [5, 13], "x": 14.25, "y": 5.25}, + {"matrix": [5, 14], "x": 15.25, "y": 5.25} ] } } diff --git a/keyboards/atlas_65/atlas_65.h b/keyboards/atlas_65/atlas_65.h deleted file mode 100644 index 8f7e68ab299a..000000000000 --- a/keyboards/atlas_65/atlas_65.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2020 Joshua Nguyen - * - * 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 XXX KC_NO - -/* ┌───┐ - * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───┬───┐│1E │ ┌───────┐ - * │00 │01 │02 │03 │04 │05 │06 │ │07 │08 │09 │0A │0B │0C │0D │0E │└┬──┴┐ │0D │ 2u Backspace - * ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘ ┌┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴──┬┴───┴┐│2E │ └───────┘ - * │10 │11 │12 │13 │14 │15 │ │16 │17 │18 │19 │1A │1B │1C │1D │└┬──┴┐ - * ┌┴─────┼───┼───┼───┼───┼───┤ └─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─────┴┐│3E │ - * │20 │21 │22 │23 │24 │25 │ │26 │27 │28 │29 │2A │2B │2C │└───┘ - * ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ - * │30 │31 │32 │33 │34 │35 │ │46 │36 │37 │38 │39 │3A │3B │┌───┐ - * ├─────┬──┴───┼───┴─┬─┴───┴─┬─┴─┐ ┌─┴───┴───┴┬──┴──┬┴───┴───┴──────┘│3D │ - * │40 │ │42 │44 │45 │ │47 │49 │ ┌───┼───┼───┐ - * └─────┘ └─────┴───────┴───┘ └──────────┴─────┘ │4C │4D │4E │ - * └───┴───┴───┘ - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k1E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \ - k30, k31, k32, k33, k34, k35, k46, k36, k37, k38, k39, k3A, k3B, k3D, \ - k40, k42, k44, k45, k47, k49, k4C, k4D, k4E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ - { k40, XXX, k42, XXX, k44, k45, k46, k47, XXX, k49, XXX, XXX, k4C, k4D, k4E } \ -} diff --git a/keyboards/atlas_65/info.json b/keyboards/atlas_65/info.json index af2487f60480..5ed5466d472b 100644 --- a/keyboards/atlas_65/info.json +++ b/keyboards/atlas_65/info.json @@ -18,77 +18,85 @@ "layouts": { "LAYOUT": { "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":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, "w":2}, - {"x":17.3, "y":0}, + {"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}, - {"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":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}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1, "w":1.5}, - {"x":17.3, "y":1}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "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, "y": 0, "w": 2}, - {"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":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}, - {"x":14.75, "y":2, "w":2.25}, - {"x":17.3, "y":2}, + {"matrix": [1, 14], "x": 17.3, "y": 0}, - {"x":0, "y":3, "w":2.25}, - {"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":8.25, "y":3}, - {"x":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3, "w":1.75}, - {"x":16.3, "y":3.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"x":0, "y":4, "w":1.5}, - {"x":3.25, "y":4, "w":1.5}, - {"x":4.75, "y":4, "w":2}, - {"x":6.75, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":2.75}, - {"x":11.5, "y":4, "w":1.5}, - {"x":15.3, "y":4.25}, - {"x":16.3, "y":4.25}, - {"x":17.3, "y":4.25} + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1}, + {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 17.3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.75, "y": 2}, + {"matrix": [2, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 8], "x": 10.75, "y": 2}, + {"matrix": [2, 9], "x": 11.75, "y": 2}, + {"matrix": [2, 10], "x": 12.75, "y": 2}, + {"matrix": [2, 11], "x": 13.75, "y": 2}, + {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 17.3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [3, 6], "x": 9.25, "y": 3}, + {"matrix": [3, 7], "x": 10.25, "y": 3}, + {"matrix": [3, 8], "x": 11.25, "y": 3}, + {"matrix": [3, 9], "x": 12.25, "y": 3}, + {"matrix": [3, 10], "x": 13.25, "y": 3}, + {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.3, "y": 4.25}, + {"matrix": [4, 13], "x": 16.3, "y": 4.25}, + {"matrix": [4, 14], "x": 17.3, "y": 4.25} ] } } diff --git a/keyboards/atreus62/atreus62.h b/keyboards/atreus62/atreus62.h deleted file mode 100644 index 6af5d8bf6e86..000000000000 --- a/keyboards/atreus62/atreus62.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - 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, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k46, k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c, k4d } \ -} diff --git a/keyboards/atreus62/info.json b/keyboards/atreus62/info.json index 0221f2c551ba..a745eb5e2727 100644 --- a/keyboards/atreus62/info.json +++ b/keyboards/atreus62/info.json @@ -17,7 +17,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] + "layout": [ + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0.6}, + {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0.6}, + {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0.35}, + {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0.35}, + {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0.7}, + + {"label": "k06", "matrix": [0, 7], "x": 9, "y": 0.7}, + {"label": "k07", "matrix": [0, 8], "x": 10, "y": 0.35}, + {"label": "k08", "matrix": [0, 9], "x": 11, "y": 0}, + {"label": "k09", "matrix": [0, 10], "x": 12, "y": 0.35}, + {"label": "k0a", "matrix": [0, 11], "x": 13, "y": 0.6}, + {"label": "k0b", "matrix": [0, 12], "x": 14, "y": 0.6}, + + {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1.6}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1.6}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1.35}, + {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1.35}, + {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1.7}, + + {"label": "k16", "matrix": [1, 7], "x": 9, "y": 1.7}, + {"label": "k17", "matrix": [1, 8], "x": 10, "y": 1.35}, + {"label": "k18", "matrix": [1, 9], "x": 11, "y": 1}, + {"label": "k19", "matrix": [1, 10], "x": 12, "y": 1.35}, + {"label": "k1a", "matrix": [1, 11], "x": 13, "y": 1.6}, + {"label": "k1b", "matrix": [1, 12], "x": 14, "y": 1.6}, + + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2.6}, + {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2.6}, + {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2.35}, + {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2.35}, + {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2.7}, + + {"label": "k26", "matrix": [2, 7], "x": 9, "y": 2.7}, + {"label": "k27", "matrix": [2, 8], "x": 10, "y": 2.35}, + {"label": "k28", "matrix": [2, 9], "x": 11, "y": 2}, + {"label": "k29", "matrix": [2, 10], "x": 12, "y": 2.35}, + {"label": "k2a", "matrix": [2, 11], "x": 13, "y": 2.6}, + {"label": "k2b", "matrix": [2, 12], "x": 14, "y": 2.6}, + + {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3.6}, + {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3.6}, + {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3.35}, + {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3.35}, + {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3.7}, + + {"label": "k36", "matrix": [3, 7], "x": 9, "y": 3.7}, + {"label": "k37", "matrix": [3, 8], "x": 10, "y": 3.35}, + {"label": "k38", "matrix": [3, 9], "x": 11, "y": 3}, + {"label": "k39", "matrix": [3, 10], "x": 12, "y": 3.35}, + {"label": "k3a", "matrix": [3, 11], "x": 13, "y": 3.6}, + {"label": "k3b", "matrix": [3, 12], "x": 14, "y": 3.6}, + + {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4.6}, + {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4.6}, + {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4.35}, + {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4}, + {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4.35}, + {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4.7}, + {"label": "k46", "matrix": [3, 6], "x": 6, "y": 3.95, "h": 1.5}, + + {"label": "k47", "matrix": [4, 6], "x": 8, "y": 3.95, "h": 1.5}, + {"label": "k48", "matrix": [4, 7], "x": 9, "y": 4.7}, + {"label": "k49", "matrix": [4, 8], "x": 10, "y": 4.35}, + {"label": "k4a", "matrix": [4, 9], "x": 11, "y": 4}, + {"label": "k4b", "matrix": [4, 10], "x": 12, "y": 4.35}, + {"label": "k4c", "matrix": [4, 11], "x": 13, "y": 4.6}, + {"label": "k4d", "matrix": [4, 12], "x": 14, "y": 4.6} +] } } } diff --git a/keyboards/atreyu/rev1/info.json b/keyboards/atreyu/rev1/info.json index 00012812a4a7..a4e12a71fb1b 100644 --- a/keyboards/atreyu/rev1/info.json +++ b/keyboards/atreyu/rev1/info.json @@ -32,66 +32,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":10.5, "y":0.25}, - {"x":11.5, "y":0.125}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0.125}, - {"x":14.5, "y":0.375}, - {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":10.5, "y":1.25}, - {"x":11.5, "y":1.125}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1.125}, - {"x":14.5, "y":1.375}, - {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.125}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2.125}, - {"x":14.5, "y":2.375}, - {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6, "y":2.75}, - {"x":9.5, "y":2.75}, - {"x":10.5, "y":3.25}, - {"x":11.5, "y":3.125}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3.125}, - {"x":14.5, "y":3.375}, - {"x":15.5, "y":3.5}, - {"x":0, "y":4.5}, - {"x":2.5, "y":4.125}, - {"x":3.5, "y":4.15}, - {"x":4.5, "y":4.25}, - {"x":6, "y":4.25, "h":1.25}, - {"x":9.5, "y":4.25, "h":1.25}, - {"x":11, "y":4.25}, - {"x":12, "y":4.15}, - {"x":13, "y":4.125}, - {"x": 15.5, "y": 4.5} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [4, 5], "x": 10.5, "y": 0.25}, + {"matrix": [4, 4], "x": 11.5, "y": 0.125}, + {"matrix": [4, 3], "x": 12.5, "y": 0}, + {"matrix": [4, 2], "x": 13.5, "y": 0.125}, + {"matrix": [4, 1], "x": 14.5, "y": 0.375}, + {"matrix": [4, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 1.25}, + {"matrix": [5, 4], "x": 11.5, "y": 1.125}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1.125}, + {"matrix": [5, 1], "x": 14.5, "y": 1.375}, + {"matrix": [5, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 2.25}, + {"matrix": [6, 4], "x": 11.5, "y": 2.125}, + {"matrix": [6, 3], "x": 12.5, "y": 2}, + {"matrix": [6, 2], "x": 13.5, "y": 2.125}, + {"matrix": [6, 1], "x": 14.5, "y": 2.375}, + {"matrix": [6, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [7, 5], "x": 6, "y": 2.75}, + {"matrix": [7, 4], "x": 9.5, "y": 2.75}, + {"matrix": [7, 3], "x": 10.5, "y": 3.25}, + {"matrix": [7, 2], "x": 11.5, "y": 3.125}, + {"matrix": [7, 1], "x": 12.5, "y": 3}, + {"matrix": [7, 0], "x": 13.5, "y": 3.125}, + + {"matrix": [8, 0], "x": 14.5, "y": 3.375}, + {"matrix": [8, 1], "x": 15.5, "y": 3.5}, + {"matrix": [8, 2], "x": 0, "y": 4.5}, + {"matrix": [8, 3], "x": 2.5, "y": 4.125}, + {"matrix": [8, 4], "x": 3.5, "y": 4.15}, + {"matrix": [8, 5], "x": 4.5, "y": 4.25}, + + {"matrix": [9, 5], "x": 6, "y": 4.25, "h": 1.25}, + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.25}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12, "y": 4.15}, + {"matrix": [9, 1], "x": 13, "y": 4.125}, + {"matrix": [9, 0], "x": 15.5, "y": 4.5} ] } } diff --git a/keyboards/atreyu/rev1/rev1.c b/keyboards/atreyu/rev1/rev1.c index 8228f7ede602..026eba4b8a9b 100644 --- a/keyboards/atreyu/rev1/rev1.c +++ b/keyboards/atreyu/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/atreyu/rev1/rev1.h b/keyboards/atreyu/rev1/rev1.h deleted file mode 100644 index 4f6852593f24..000000000000 --- a/keyboards/atreyu/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11,\ - k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23,\ - k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35,\ - k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47,\ - k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 },\ - { k12, k13, k14, k15, k16, k17 },\ - { k24, k25, k26, k27, k28, k29 },\ - { k36, k37, k38, k39, k40, k41 },\ - { k11, k10, k09, k08, k07, k06 },\ - { k23, k22, k21, k20, k19, k18 },\ - { k35, k34, k33, k32, k31, k30 },\ - { k47, k46, k45, k44, k43, k42 },\ - { k48, k49, k50, k51, k52, k53 },\ - { k59, k58, k57, k56, k55, k54 } \ -} - diff --git a/keyboards/atreyu/rev2/info.json b/keyboards/atreyu/rev2/info.json index 707f8554e0c5..fd40f9fcb844 100644 --- a/keyboards/atreyu/rev2/info.json +++ b/keyboards/atreyu/rev2/info.json @@ -24,66 +24,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":10.5, "y":0.25}, - {"x":11.5, "y":0.125}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0.125}, - {"x":14.5, "y":0.375}, - {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":10.5, "y":1.25}, - {"x":11.5, "y":1.125}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1.125}, - {"x":14.5, "y":1.375}, - {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":10.5, "y":2.25}, - {"x":11.5, "y":2.125}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2.125}, - {"x":14.5, "y":2.375}, - {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6, "y":2.75}, - {"x":9.5, "y":2.75}, - {"x":10.5, "y":3.25}, - {"x":11.5, "y":3.125}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3.125}, - {"x":14.5, "y":3.375}, - {"x":15.5, "y":3.5}, - {"x":0, "y":4.5}, - {"x":2.5, "y":4.125}, - {"x":3.5, "y":4.15}, - {"x":4.5, "y":4.25}, - {"x":6, "y":4.25, "h":1.25}, - {"x":9.5, "y":4.25, "h":1.25}, - {"x":11, "y":4.25}, - {"x":12, "y":4.15}, - {"x":13, "y":4.125}, - {"x":14.5, "y":4.5} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [4, 5], "x": 10.5, "y": 0.25}, + {"matrix": [4, 4], "x": 11.5, "y": 0.125}, + {"matrix": [4, 3], "x": 12.5, "y": 0}, + {"matrix": [4, 2], "x": 13.5, "y": 0.125}, + {"matrix": [4, 1], "x": 14.5, "y": 0.375}, + {"matrix": [4, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 1.25}, + {"matrix": [5, 4], "x": 11.5, "y": 1.125}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1.125}, + {"matrix": [5, 1], "x": 14.5, "y": 1.375}, + {"matrix": [5, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 2.25}, + {"matrix": [6, 4], "x": 11.5, "y": 2.125}, + {"matrix": [6, 3], "x": 12.5, "y": 2}, + {"matrix": [6, 2], "x": 13.5, "y": 2.125}, + {"matrix": [6, 1], "x": 14.5, "y": 2.375}, + {"matrix": [6, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [7, 5], "x": 6, "y": 2.75}, + {"matrix": [7, 4], "x": 9.5, "y": 2.75}, + {"matrix": [7, 3], "x": 10.5, "y": 3.25}, + {"matrix": [7, 2], "x": 11.5, "y": 3.125}, + {"matrix": [7, 1], "x": 12.5, "y": 3}, + {"matrix": [7, 0], "x": 13.5, "y": 3.125}, + + {"matrix": [8, 0], "x": 14.5, "y": 3.375}, + {"matrix": [8, 1], "x": 15.5, "y": 3.5}, + {"matrix": [8, 2], "x": 0, "y": 4.5}, + {"matrix": [8, 3], "x": 2.5, "y": 4.125}, + {"matrix": [8, 4], "x": 3.5, "y": 4.15}, + {"matrix": [8, 5], "x": 4.5, "y": 4.25}, + + {"matrix": [9, 5], "x": 6, "y": 4.25, "h": 1.25}, + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.25}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12, "y": 4.15}, + {"matrix": [9, 1], "x": 13, "y": 4.125}, + {"matrix": [9, 0], "x": 14.5, "y": 4.5} ] } } diff --git a/keyboards/atreyu/rev2/rev2.c b/keyboards/atreyu/rev2/rev2.c index 38d3e9bc0298..78c70631a3ce 100644 --- a/keyboards/atreyu/rev2/rev2.c +++ b/keyboards/atreyu/rev2/rev2.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev2.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/atreyu/rev2/rev2.h b/keyboards/atreyu/rev2/rev2.h deleted file mode 100644 index 4f6852593f24..000000000000 --- a/keyboards/atreyu/rev2/rev2.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Jesus Climent (@climent) - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11,\ - k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23,\ - k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35,\ - k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47,\ - k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 },\ - { k12, k13, k14, k15, k16, k17 },\ - { k24, k25, k26, k27, k28, k29 },\ - { k36, k37, k38, k39, k40, k41 },\ - { k11, k10, k09, k08, k07, k06 },\ - { k23, k22, k21, k20, k19, k18 },\ - { k35, k34, k33, k32, k31, k30 },\ - { k47, k46, k45, k44, k43, k42 },\ - { k48, k49, k50, k51, k52, k53 },\ - { k59, k58, k57, k56, k55, k54 } \ -} - diff --git a/keyboards/avalanche/v1/info.json b/keyboards/avalanche/v1/info.json index e8ce03904f19..7787ae2a9533 100644 --- a/keyboards/avalanche/v1/info.json +++ b/keyboards/avalanche/v1/info.json @@ -21,72 +21,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L01", "x":1, "y":0.75}, - {"label":"L02", "x":2, "y":0.75}, - {"label":"L03", "x":3, "y":0.25}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0.25}, - {"label":"L06", "x":6, "y":0.35}, - {"label":"R06", "x":10, "y":0.35}, - {"label":"R05", "x":11, "y":0.25}, - {"label":"R04", "x":12, "y":0}, - {"label":"R03", "x":13, "y":0.25}, - {"label":"R02", "x":14, "y":0.75}, - {"label":"R01", "x":15, "y":0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.75}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.35}, - {"label":"L11", "x":1, "y":1.75}, - {"label":"L12", "x":2, "y":1.75}, - {"label":"L13", "x":3, "y":1.25}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1.25}, - {"label":"L16", "x":6, "y":1.35}, - {"label":"R16", "x":10, "y":1.35}, - {"label":"R15", "x":11, "y":1.25}, - {"label":"R14", "x":12, "y":1}, - {"label":"R13", "x":13, "y":1.25}, - {"label":"R12", "x":14, "y":1.75}, - {"label":"R11", "x":15, "y":1.75}, + {"matrix": [5, 6], "x": 10, "y": 0.35}, + {"matrix": [5, 5], "x": 11, "y": 0.25}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0.25}, + {"matrix": [5, 2], "x": 14, "y": 0.75}, + {"matrix": [5, 1], "x": 15, "y": 0.75}, - {"label":"L20", "x":0, "y":2.85}, - {"label":"L21", "x":1, "y":2.75}, - {"label":"L22", "x":2, "y":2.75}, - {"label":"L23", "x":3, "y":2.25}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2.25}, - {"label":"L26", "x":6, "y":2.35}, - {"label":"L27", "x":7, "y":2.6}, - {"label":"R27", "x":9, "y":2.6}, - {"label":"R26", "x":10, "y":2.35}, - {"label":"R25", "x":11, "y":2.25}, - {"label":"R24", "x":12, "y":2}, - {"label":"R23", "x":13, "y":2.25}, - {"label":"R22", "x":14, "y":2.75}, - {"label":"R21", "x":15, "y":2.75}, - {"label":"R20", "x":16, "y":2.85}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.75}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.35}, - {"label":"L31", "x":1, "y":3.75}, - {"label":"L32", "x":2, "y":3.75}, - {"label":"L33", "x":3, "y":3.25}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3.25}, - {"label":"L36", "x":6, "y":3.35}, - {"label":"L37", "x":7, "y":3.7}, - {"label":"R37", "x":9, "y":3.7}, - {"label":"R36", "x":10, "y":3.35}, - {"label":"R35", "x":11, "y":3.25}, - {"label":"R34", "x":12, "y":3}, - {"label":"R33", "x":13, "y":3.25}, - {"label":"R32", "x":14, "y":3.75}, - {"label":"R31", "x":15, "y":3.75}, + {"matrix": [6, 6], "x": 10, "y": 1.35}, + {"matrix": [6, 5], "x": 11, "y": 1.25}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1.25}, + {"matrix": [6, 2], "x": 14, "y": 1.75}, + {"matrix": [6, 1], "x": 15, "y": 1.75}, - {"label":"L44", "x":3.5, "y":4.45, "w":1.25}, - {"label":"L45", "x":4.75, "y":4.4, "w":1.25}, - {"label":"L46", "x":6, "y":4.45}, - {"label":"L47", "x":7, "y":4.8}, - {"label":"R47", "x":9, "y":4.8}, - {"label":"R46", "x":10, "y":4.45}, - {"label":"R45", "x":11, "y":4.4, "w":1.25}, - {"label":"R44", "x":12.25, "y":4.45, "w":1.25} + {"matrix": [2, 0], "x": 0, "y": 2.85}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.75}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.35}, + {"matrix": [2, 7], "x": 7, "y": 2.6}, + + {"matrix": [7, 7], "x": 9, "y": 2.6}, + {"matrix": [7, 6], "x": 10, "y": 2.35}, + {"matrix": [7, 5], "x": 11, "y": 2.25}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2.25}, + {"matrix": [7, 2], "x": 14, "y": 2.75}, + {"matrix": [7, 1], "x": 15, "y": 2.75}, + {"matrix": [7, 0], "x": 16, "y": 2.85}, + + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.75}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.35}, + {"matrix": [3, 7], "x": 7, "y": 3.7}, + + {"matrix": [8, 7], "x": 9, "y": 3.7}, + {"matrix": [8, 6], "x": 10, "y": 3.35}, + {"matrix": [8, 5], "x": 11, "y": 3.25}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3.25}, + {"matrix": [8, 2], "x": 14, "y": 3.75}, + {"matrix": [8, 1], "x": 15, "y": 3.75}, + + {"matrix": [4, 4], "x": 3.5, "y": 4.45, "w": 1.25}, + {"matrix": [4, 5], "x": 4.75, "y": 4.4, "w": 1.25}, + {"matrix": [4, 6], "x": 6, "y": 4.45}, + {"matrix": [4, 7], "x": 7, "y": 4.8}, + + {"matrix": [9, 7], "x": 9, "y": 4.8}, + {"matrix": [9, 6], "x": 10, "y": 4.45}, + {"matrix": [9, 5], "x": 11, "y": 4.4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.25, "y": 4.45, "w": 1.25} ] } } diff --git a/keyboards/avalanche/v1/v1.h b/keyboards/avalanche/v1/v1.h deleted file mode 100644 index dd6c921e69ff..000000000000 --- a/keyboards/avalanche/v1/v1.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, \ - L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, \ - L20, L21, L22, L23, L24, L25, L26, L27, R27, R26, R25, R24, R23, R22, R21, R20, \ - L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, \ - L44, L45, L46, L47, R47, R46, R45, R44 \ -) \ -{ \ - { L__, L01, L02, L03, L04, L05, L06, L__}, \ - { L__, L11, L12, L13, L14, L15, L16, L__}, \ - { L20, L21, L22, L23, L24, L25, L26, L27}, \ - { L__, L31, L32, L33, L34, L35, L36, L37}, \ - { L__, L__, L__, L__, L44, L45, L46, L47}, \ - { R__, R01, R02, R03, R04, R05, R06, R__}, \ - { R__, R11, R12, R13, R14, R15, R16, R__}, \ - { R20, R21, R22, R23, R24, R25, R26, R27}, \ - { R__, R31, R32, R33, R34, R35, R36, R37}, \ - { R__, R__, R__, R__, R44, R45, R46, R47} \ -} diff --git a/keyboards/avalanche/v2/info.json b/keyboards/avalanche/v2/info.json index b7b7df5dff1d..92f02721de41 100644 --- a/keyboards/avalanche/v2/info.json +++ b/keyboards/avalanche/v2/info.json @@ -29,74 +29,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":1, "y":0.75}, - {"label":"L01", "x":2, "y":0.75}, - {"label":"L02", "x":3, "y":0.25}, - {"label":"L03", "x":4, "y":0}, - {"label":"L04", "x":5, "y":0.25}, - {"label":"L05", "x":6, "y":0.35}, - {"label":"R05", "x":10, "y":0.35}, - {"label":"R04", "x":11, "y":0.25}, - {"label":"R03", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0.25}, - {"label":"R01", "x":14, "y":0.75}, - {"label":"R00", "x":15, "y":0.75}, + {"label": "L00", "matrix": [0, 0], "x": 1, "y": 0.75}, + {"label": "L01", "matrix": [0, 1], "x": 2, "y": 0.75}, + {"label": "L02", "matrix": [0, 2], "x": 3, "y": 0.25}, + {"label": "L03", "matrix": [0, 3], "x": 4, "y": 0}, + {"label": "L04", "matrix": [0, 4], "x": 5, "y": 0.25}, + {"label": "L05", "matrix": [0, 5], "x": 6, "y": 0.35}, - {"label":"L10", "x":1, "y":1.75}, - {"label":"L11", "x":2, "y":1.75}, - {"label":"L12", "x":3, "y":1.25}, - {"label":"L13", "x":4, "y":1}, - {"label":"L14", "x":5, "y":1.25}, - {"label":"L15", "x":6, "y":1.35}, - {"label":"R15", "x":10, "y":1.35}, - {"label":"R14", "x":11, "y":1.25}, - {"label":"R13", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1.25}, - {"label":"R11", "x":14, "y":1.75}, - {"label":"R10", "x":15, "y":1.75}, + {"label": "R05", "matrix": [5, 5], "x": 10, "y": 0.35}, + {"label": "R04", "matrix": [5, 4], "x": 11, "y": 0.25}, + {"label": "R03", "matrix": [5, 3], "x": 12, "y": 0}, + {"label": "R02", "matrix": [5, 2], "x": 13, "y": 0.25}, + {"label": "R01", "matrix": [5, 1], "x": 14, "y": 0.75}, + {"label": "R00", "matrix": [5, 0], "x": 15, "y": 0.75}, - {"label":"L40", "x":0, "y":2.85}, - {"label":"L20", "x":1, "y":2.75}, - {"label":"L21", "x":2, "y":2.75}, - {"label":"L22", "x":3, "y":2.25}, - {"label":"L23", "x":4, "y":2}, - {"label":"L24", "x":5, "y":2.25}, - {"label":"L25", "x":6, "y":2.35}, - {"label":"L26", "x":7, "y":2.6}, - {"label":"R26", "x":9, "y":2.6}, - {"label":"R25", "x":10, "y":2.35}, - {"label":"R24", "x":11, "y":2.25}, - {"label":"R23", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2.25}, - {"label":"R21", "x":14, "y":2.75}, - {"label":"R20", "x":15, "y":2.75}, - {"label":"R40", "x":16, "y":2.85}, + {"label": "L10", "matrix": [1, 0], "x": 1, "y": 1.75}, + {"label": "L11", "matrix": [1, 1], "x": 2, "y": 1.75}, + {"label": "L12", "matrix": [1, 2], "x": 3, "y": 1.25}, + {"label": "L13", "matrix": [1, 3], "x": 4, "y": 1}, + {"label": "L14", "matrix": [1, 4], "x": 5, "y": 1.25}, + {"label": "L15", "matrix": [1, 5], "x": 6, "y": 1.35}, - {"label":"L30", "x":1, "y":3.75}, - {"label":"L31", "x":2, "y":3.75}, - {"label":"L32", "x":3, "y":3.25}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.25}, - {"label":"L35", "x":6, "y":3.35}, - {"label":"L36", "x":7, "y":3.7}, - {"label":"R36", "x":9, "y":3.7}, - {"label":"R35", "x":10, "y":3.35}, - {"label":"R34", "x":11, "y":3.25}, - {"label":"R33", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3.25}, - {"label":"R31", "x":14, "y":3.75}, - {"label":"R30", "x":15, "y":3.75}, + {"label": "R15", "matrix": [6, 5], "x": 10, "y": 1.35}, + {"label": "R14", "matrix": [6, 4], "x": 11, "y": 1.25}, + {"label": "R13", "matrix": [6, 3], "x": 12, "y": 1}, + {"label": "R12", "matrix": [6, 2], "x": 13, "y": 1.25}, + {"label": "R11", "matrix": [6, 1], "x": 14, "y": 1.75}, + {"label": "R10", "matrix": [6, 0], "x": 15, "y": 1.75}, - {"label":"L42", "x":3, "y":4.55}, - {"label":"L43", "x":4, "y":4.45}, - {"label":"L44", "x":5, "y":4.4}, - {"label":"L45", "x":6, "y":4.45}, - {"label":"L46", "x":7, "y":4.8}, - {"label":"R46", "x":9, "y":4.8}, - {"label":"R45", "x":10, "y":4.45}, - {"label":"R44", "x":11, "y":4.4}, - {"label":"R43", "x":12, "y":4.45}, - {"label":"R42", "x":13, "y":4.55} + {"label": "L40", "matrix": [4, 0], "x": 0, "y": 2.85}, + {"label": "L20", "matrix": [2, 0], "x": 1, "y": 2.75}, + {"label": "L21", "matrix": [2, 1], "x": 2, "y": 2.75}, + {"label": "L22", "matrix": [2, 2], "x": 3, "y": 2.25}, + {"label": "L23", "matrix": [2, 3], "x": 4, "y": 2}, + {"label": "L24", "matrix": [2, 4], "x": 5, "y": 2.25}, + {"label": "L25", "matrix": [2, 5], "x": 6, "y": 2.35}, + {"label": "L26", "matrix": [2, 6], "x": 7, "y": 2.6}, + + {"label": "R26", "matrix": [7, 6], "x": 9, "y": 2.6}, + {"label": "R25", "matrix": [7, 5], "x": 10, "y": 2.35}, + {"label": "R24", "matrix": [7, 4], "x": 11, "y": 2.25}, + {"label": "R23", "matrix": [7, 3], "x": 12, "y": 2}, + {"label": "R22", "matrix": [7, 2], "x": 13, "y": 2.25}, + {"label": "R21", "matrix": [7, 1], "x": 14, "y": 2.75}, + {"label": "R20", "matrix": [7, 0], "x": 15, "y": 2.75}, + {"label": "R40", "matrix": [9, 0], "x": 16, "y": 2.85}, + + {"label": "L30", "matrix": [3, 0], "x": 1, "y": 3.75}, + {"label": "L31", "matrix": [3, 1], "x": 2, "y": 3.75}, + {"label": "L32", "matrix": [3, 2], "x": 3, "y": 3.25}, + {"label": "L33", "matrix": [3, 3], "x": 4, "y": 3}, + {"label": "L34", "matrix": [3, 4], "x": 5, "y": 3.25}, + {"label": "L35", "matrix": [3, 5], "x": 6, "y": 3.35}, + {"label": "L36", "matrix": [3, 6], "x": 7, "y": 3.7}, + + {"label": "R36", "matrix": [8, 6], "x": 9, "y": 3.7}, + {"label": "R35", "matrix": [8, 5], "x": 10, "y": 3.35}, + {"label": "R34", "matrix": [8, 4], "x": 11, "y": 3.25}, + {"label": "R33", "matrix": [8, 3], "x": 12, "y": 3}, + {"label": "R32", "matrix": [8, 2], "x": 13, "y": 3.25}, + {"label": "R31", "matrix": [8, 1], "x": 14, "y": 3.75}, + {"label": "R30", "matrix": [8, 0], "x": 15, "y": 3.75}, + + {"label": "L42", "matrix": [4, 2], "x": 3, "y": 4.55}, + {"label": "L43", "matrix": [4, 3], "x": 4, "y": 4.45}, + {"label": "L44", "matrix": [4, 4], "x": 5, "y": 4.4}, + {"label": "L45", "matrix": [4, 5], "x": 6, "y": 4.45}, + {"label": "L46", "matrix": [4, 6], "x": 7, "y": 4.8}, + + {"label": "R46", "matrix": [9, 6], "x": 9, "y": 4.8}, + {"label": "R45", "matrix": [9, 5], "x": 10, "y": 4.45}, + {"label": "R44", "matrix": [9, 4], "x": 11, "y": 4.4}, + {"label": "R43", "matrix": [9, 3], "x": 12, "y": 4.45}, + {"label": "R42", "matrix": [9, 2], "x": 13, "y": 4.55} ] } } diff --git a/keyboards/avalanche/v2/v2.h b/keyboards/avalanche/v2/v2.h deleted file mode 100644 index f8319c3ef4af..000000000000 --- a/keyboards/avalanche/v2/v2.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L40, L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, R40, \ - L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30, \ - L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L__}, \ - { L10, L11, L12, L13, L14, L15, L__}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L__, L42, L43, L44, L45, L46}, \ - { R00, R01, R02, R03, R04, R05, R__}, \ - { R10, R11, R12, R13, R14, R15, R__}, \ - { R20, R21, R22, R23, R24, R25, R26}, \ - { R30, R31, R32, R33, R34, R35, R36}, \ - { R40, R__, R42, R43, R44, R45, R46} \ -} diff --git a/keyboards/avalanche/v3/info.json b/keyboards/avalanche/v3/info.json index 20337f25c1fc..ed507485f5d1 100644 --- a/keyboards/avalanche/v3/info.json +++ b/keyboards/avalanche/v3/info.json @@ -29,74 +29,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":1, "y":0.75}, - {"label":"L01", "x":2, "y":0.75}, - {"label":"L02", "x":3, "y":0.25}, - {"label":"L03", "x":4, "y":0}, - {"label":"L04", "x":5, "y":0.25}, - {"label":"L05", "x":6, "y":0.35}, - {"label":"R05", "x":12, "y":0.35}, - {"label":"R04", "x":13, "y":0.25}, - {"label":"R03", "x":14, "y":0}, - {"label":"R02", "x":15, "y":0.25}, - {"label":"R01", "x":16, "y":0.75}, - {"label":"R00", "x":17, "y":0.75}, + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.75}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.35}, - {"label":"L10", "x":1, "y":1.75}, - {"label":"L11", "x":2, "y":1.75}, - {"label":"L12", "x":3, "y":1.25}, - {"label":"L13", "x":4, "y":1}, - {"label":"L14", "x":5, "y":1.25}, - {"label":"L15", "x":6, "y":1.35}, - {"label":"R15", "x":12, "y":1.35}, - {"label":"R14", "x":13, "y":1.25}, - {"label":"R13", "x":14, "y":1}, - {"label":"R12", "x":15, "y":1.25}, - {"label":"R11", "x":16, "y":1.75}, - {"label":"R10", "x":17, "y":1.75}, + {"matrix": [5, 5], "x": 12, "y": 0.35}, + {"matrix": [5, 4], "x": 13, "y": 0.25}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 2], "x": 15, "y": 0.25}, + {"matrix": [5, 1], "x": 16, "y": 0.75}, + {"matrix": [5, 0], "x": 17, "y": 0.75}, - {"label":"L40", "x":0, "y":2.85}, - {"label":"L20", "x":1, "y":2.75}, - {"label":"L21", "x":2, "y":2.75}, - {"label":"L22", "x":3, "y":2.25}, - {"label":"L23", "x":4, "y":2}, - {"label":"L24", "x":5, "y":2.25}, - {"label":"L25", "x":6, "y":2.35}, - {"label":"R25", "x":12, "y":2.35}, - {"label":"R24", "x":13, "y":2.25}, - {"label":"R23", "x":14, "y":2}, - {"label":"R22", "x":15, "y":2.25}, - {"label":"R21", "x":16, "y":2.75}, - {"label":"R20", "x":17, "y":2.75}, - {"label":"R40", "x":18, "y":2.85}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.75}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.35}, - {"label":"L30", "x":1, "y":3.75}, - {"label":"L31", "x":2, "y":3.75}, - {"label":"L32", "x":3, "y":3.25}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.25}, - {"label":"L35", "x":6, "y":3.35}, - {"label":"L36", "x":7, "y":3.7}, - {"label":"L26", "x":8, "y":4.05}, - {"label":"R26", "x":10, "y":4.05}, - {"label":"R36", "x":11, "y":3.7}, - {"label":"R35", "x":12, "y":3.35}, - {"label":"R34", "x":13, "y":3.25}, - {"label":"R33", "x":14, "y":3}, - {"label":"R32", "x":15, "y":3.25}, - {"label":"R31", "x":16, "y":3.75}, - {"label":"R30", "x":17, "y":3.75}, + {"matrix": [6, 5], "x": 12, "y": 1.35}, + {"matrix": [6, 4], "x": 13, "y": 1.25}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 2], "x": 15, "y": 1.25}, + {"matrix": [6, 1], "x": 16, "y": 1.75}, + {"matrix": [6, 0], "x": 17, "y": 1.75}, - {"label":"L42", "x":3.4, "y":4.55}, - {"label":"L43", "x":4.6, "y":4.45}, - {"label":"L44", "x":5.8, "y":4.4}, - {"label":"L45", "x":7, "y":4.7}, - {"label":"L46", "x":8, "y":5.05}, - {"label":"R46", "x":10, "y":5.05}, - {"label":"R45", "x":11, "y":4.7}, - {"label":"R44", "x":12.2, "y":4.4}, - {"label":"R43", "x":13.4, "y":4.45}, - {"label":"R42", "x":14.6, "y":4.55} + {"matrix": [4, 0], "x": 0, "y": 2.85}, + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.75}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.35}, + + {"matrix": [7, 5], "x": 12, "y": 2.35}, + {"matrix": [7, 4], "x": 13, "y": 2.25}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 2], "x": 15, "y": 2.25}, + {"matrix": [7, 1], "x": 16, "y": 2.75}, + {"matrix": [7, 0], "x": 17, "y": 2.75}, + {"matrix": [9, 0], "x": 18, "y": 2.85}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.75}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.35}, + {"matrix": [3, 6], "x": 7, "y": 3.7}, + {"matrix": [2, 6], "x": 8, "y": 4.05}, + + {"matrix": [7, 6], "x": 10, "y": 4.05}, + {"matrix": [8, 6], "x": 11, "y": 3.7}, + {"matrix": [8, 5], "x": 12, "y": 3.35}, + {"matrix": [8, 4], "x": 13, "y": 3.25}, + {"matrix": [8, 3], "x": 14, "y": 3}, + {"matrix": [8, 2], "x": 15, "y": 3.25}, + {"matrix": [8, 1], "x": 16, "y": 3.75}, + {"matrix": [8, 0], "x": 17, "y": 3.75}, + + {"matrix": [4, 2], "x": 3.4, "y": 4.55}, + {"matrix": [4, 3], "x": 4.6, "y": 4.45}, + {"matrix": [4, 4], "x": 5.8, "y": 4.4}, + {"matrix": [4, 5], "x": 7, "y": 4.7}, + {"matrix": [4, 6], "x": 8, "y": 5.05}, + + {"matrix": [9, 6], "x": 10, "y": 5.05}, + {"matrix": [9, 5], "x": 11, "y": 4.7}, + {"matrix": [9, 4], "x": 12.2, "y": 4.4}, + {"matrix": [9, 3], "x": 13.4, "y": 4.45}, + {"matrix": [9, 2], "x": 14.6, "y": 4.55} ] } } diff --git a/keyboards/avalanche/v3/v3.h b/keyboards/avalanche/v3/v3.h deleted file mode 100644 index 426f979e9bd2..000000000000 --- a/keyboards/avalanche/v3/v3.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L40, L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, R40, \ - L30, L31, L32, L33, L34, L35, L36, L26, R26, R36, R35, R34, R33, R32, R31, R30, \ - L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L__}, \ - { L10, L11, L12, L13, L14, L15, L__}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L__, L42, L43, L44, L45, L46}, \ - { R00, R01, R02, R03, R04, R05, R__}, \ - { R10, R11, R12, R13, R14, R15, R__}, \ - { R20, R21, R22, R23, R24, R25, R26}, \ - { R30, R31, R32, R33, R34, R35, R36}, \ - { R40, R__, R42, R43, R44, R45, R46} \ -} diff --git a/keyboards/avalanche/v4/info.json b/keyboards/avalanche/v4/info.json index 786d11588a44..85ff0c16fe43 100644 --- a/keyboards/avalanche/v4/info.json +++ b/keyboards/avalanche/v4/info.json @@ -29,74 +29,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":1, "y":0.75}, - {"label":"L01", "x":2, "y":0.75}, - {"label":"L02", "x":3, "y":0.25}, - {"label":"L03", "x":4, "y":0}, - {"label":"L04", "x":5, "y":0.25}, - {"label":"L05", "x":6, "y":0.35}, - {"label":"R05", "x":12, "y":0.35}, - {"label":"R04", "x":13, "y":0.25}, - {"label":"R03", "x":14, "y":0}, - {"label":"R02", "x":15, "y":0.25}, - {"label":"R01", "x":16, "y":0.75}, - {"label":"R00", "x":17, "y":0.75}, + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.75}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.35}, - {"label":"L10", "x":1, "y":1.75}, - {"label":"L11", "x":2, "y":1.75}, - {"label":"L12", "x":3, "y":1.25}, - {"label":"L13", "x":4, "y":1}, - {"label":"L14", "x":5, "y":1.25}, - {"label":"L15", "x":6, "y":1.35}, - {"label":"R15", "x":12, "y":1.35}, - {"label":"R14", "x":13, "y":1.25}, - {"label":"R13", "x":14, "y":1}, - {"label":"R12", "x":15, "y":1.25}, - {"label":"R11", "x":16, "y":1.75}, - {"label":"R10", "x":17, "y":1.75}, + {"matrix": [5, 5], "x": 12, "y": 0.35}, + {"matrix": [5, 4], "x": 13, "y": 0.25}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 2], "x": 15, "y": 0.25}, + {"matrix": [5, 1], "x": 16, "y": 0.75}, + {"matrix": [5, 0], "x": 17, "y": 0.75}, - {"label":"L40", "x":0, "y":2.85}, - {"label":"L20", "x":1, "y":2.75}, - {"label":"L21", "x":2, "y":2.75}, - {"label":"L22", "x":3, "y":2.25}, - {"label":"L23", "x":4, "y":2}, - {"label":"L24", "x":5, "y":2.25}, - {"label":"L25", "x":6, "y":2.35}, - {"label":"R25", "x":12, "y":2.35}, - {"label":"R24", "x":13, "y":2.25}, - {"label":"R23", "x":14, "y":2}, - {"label":"R22", "x":15, "y":2.25}, - {"label":"R21", "x":16, "y":2.75}, - {"label":"R20", "x":17, "y":2.75}, - {"label":"R40", "x":18, "y":2.85}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.75}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.35}, - {"label":"L30", "x":1, "y":3.75}, - {"label":"L31", "x":2, "y":3.75}, - {"label":"L32", "x":3, "y":3.25}, - {"label":"L33", "x":4, "y":3}, - {"label":"L34", "x":5, "y":3.25}, - {"label":"L35", "x":6, "y":3.35}, - {"label":"L36", "x":7, "y":3.7}, - {"label":"L26", "x":8, "y":4.05}, - {"label":"R26", "x":10, "y":4.05}, - {"label":"R36", "x":11, "y":3.7}, - {"label":"R35", "x":12, "y":3.35}, - {"label":"R34", "x":13, "y":3.25}, - {"label":"R33", "x":14, "y":3}, - {"label":"R32", "x":15, "y":3.25}, - {"label":"R31", "x":16, "y":3.75}, - {"label":"R30", "x":17, "y":3.75}, + {"matrix": [6, 5], "x": 12, "y": 1.35}, + {"matrix": [6, 4], "x": 13, "y": 1.25}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 2], "x": 15, "y": 1.25}, + {"matrix": [6, 1], "x": 16, "y": 1.75}, + {"matrix": [6, 0], "x": 17, "y": 1.75}, - {"label":"L42", "x":3.4, "y":4.55}, - {"label":"L43", "x":4.6, "y":4.45}, - {"label":"L44", "x":5.8, "y":4.4}, - {"label":"L45", "x":7, "y":4.7}, - {"label":"L46", "x":8, "y":5.05}, - {"label":"R46", "x":10, "y":5.05}, - {"label":"R45", "x":11, "y":4.7}, - {"label":"R44", "x":12.2, "y":4.4}, - {"label":"R43", "x":13.4, "y":4.45}, - {"label":"R42", "x":14.6, "y":4.55} + {"matrix": [4, 0], "x": 0, "y": 2.85}, + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.75}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.35}, + + {"matrix": [7, 5], "x": 12, "y": 2.35}, + {"matrix": [7, 4], "x": 13, "y": 2.25}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 2], "x": 15, "y": 2.25}, + {"matrix": [7, 1], "x": 16, "y": 2.75}, + {"matrix": [7, 0], "x": 17, "y": 2.75}, + {"matrix": [9, 0], "x": 18, "y": 2.85}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.75}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.35}, + {"matrix": [3, 6], "x": 7, "y": 3.7}, + {"matrix": [2, 6], "x": 8, "y": 4.05}, + + {"matrix": [7, 6], "x": 10, "y": 4.05}, + {"matrix": [8, 6], "x": 11, "y": 3.7}, + {"matrix": [8, 5], "x": 12, "y": 3.35}, + {"matrix": [8, 4], "x": 13, "y": 3.25}, + {"matrix": [8, 3], "x": 14, "y": 3}, + {"matrix": [8, 2], "x": 15, "y": 3.25}, + {"matrix": [8, 1], "x": 16, "y": 3.75}, + {"matrix": [8, 0], "x": 17, "y": 3.75}, + + {"matrix": [4, 2], "x": 3.4, "y": 4.55}, + {"matrix": [4, 3], "x": 4.6, "y": 4.45}, + {"matrix": [4, 4], "x": 5.8, "y": 4.4}, + {"matrix": [4, 5], "x": 7, "y": 4.7}, + {"matrix": [4, 6], "x": 8, "y": 5.05}, + + {"matrix": [9, 6], "x": 10, "y": 5.05}, + {"matrix": [9, 5], "x": 11, "y": 4.7}, + {"matrix": [9, 4], "x": 12.2, "y": 4.4}, + {"matrix": [9, 3], "x": 13.4, "y": 4.45}, + {"matrix": [9, 2], "x": 14.6, "y": 4.55} ] } } diff --git a/keyboards/avalanche/v4/v4.c b/keyboards/avalanche/v4/v4.c index e5a651ce4a57..5b2738572909 100644 --- a/keyboards/avalanche/v4/v4.c +++ b/keyboards/avalanche/v4/v4.c @@ -1,7 +1,7 @@ // Copyright 2022 Vitaly Volkov (@vlkv) // SPDX-License-Identifier: GPL-2.0-or-later -#include "v4.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/avalanche/v4/v4.h b/keyboards/avalanche/v4/v4.h deleted file mode 100644 index 426f979e9bd2..000000000000 --- a/keyboards/avalanche/v4/v4.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define L__ KC_NO -#define R__ KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L40, L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, R40, \ - L30, L31, L32, L33, L34, L35, L36, L26, R26, R36, R35, R34, R33, R32, R31, R30, \ - L42, L43, L44, L45, L46, R46, R45, R44, R43, R42 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L__}, \ - { L10, L11, L12, L13, L14, L15, L__}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L__, L42, L43, L44, L45, L46}, \ - { R00, R01, R02, R03, R04, R05, R__}, \ - { R10, R11, R12, R13, R14, R15, R__}, \ - { R20, R21, R22, R23, R24, R25, R26}, \ - { R30, R31, R32, R33, R34, R35, R36}, \ - { R40, R__, R42, R43, R44, R45, R46} \ -} diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.c b/keyboards/axolstudio/yeti/hotswap/hotswap.c index 9d5efc208d2e..98d37290e6fd 100644 --- a/keyboards/axolstudio/yeti/hotswap/hotswap.c +++ b/keyboards/axolstudio/yeti/hotswap/hotswap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "hotswap.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/axolstudio/yeti/hotswap/hotswap.h b/keyboards/axolstudio/yeti/hotswap/hotswap.h deleted file mode 100644 index 736f26ed7f54..000000000000 --- a/keyboards/axolstudio/yeti/hotswap/hotswap.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 kb-elmo - * - * 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( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k214, \ - k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k314, \ - k401, k403, k405, k406, k408, k410, k414 \ -) { \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, ____, k214 }, \ - { ____, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, ____, k314 }, \ - { ____, k401, ____, k403, ____, k405, k406, ____, k408, ____, k410, ____, ____, ____, k414 } \ -} diff --git a/keyboards/axolstudio/yeti/hotswap/info.json b/keyboards/axolstudio/yeti/hotswap/info.json index e65ab71e73f0..732e9075cded 100644 --- a/keyboards/axolstudio/yeti/hotswap/info.json +++ b/keyboards/axolstudio/yeti/hotswap/info.json @@ -21,70 +21,74 @@ "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.25, "y":0}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0, "w":2}, - {"x":0, "y":1}, - {"x":1.25, "y":1, "w":1.5}, - {"x":2.75, "y":1}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1}, - {"x":13.75, "y":1}, - {"x":14.75, "y":1}, - {"x":15.75, "y":1}, - {"x":16.75, "y":1, "w":1.5}, - {"x":0, "y":2}, - {"x":1.25, "y":2, "w":1.75}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2, "w":2.25}, - {"x":1.25, "y":3, "w":2.25}, - {"x":3.5, "y":3}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.5, "y":3}, - {"x":7.5, "y":3}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3}, - {"x":14.5, "y":3}, - {"x":15.5, "y":3, "w":2.75}, - {"x":1.25, "y":4, "w":1.5}, - {"x":4.25, "y":4, "w":1.5}, - {"x":5.75, "y":4, "w":2}, - {"x":7.75, "y":4, "w":1.25}, - {"x":9.5, "y":4, "w":2.75}, - {"x":12.25, "y":4, "w":1.5}, - {"x":16.75, "y":4, "w":1.5} + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 10.25, "y": 0}, + {"matrix": [0, 9], "x": 11.25, "y": 0}, + {"matrix": [0, 10], "x": 12.25, "y": 0}, + {"matrix": [0, 11], "x": 13.25, "y": 0}, + {"matrix": [0, 12], "x": 14.25, "y": 0}, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 14], "x": 16.25, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 9.75, "y": 1}, + {"matrix": [1, 8], "x": 10.75, "y": 1}, + {"matrix": [1, 9], "x": 11.75, "y": 1}, + {"matrix": [1, 10], "x": 12.75, "y": 1}, + {"matrix": [1, 11], "x": 13.75, "y": 1}, + {"matrix": [1, 12], "x": 14.75, "y": 1}, + {"matrix": [1, 13], "x": 15.75, "y": 1}, + {"matrix": [1, 14], "x": 16.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2}, + {"matrix": [2, 11], "x": 14, "y": 2}, + {"matrix": [2, 12], "x": 15, "y": 2}, + {"matrix": [2, 14], "x": 16, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3}, + {"matrix": [3, 9], "x": 11.5, "y": 3}, + {"matrix": [3, 10], "x": 12.5, "y": 3}, + {"matrix": [3, 11], "x": 13.5, "y": 3}, + {"matrix": [3, 12], "x": 14.5, "y": 3}, + + {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 2.75}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 16.75, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/aya/aya.h b/keyboards/aya/aya.h deleted file mode 100644 index 36ba18220c4d..000000000000 --- a/keyboards/aya/aya.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Dan Nixon - * - * 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( \ - L06, L05, L04, L03, L02, L01, L00, R00, R01, R02, R03, R04, R05, R06, \ - L16, L15, L14, L13, L12, L11, L10, R10, R11, R12, R13, R14, R15, R16, \ - L26, L25, L24, L23, L22, L21, L20, L40, R40, R20, R21, R22, R23, R24, R25, R26, \ - L36, L35, L34, L33, L32, L31, L30, L43, L44, R44, R43, R30, R31, R32, R33, R34, R35, R36, \ - L42, L41, L45, L46, R46, R45, R41, R42 \ - ) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/aya/info.json b/keyboards/aya/info.json index d35001e1327b..6b65aa5521a9 100644 --- a/keyboards/aya/info.json +++ b/keyboards/aya/info.json @@ -17,7 +17,82 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "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":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":17, "y":3}, {"x":18, "y":3}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] + "layout": [ + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 5], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 0], "x": 6, "y": 0}, + {"matrix": [5, 0], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 3], "x": 15, "y": 0}, + {"matrix": [5, 4], "x": 16, "y": 0}, + {"matrix": [5, 5], "x": 17, "y": 0}, + {"matrix": [5, 6], "x": 18, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 5], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 1], "x": 5, "y": 1}, + {"matrix": [1, 0], "x": 6, "y": 1}, + {"matrix": [6, 0], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 3], "x": 15, "y": 1}, + {"matrix": [6, 4], "x": 16, "y": 1}, + {"matrix": [6, 5], "x": 17, "y": 1}, + {"matrix": [6, 6], "x": 18, "y": 1}, + + {"matrix": [2, 6], "x": 0, "y": 2}, + {"matrix": [2, 5], "x": 1, "y": 2}, + {"matrix": [2, 4], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 1], "x": 5, "y": 2}, + {"matrix": [2, 0], "x": 6, "y": 2}, + {"matrix": [4, 0], "x": 7, "y": 2}, + {"matrix": [9, 0], "x": 11, "y": 2}, + {"matrix": [7, 0], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 3], "x": 15, "y": 2}, + {"matrix": [7, 4], "x": 16, "y": 2}, + {"matrix": [7, 5], "x": 17, "y": 2}, + {"matrix": [7, 6], "x": 18, "y": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3}, + {"matrix": [3, 5], "x": 1, "y": 3}, + {"matrix": [3, 4], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 1], "x": 5, "y": 3}, + {"matrix": [3, 0], "x": 6, "y": 3}, + {"matrix": [4, 3], "x": 7, "y": 3}, + {"matrix": [4, 4], "x": 8, "y": 3}, + {"matrix": [9, 4], "x": 10, "y": 3}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 3], "x": 15, "y": 3}, + {"matrix": [8, 4], "x": 16, "y": 3}, + {"matrix": [8, 5], "x": 17, "y": 3}, + {"matrix": [8, 6], "x": 18, "y": 3}, + + {"matrix": [4, 2], "x": 5, "y": 4}, + {"matrix": [4, 1], "x": 6, "y": 4}, + {"matrix": [4, 5], "x": 7, "y": 4}, + {"matrix": [4, 6], "x": 8, "y": 4}, + {"matrix": [9, 6], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [9, 1], "x": 12, "y": 4}, + {"matrix": [9, 2], "x": 13, "y": 4} + ] } } } diff --git a/keyboards/b_sides/rev41lp/info.json b/keyboards/b_sides/rev41lp/info.json index 3b5807f621cd..8a1c538a7198 100644 --- a/keyboards/b_sides/rev41lp/info.json +++ b/keyboards/b_sides/rev41lp/info.json @@ -26,53 +26,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0.54}, - {"label":"K01", "x":1, "y":0.36}, - {"label":"K02", "x":2, "y":0.18}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0.18}, - {"label":"K05", "x":5, "y":0.36}, + {"matrix": [0, 0], "x": 0, "y": 0.54}, + {"matrix": [0, 1], "x": 1, "y": 0.36}, + {"matrix": [0, 2], "x": 2, "y": 0.18}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.18}, + {"matrix": [0, 5], "x": 5, "y": 0.36}, - {"label":"K10", "x":7, "y":0.36}, - {"label":"K11", "x":8, "y":0.18}, - {"label":"K12", "x":9, "y":0}, - {"label":"K13", "x":10, "y":0.18}, - {"label":"K14", "x":11, "y":0.36}, - {"label":"K15", "x":12, "y":0.54}, + {"matrix": [1, 0], "x": 7, "y": 0.36}, + {"matrix": [1, 1], "x": 8, "y": 0.18}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [1, 3], "x": 10, "y": 0.18}, + {"matrix": [1, 4], "x": 11, "y": 0.36}, + {"matrix": [1, 5], "x": 12, "y": 0.54}, - {"label":"K20", "x":0, "y":1.54}, - {"label":"K21", "x":1, "y":1.36}, - {"label":"K22", "x":2, "y":1.18}, - {"label":"K23", "x":3, "y":1}, - {"label":"K24", "x":4, "y":1.18}, - {"label":"K25", "x":5, "y":1.36}, + {"matrix": [2, 0], "x": 0, "y": 1.54}, + {"matrix": [2, 1], "x": 1, "y": 1.36}, + {"matrix": [2, 2], "x": 2, "y": 1.18}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1.18}, + {"matrix": [2, 5], "x": 5, "y": 1.36}, - {"label":"K30", "x":7, "y":1.36}, - {"label":"K31", "x":8, "y":1.18}, - {"label":"K32", "x":9, "y":1}, - {"label":"K33", "x":10, "y":1.18}, - {"label":"K34", "x":11, "y":1.36}, - {"label":"K35", "x":12, "y":1.54}, + {"matrix": [3, 0], "x": 7, "y": 1.36}, + {"matrix": [3, 1], "x": 8, "y": 1.18}, + {"matrix": [3, 2], "x": 9, "y": 1}, + {"matrix": [3, 3], "x": 10, "y": 1.18}, + {"matrix": [3, 4], "x": 11, "y": 1.36}, + {"matrix": [3, 5], "x": 12, "y": 1.54}, - {"label":"K40", "x":0, "y":2.54}, - {"label":"K41", "x":1, "y":2.36}, - {"label":"K42", "x":2, "y":2.18}, - {"label":"K43", "x":3, "y":2}, - {"label":"K44", "x":4, "y":2.18}, - {"label":"K45", "x":5, "y":2.36}, + {"matrix": [4, 0], "x": 0, "y": 2.54}, + {"matrix": [4, 1], "x": 1, "y": 2.36}, + {"matrix": [4, 2], "x": 2, "y": 2.18}, + {"matrix": [4, 3], "x": 3, "y": 2}, + {"matrix": [4, 4], "x": 4, "y": 2.18}, + {"matrix": [4, 5], "x": 5, "y": 2.36}, - {"label":"K50", "x":7, "y":2.36}, - {"label":"K51", "x":8, "y":2.18}, - {"label":"K52", "x":9, "y":2}, - {"label":"K53", "x":10, "y":2.18}, - {"label":"K54", "x":11, "y":2.36}, - {"label":"K55", "x":12, "y":2.54}, + {"matrix": [5, 0], "x": 7, "y": 2.36}, + {"matrix": [5, 1], "x": 8, "y": 2.18}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 3], "x": 10, "y": 2.18}, + {"matrix": [5, 4], "x": 11, "y": 2.36}, + {"matrix": [5, 5], "x": 12, "y": 2.54}, - {"label":"K60", "x":2.875, "y":3.54, "w":1.25}, - {"label":"K61", "x":4.125, "y":3.54, "w":1.25}, - {"label":"K62", "x":5.375, "y":3.54, "w":2.25}, - {"label":"K63", "x":7.625, "y":3.54, "w":1.25}, - {"label":"K64", "x":8.875, "y":3.54, "w":1.25} + {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25}, + {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25}, + {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25}, + {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25}, + {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25} ] } } diff --git a/keyboards/b_sides/rev41lp/rev41lp.h b/keyboards/b_sides/rev41lp/rev41lp.h deleted file mode 100644 index 5716d316b218..000000000000 --- a/keyboards/b_sides/rev41lp/rev41lp.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 @cyril279 - -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( \ - K00, K01, K02, K03, K04, K05, K10, K11, K12, K13, K14, K15, \ - K20, K21, K22, K23, K24, K25, K30, K31, K32, K33, K34, K35, \ - K40, K41, K42, K43, K44, K45, K50, K51, K52, K53, K54, K55, \ - K60, K61, K62, K63, K64 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, K55 }, \ - { K60, K61, K62, K63, K64, KC_NO } \ -} diff --git a/keyboards/bandominedoni/bandominedoni.h b/keyboards/bandominedoni/bandominedoni.h index c83958ce8a50..c10793c0ea64 100644 --- a/keyboards/bandominedoni/bandominedoni.h +++ b/keyboards/bandominedoni/bandominedoni.h @@ -18,46 +18,6 @@ #include "quantum.h" -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -// oc: for Open Close selection pedal -// fn: function layer - -#define LAYOUT( \ - l00, l01, l02, l03, l04, \ - l10, l11, l12, l13, l14, l15, l16, \ - l20, l21, l22, l23, l24, l25, l26, \ - l30, l31, l32, l33, l34, l35, l36, \ - l40, l41, l42, l43, l44, l45, l46, l47, \ - \ - oc, r00, r01, r02, r03, fn, \ - r10, r11, r12, r13, r14, \ - r20, r21, r22, r23, r24, r25, \ - r30, r31, r32, r33, r34, r35, r36, r37, \ - r40, r41, r42, r43, r44, r45, r46, r47, \ - r50, r51, r52, r53, r54, r55, r56, r57, r58 \ -) { \ - { l40, l00, l01, l02, l03, l04, KC_NO }, \ - { l10, l11, l12, l13, l14, l15, l16 }, \ - { l20, l21, l22, l23, l24, l25, l26 }, \ - { l30, l31, l32, l33, l34, l35, l36 }, \ - { l41, l42, l43, l44, l45, l46, l47 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { r50, r40, r31, r20, r10, r00, r30 }, \ - { r51, r41, r32, r21, r11, r01, oc }, \ - { r52, r42, r33, r22, r12, r02, fn }, \ - { r53, r43, r34, r23, r13, r03, r58 }, \ - { r54, r44, r35, r24, r14, r47, r57 }, \ - { r55, r45, r36, r25, r37, r46, r56 } \ -} - // Uncomment below if a pedal used for Open/Close is normally-on type (such as Yamaha's.) // #define PEDAL_NORMALLY_CLOSED diff --git a/keyboards/bandominedoni/info.json b/keyboards/bandominedoni/info.json index 0f96714954ca..c4dfe46d74b4 100644 --- a/keyboards/bandominedoni/info.json +++ b/keyboards/bandominedoni/info.json @@ -34,94 +34,92 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "l00", "x": 2, "y": 0.5}, - {"label": "l01", "x": 3, "y": 0.5}, - {"label": "l02", "x": 4, "y": 0.5}, - {"label": "l03", "x": 5, "y": 0.5}, - {"label": "l04", "x": 6, "y": 0.5}, + {"label": "l00", "matrix": [0, 1], "x": 2, "y": 0.5}, + {"label": "l01", "matrix": [0, 2], "x": 3, "y": 0.5}, + {"label": "l02", "matrix": [0, 3], "x": 4, "y": 0.5}, + {"label": "l03", "matrix": [0, 4], "x": 5, "y": 0.5}, + {"label": "l04", "matrix": [0, 5], "x": 6, "y": 0.5}, - {"label": "l10", "x": 0.5, "y": 1.5}, - {"label": "l11", "x": 1.5, "y": 1.5}, - {"label": "l12", "x": 2.5, "y": 1.5}, - {"label": "l13", "x": 3.5, "y": 1.5}, - {"label": "l14", "x": 4.5, "y": 1.5}, - {"label": "l15", "x": 5.5, "y": 1.5}, - {"label": "l16", "x": 6.5, "y": 1.5}, + {"label": "l10", "matrix": [1, 0], "x": 0.5, "y": 1.5}, + {"label": "l11", "matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"label": "l12", "matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"label": "l13", "matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"label": "l14", "matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"label": "l15", "matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"label": "l16", "matrix": [1, 6], "x": 6.5, "y": 1.5}, - {"label": "l20", "x": 1, "y": 2.5}, - {"label": "l21", "x": 2, "y": 2.5}, - {"label": "l22", "x": 3, "y": 2.5}, - {"label": "l23", "x": 4, "y": 2.5}, - {"label": "l24", "x": 5, "y": 2.5}, - {"label": "l25", "x": 6, "y": 2.5}, - {"label": "l26", "x": 7, "y": 2.5}, + {"label": "l20", "matrix": [2, 0], "x": 1, "y": 2.5}, + {"label": "l21", "matrix": [2, 1], "x": 2, "y": 2.5}, + {"label": "l22", "matrix": [2, 2], "x": 3, "y": 2.5}, + {"label": "l23", "matrix": [2, 3], "x": 4, "y": 2.5}, + {"label": "l24", "matrix": [2, 4], "x": 5, "y": 2.5}, + {"label": "l25", "matrix": [2, 5], "x": 6, "y": 2.5}, + {"label": "l26", "matrix": [2, 6], "x": 7, "y": 2.5}, - {"label": "l30", "x": 0.5, "y": 3.5}, - {"label": "l31", "x": 1.5, "y": 3.5}, - {"label": "l32", "x": 2.5, "y": 3.5}, - {"label": "l33", "x": 3.5, "y": 3.5}, - {"label": "l34", "x": 4.5, "y": 3.5}, - {"label": "l35", "x": 5.5, "y": 3.5}, - {"label": "l36", "x": 6.5, "y": 3.5}, + {"label": "l30", "matrix": [3, 0], "x": 0.5, "y": 3.5}, + {"label": "l31", "matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"label": "l32", "matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"label": "l33", "matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"label": "l34", "matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"label": "l35", "matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"label": "l36", "matrix": [3, 6], "x": 6.5, "y": 3.5}, - {"label": "l40", "x": 0, "y": 4.5}, - {"label": "l41", "x": 1, "y": 4.5}, - {"label": "l42", "x": 2, "y": 4.5}, - {"label": "l43", "x": 3, "y": 4.5}, - {"label": "l44", "x": 4, "y": 4.5}, - {"label": "l45", "x": 5, "y": 4.5}, - {"label": "l46", "x": 6, "y": 4.5}, - {"label": "l47", "x": 7, "y": 4.5}, + {"label": "l40", "matrix": [0, 0], "x": 0, "y": 4.5}, + {"label": "l41", "matrix": [4, 0], "x": 1, "y": 4.5}, + {"label": "l42", "matrix": [4, 1], "x": 2, "y": 4.5}, + {"label": "l43", "matrix": [4, 2], "x": 3, "y": 4.5}, + {"label": "l44", "matrix": [4, 3], "x": 4, "y": 4.5}, + {"label": "l45", "matrix": [4, 4], "x": 5, "y": 4.5}, + {"label": "l46", "matrix": [4, 5], "x": 6, "y": 4.5}, + {"label": "l47", "matrix": [4, 6], "x": 7, "y": 4.5}, - {"label": "oc", "x": 9, "y": 0}, + {"label": "oc", "matrix": [7, 6], "x": 9, "y": 0}, + {"label": "r00", "matrix": [6, 5], "x": 11.5, "y": 0}, + {"label": "r01", "matrix": [7, 5], "x": 12.5, "y": 0}, + {"label": "r02", "matrix": [8, 5], "x": 13.5, "y": 0}, + {"label": "r03", "matrix": [9, 5], "x": 14.5, "y": 0}, + {"label": "fn", "matrix": [8, 6], "x": 17, "y": 0}, - {"label": "r00", "x": 11.5, "y": 0}, - {"label": "r01", "x": 12.5, "y": 0}, - {"label": "r02", "x": 13.5, "y": 0}, - {"label": "r03", "x": 14.5, "y": 0}, + {"label": "r10", "matrix": [6, 4], "x": 11, "y": 1}, + {"label": "r11", "matrix": [7, 4], "x": 12, "y": 1}, + {"label": "r12", "matrix": [8, 4], "x": 13, "y": 1}, + {"label": "r13", "matrix": [9, 4], "x": 14, "y": 1}, + {"label": "r14", "matrix": [10, 4], "x": 15, "y": 1}, - {"label": "fn", "x": 17, "y": 0}, + {"label": "r20", "matrix": [6, 3], "x": 10.5, "y": 2}, + {"label": "r21", "matrix": [7, 3], "x": 11.5, "y": 2}, + {"label": "r22", "matrix": [8, 3], "x": 12.5, "y": 2}, + {"label": "r23", "matrix": [9, 3], "x": 13.5, "y": 2}, + {"label": "r24", "matrix": [10, 3], "x": 14.5, "y": 2}, + {"label": "r25", "matrix": [11, 3], "x": 15.5, "y": 2}, - {"label": "r10", "x": 11, "y": 1}, - {"label": "r11", "x": 12, "y": 1}, - {"label": "r12", "x": 13, "y": 1}, - {"label": "r13", "x": 14, "y": 1}, - {"label": "r14", "x": 15, "y": 1}, + {"label": "r30", "matrix": [6, 6], "x": 9, "y": 3}, + {"label": "r31", "matrix": [6, 2], "x": 10, "y": 3}, + {"label": "r32", "matrix": [7, 2], "x": 11, "y": 3}, + {"label": "r33", "matrix": [8, 2], "x": 12, "y": 3}, + {"label": "r34", "matrix": [9, 2], "x": 13, "y": 3}, + {"label": "r35", "matrix": [10, 2], "x": 14, "y": 3}, + {"label": "r36", "matrix": [11, 2], "x": 15, "y": 3}, + {"label": "r37", "matrix": [11, 4], "x": 16, "y": 3}, - {"label": "r20", "x": 10.5, "y": 2}, - {"label": "r21", "x": 11.5, "y": 2}, - {"label": "r22", "x": 12.5, "y": 2}, - {"label": "r23", "x": 13.5, "y": 2}, - {"label": "r24", "x": 14.5, "y": 2}, - {"label": "r25", "x": 15.5, "y": 2}, + {"label": "r40", "matrix": [6, 1], "x": 9.5, "y": 4}, + {"label": "r41", "matrix": [7, 1], "x": 10.5, "y": 4}, + {"label": "r42", "matrix": [8, 1], "x": 11.5, "y": 4}, + {"label": "r43", "matrix": [9, 1], "x": 12.5, "y": 4}, + {"label": "r44", "matrix": [10, 1], "x": 13.5, "y": 4}, + {"label": "r45", "matrix": [11, 1], "x": 14.5, "y": 4}, + {"label": "r46", "matrix": [11, 5], "x": 15.5, "y": 4}, + {"label": "r47", "matrix": [10, 5], "x": 16.5, "y": 4}, - {"label": "r30", "x": 9, "y": 3}, - {"label": "r31", "x": 10, "y": 3}, - {"label": "r32", "x": 11, "y": 3}, - {"label": "r33", "x": 12, "y": 3}, - {"label": "r34", "x": 13, "y": 3}, - {"label": "r35", "x": 14, "y": 3}, - {"label": "r36", "x": 15, "y": 3}, - {"label": "r37", "x": 16, "y": 3}, - - {"label": "r40", "x": 9.5, "y": 4}, - {"label": "r41", "x": 10.5, "y": 4}, - {"label": "r42", "x": 11.5, "y": 4}, - {"label": "r43", "x": 12.5, "y": 4}, - {"label": "r44", "x": 13.5, "y": 4}, - {"label": "r45", "x": 14.5, "y": 4}, - {"label": "r46", "x": 15.5, "y": 4}, - {"label": "r47", "x": 16.5, "y": 4}, - - {"label": "r50", "x": 9, "y": 5}, - {"label": "r51", "x": 10, "y": 5}, - {"label": "r52", "x": 11, "y": 5}, - {"label": "r53", "x": 12, "y": 5}, - {"label": "r54", "x": 13, "y": 5}, - {"label": "r55", "x": 14, "y": 5}, - {"label": "r56", "x": 15, "y": 5}, - {"label": "r57", "x": 16, "y": 5}, - {"label": "r58", "x": 17, "y": 5} + {"label": "r50", "matrix": [6, 0], "x": 9, "y": 5}, + {"label": "r51", "matrix": [7, 0], "x": 10, "y": 5}, + {"label": "r52", "matrix": [8, 0], "x": 11, "y": 5}, + {"label": "r53", "matrix": [9, 0], "x": 12, "y": 5}, + {"label": "r54", "matrix": [10, 0], "x": 13, "y": 5}, + {"label": "r55", "matrix": [11, 0], "x": 14, "y": 5}, + {"label": "r56", "matrix": [11, 6], "x": 15, "y": 5}, + {"label": "r57", "matrix": [10, 6], "x": 16, "y": 5}, + {"label": "r58", "matrix": [9, 6], "x": 17, "y": 5} ] } } diff --git a/keyboards/bantam44/bantam44.h b/keyboards/bantam44/bantam44.h deleted file mode 100644 index f680f9eac262..000000000000 --- a/keyboards/bantam44/bantam44.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1B, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k30, k31, k32, k34, k36, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, k39, k3A, k3B } \ -} diff --git a/keyboards/bantam44/info.json b/keyboards/bantam44/info.json index 2f7eef9ba282..62713f82d773 100644 --- a/keyboards/bantam44/info.json +++ b/keyboards/bantam44/info.json @@ -17,7 +17,55 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K30", "x":0, "y":3, "w":1.25}, {"label":"K31", "x":1.25, "y":3, "w":1.25}, {"label":"K32", "x":2.5, "y":3, "w":1.25}, {"label":"K33", "x":3.75, "y":3, "w":1.25}, {"label":"K34", "x":5, "y":3, "w":2.75}, {"label":"K35", "x":7.75, "y":3, "w":1.25}, {"label":"K36", "x":9, "y":3}, {"label":"K37", "x":10, "y":3}, {"label":"K38", "x":11, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 5, "y": 3, "w": 2.75}, + {"matrix": [3, 8], "x": 7.75, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/basekeys/trifecta/info.json b/keyboards/basekeys/trifecta/info.json index d52c54dbc69e..eae4ac1d6356 100644 --- a/keyboards/basekeys/trifecta/info.json +++ b/keyboards/basekeys/trifecta/info.json @@ -28,9 +28,93 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}] + "layout": [ + {"matrix": [1, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [1, 2], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 5, "y": 0}, + {"matrix": [1, 3], "x": 6, "y": 0}, + + {"matrix": [0, 4], "x": 8.75, "y": 0}, + {"matrix": [1, 4], "x": 9.75, "y": 0}, + {"matrix": [0, 5], "x": 10.75, "y": 0}, + {"matrix": [1, 5], "x": 11.75, "y": 0}, + {"matrix": [0, 6], "x": 12.75, "y": 0}, + {"matrix": [1, 6], "x": 13.75, "y": 0}, + {"matrix": [0, 7], "x": 14.75, "y": 0}, + {"matrix": [1, 7], "x": 15.75, "y": 0}, + + {"matrix": [3, 7], "x": 17, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 1], "x": 2.5, "y": 1}, + {"matrix": [2, 2], "x": 3.5, "y": 1}, + {"matrix": [3, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + + {"matrix": [3, 3], "x": 8.25, "y": 1}, + {"matrix": [2, 4], "x": 9.25, "y": 1}, + {"matrix": [3, 4], "x": 10.25, "y": 1}, + {"matrix": [2, 5], "x": 11.25, "y": 1}, + {"matrix": [3, 5], "x": 12.25, "y": 1}, + {"matrix": [2, 6], "x": 13.25, "y": 1}, + {"matrix": [3, 6], "x": 14.25, "y": 1}, + {"matrix": [2, 7], "x": 15.25, "y": 1, "w": 1.5}, + + {"matrix": [5, 7], "x": 17, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 1], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 2], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 3], "x": 5.75, "y": 2}, + + {"matrix": [4, 3], "x": 8.5, "y": 2}, + {"matrix": [5, 4], "x": 9.5, "y": 2}, + {"matrix": [4, 4], "x": 10.5, "y": 2}, + {"matrix": [5, 5], "x": 11.5, "y": 2}, + {"matrix": [4, 5], "x": 12.5, "y": 2}, + {"matrix": [5, 6], "x": 13.5, "y": 2}, + {"matrix": [4, 7], "x": 14.5, "y": 2, "w": 2.25}, + + {"matrix": [7, 7], "x": 17, "y": 2}, + + {"matrix": [7, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [6, 4], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [6, 5], "x": 11, "y": 3}, + {"matrix": [7, 5], "x": 12, "y": 3}, + {"matrix": [6, 6], "x": 13, "y": 3}, + {"matrix": [7, 6], "x": 14, "y": 3, "w": 1.75}, + + {"matrix": [6, 7], "x": 16, "y": 3.25}, + + {"matrix": [9, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 4.5, "y": 4, "w": 2.25}, + {"matrix": [9, 4], "x": 6.75, "y": 4}, + {"matrix": [8, 5], "x": 8.5, "y": 4, "w": 2.75}, + {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [8, 6], "x": 13.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 6], "x": 15, "y": 4.25}, + {"matrix": [8, 7], "x": 16, "y": 4.25}, + {"matrix": [9, 7], "x": 17, "y": 4.25} + ] } } } diff --git a/keyboards/basekeys/trifecta/trifecta.c b/keyboards/basekeys/trifecta/trifecta.c index e7aca201ce42..926180d99663 100644 --- a/keyboards/basekeys/trifecta/trifecta.c +++ b/keyboards/basekeys/trifecta/trifecta.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "trifecta.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/basekeys/trifecta/trifecta.h b/keyboards/basekeys/trifecta/trifecta.h deleted file mode 100644 index ed337813c657..000000000000 --- a/keyboards/basekeys/trifecta/trifecta.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Swiftrax and Basekeys.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 . - */ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO//readabilty - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k37, \ - k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k57, \ - k40, k51, k41, k52, k42, k53, k43, k54, k44, k55, k45, k56, k47, k77, \ - k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, \ - k90, k81, k91, k82, k94, k85, k95, k86, k96, k87, k97 \ -) \ -{ \ - { XXX, k01, k02, k03, k04, k05, k06, k07}, \ - { k10, k11, k12, k13, k14, k15, k16, k17}, \ - { XXX, k21, k22, k23, k24, k25, k26, k27}, \ - { k30, k31, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, k42, k43, k44, k45, XXX, k47}, \ - { XXX, k51, k52, k53, k54, k55, k56, k57}, \ - { XXX, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, k76, k77}, \ - { XXX, k81, k82, XXX, XXX, k85, k86, k87}, \ - { k90, k91, XXX, XXX, k94, k95, k96, k97} \ -} diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.c b/keyboards/bastardkb/charybdis/3x5/3x5.c index 7b10d322cd8f..082dbbc3bd46 100644 --- a/keyboards/bastardkb/charybdis/3x5/3x5.c +++ b/keyboards/bastardkb/charybdis/3x5/3x5.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "3x5.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x5/3x5.h b/keyboards/bastardkb/charybdis/3x5/3x5.h deleted file mode 100644 index 3041397e15d4..000000000000 --- a/keyboards/bastardkb/charybdis/3x5/3x5.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2021 Charly Delay (@0xcharly) - * - * 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 "charybdis.h" - -// clang-format off -#define LAYOUT( \ - k00, k01, k02, k03, k04, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k64, k63, k62, k61, k60, \ - k32, k33, k30, k70, k72 \ -) \ -{ \ - { k00, k01, k02, k03, k04 }, \ - { k10, k11, k12, k13, k14 }, \ - { k20, k21, k22, k23, k24 }, \ - { k30, KC_NO, k32, k33, KC_NO }, \ - { k40, k41, k42, k43, k44 }, \ - { k50, k51, k52, k53, k54 }, \ - { k60, k61, k62, k63, k64 }, \ - { k70, KC_NO, k72, KC_NO, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/charybdis/3x5/info.json b/keyboards/bastardkb/charybdis/3x5/info.json index 32437edeb0af..cc233f35681d 100644 --- a/keyboards/bastardkb/charybdis/3x5/info.json +++ b/keyboards/bastardkb/charybdis/3x5/info.json @@ -11,41 +11,48 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "L30", "x": 4, "y": 3 }, - { "label": "L31", "x": 5, "y": 3 }, - { "label": "L32", "x": 6, "y": 3 }, - { "label": "R30", "x": 9, "y": 3 }, - { "label": "R31", "x": 10, "y": 3 } + {"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": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 1], "x": 14, "y": 0}, + {"matrix": [4, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1}, + {"matrix": [5, 1], "x": 14, "y": 1}, + {"matrix": [5, 0], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + {"matrix": [6, 0], "x": 15, "y": 2}, + + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 3], "x": 5, "y": 3}, + {"matrix": [3, 0], "x": 6, "y": 3}, + + {"matrix": [7, 0], "x": 9, "y": 3}, + {"matrix": [7, 2], "x": 10, "y": 3} ] } } diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.c b/keyboards/bastardkb/charybdis/3x6/3x6.c index beb04efc0bad..a6c7ce07d6e0 100644 --- a/keyboards/bastardkb/charybdis/3x6/3x6.c +++ b/keyboards/bastardkb/charybdis/3x6/3x6.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "3x6.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/3x6/3x6.h b/keyboards/bastardkb/charybdis/3x6/3x6.h deleted file mode 100644 index a93d183ae1b4..000000000000 --- a/keyboards/bastardkb/charybdis/3x6/3x6.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2022 Charly Delay (@0xcharly) - * - * 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 "charybdis.h" - -// clang-format off -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k45, k44, k43, k42, k41, k40, \ - k10, k11, k12, k13, k14, k15, k55, k54, k53, k52, k51, k50, \ - k20, k21, k22, k23, k24, k25, k65, k64, k63, k62, k61, k60, \ - k33, k34, k31, k71, k73 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { KC_NO, k31, KC_NO, k33, k34, KC_NO }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { KC_NO, k71, KC_NO, k73, KC_NO, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/charybdis/3x6/info.json b/keyboards/bastardkb/charybdis/3x6/info.json index 41940b0b8bff..787e3bdf14cc 100644 --- a/keyboards/bastardkb/charybdis/3x6/info.json +++ b/keyboards/bastardkb/charybdis/3x6/info.json @@ -6,50 +6,57 @@ "layout_aliases": { "LAYOUT_charybdis_3x6": "LAYOUT" }, - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "L05", "x": 5, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "R05", "x": 16, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "L15", "x": 5, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "R15", "x": 16, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "L25", "x": 5, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "R25", "x": 16, "y": 2 }, - { "label": "L33", "x": 5, "y": 3 }, - { "label": "L34", "x": 6, "y": 3 }, - { "label": "L31", "x": 7, "y": 3 }, - { "label": "R31", "x": 9, "y": 3 }, - { "label": "R33", "x": 10, "y": 3 } + {"label": "L00", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "L01", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "L02", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "L03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "L04", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "L05", "matrix": [0, 5], "x": 5, "y": 0}, + + {"label": "R00", "matrix": [4, 5], "x": 11, "y": 0}, + {"label": "R01", "matrix": [4, 4], "x": 12, "y": 0}, + {"label": "R02", "matrix": [4, 3], "x": 13, "y": 0}, + {"label": "R03", "matrix": [4, 2], "x": 14, "y": 0}, + {"label": "R04", "matrix": [4, 1], "x": 15, "y": 0}, + {"label": "R05", "matrix": [4, 0], "x": 16, "y": 0}, + + {"label": "L10", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "L11", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "L12", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "L13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "L14", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "L15", "matrix": [1, 5], "x": 5, "y": 1}, + + {"label": "R10", "matrix": [5, 5], "x": 11, "y": 1}, + {"label": "R11", "matrix": [5, 4], "x": 12, "y": 1}, + {"label": "R12", "matrix": [5, 3], "x": 13, "y": 1}, + {"label": "R13", "matrix": [5, 2], "x": 14, "y": 1}, + {"label": "R14", "matrix": [5, 1], "x": 15, "y": 1}, + {"label": "R15", "matrix": [5, 0], "x": 16, "y": 1}, + + {"label": "L20", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "L21", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "L22", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "L23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "L24", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "L25", "matrix": [2, 5], "x": 5, "y": 2}, + + {"label": "R20", "matrix": [6, 5], "x": 11, "y": 2}, + {"label": "R21", "matrix": [6, 4], "x": 12, "y": 2}, + {"label": "R22", "matrix": [6, 3], "x": 13, "y": 2}, + {"label": "R23", "matrix": [6, 2], "x": 14, "y": 2}, + {"label": "R24", "matrix": [6, 1], "x": 15, "y": 2}, + {"label": "R25", "matrix": [6, 0], "x": 16, "y": 2}, + + {"label": "L33", "matrix": [3, 3], "x": 5, "y": 3}, + {"label": "L34", "matrix": [3, 4], "x": 6, "y": 3}, + {"label": "L31", "matrix": [3, 1], "x": 7, "y": 3}, + + {"label": "R31", "matrix": [7, 1], "x": 9, "y": 3}, + {"label": "R33", "matrix": [7, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.c b/keyboards/bastardkb/charybdis/4x6/4x6.c index 85e8b5fdd16f..c7856c12bbb7 100644 --- a/keyboards/bastardkb/charybdis/4x6/4x6.c +++ b/keyboards/bastardkb/charybdis/4x6/4x6.c @@ -17,7 +17,7 @@ * along with this program. If not, see . */ -#include "4x6.h" +#include "quantum.h" // clang-format off #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/bastardkb/charybdis/4x6/4x6.h b/keyboards/bastardkb/charybdis/4x6/4x6.h deleted file mode 100644 index 0d8810266e9b..000000000000 --- a/keyboards/bastardkb/charybdis/4x6/4x6.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2021 Quentin LEBASTARD - * Copyright 2021 Charly Delay (@0xcharly) - * - * 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 "charybdis.h" - -// clang-format off -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ - k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ - k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ - k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ - k43, k44, k41, k91, k93, \ - k45, k42, k95 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { KC_NO, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { k80, k81, k82, k83, k84, k85 }, \ - { KC_NO, k91, KC_NO, k93, KC_NO, k95 }, \ -} -// clang-format on diff --git a/keyboards/bastardkb/charybdis/4x6/info.json b/keyboards/bastardkb/charybdis/4x6/info.json index 6f3b6ec57ed5..8259e9614108 100644 --- a/keyboards/bastardkb/charybdis/4x6/info.json +++ b/keyboards/bastardkb/charybdis/4x6/info.json @@ -11,62 +11,73 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "L00", "x": 0, "y": 0 }, - { "label": "L01", "x": 1, "y": 0 }, - { "label": "L02", "x": 2, "y": 0 }, - { "label": "L03", "x": 3, "y": 0 }, - { "label": "L04", "x": 4, "y": 0 }, - { "label": "L05", "x": 5, "y": 0 }, - { "label": "R00", "x": 11, "y": 0 }, - { "label": "R01", "x": 12, "y": 0 }, - { "label": "R02", "x": 13, "y": 0 }, - { "label": "R03", "x": 14, "y": 0 }, - { "label": "R04", "x": 15, "y": 0 }, - { "label": "R05", "x": 16, "y": 0 }, - { "label": "L10", "x": 0, "y": 1 }, - { "label": "L11", "x": 1, "y": 1 }, - { "label": "L12", "x": 2, "y": 1 }, - { "label": "L13", "x": 3, "y": 1 }, - { "label": "L14", "x": 4, "y": 1 }, - { "label": "L15", "x": 5, "y": 1 }, - { "label": "R10", "x": 11, "y": 1 }, - { "label": "R11", "x": 12, "y": 1 }, - { "label": "R12", "x": 13, "y": 1 }, - { "label": "R13", "x": 14, "y": 1 }, - { "label": "R14", "x": 15, "y": 1 }, - { "label": "R15", "x": 16, "y": 1 }, - { "label": "L20", "x": 0, "y": 2 }, - { "label": "L21", "x": 1, "y": 2 }, - { "label": "L22", "x": 2, "y": 2 }, - { "label": "L23", "x": 3, "y": 2 }, - { "label": "L24", "x": 4, "y": 2 }, - { "label": "L25", "x": 5, "y": 2 }, - { "label": "R20", "x": 11, "y": 2 }, - { "label": "R21", "x": 12, "y": 2 }, - { "label": "R22", "x": 13, "y": 2 }, - { "label": "R23", "x": 14, "y": 2 }, - { "label": "R24", "x": 15, "y": 2 }, - { "label": "R25", "x": 16, "y": 2 }, - { "label": "L30", "x": 0, "y": 3 }, - { "label": "L31", "x": 1, "y": 3 }, - { "label": "L32", "x": 2, "y": 3 }, - { "label": "L33", "x": 3, "y": 3 }, - { "label": "L34", "x": 4, "y": 3 }, - { "label": "L35", "x": 5, "y": 3 }, - { "label": "R30", "x": 11, "y": 3 }, - { "label": "R31", "x": 12, "y": 3 }, - { "label": "R32", "x": 13, "y": 3 }, - { "label": "R33", "x": 14, "y": 3 }, - { "label": "R34", "x": 15, "y": 3 }, - { "label": "R35", "x": 16, "y": 3 }, - { "label": "L40", "x": 5, "y": 4 }, - { "label": "L41", "x": 6, "y": 4 }, - { "label": "L42", "x": 7, "y": 4 }, - { "label": "R40", "x": 9, "y": 4 }, - { "label": "R41", "x": 10, "y": 4 }, - { "label": "L50", "x": 6, "y": 5 }, - { "label": "L51", "x": 7, "y": 5 }, - { "label": "R50", "x": 9, "y": 5 } + {"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": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 3], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [4, 1], "x": 7, "y": 4}, + + {"matrix": [9, 1], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + + {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 7, "y": 5}, + + {"matrix": [9, 5], "x": 9, "y": 5} ] } } diff --git a/keyboards/bastardkb/charybdis/charybdis.h b/keyboards/bastardkb/charybdis/charybdis.h index 06142aded209..a8ee639d9a0c 100644 --- a/keyboards/bastardkb/charybdis/charybdis.h +++ b/keyboards/bastardkb/charybdis/charybdis.h @@ -18,18 +18,6 @@ #pragma once -// clang-format off -#if defined(KEYBOARD_bastardkb_charybdis_3x5) -# include "3x5.h" -#elif defined(KEYBOARD_bastardkb_charybdis_3x6) -# include "3x6.h" -#elif defined(KEYBOARD_bastardkb_charybdis_4x6) -# include "4x6.h" -#else -# error "Unsuported format" -#endif -// clang-format on - #include "quantum.h" #ifdef POINTING_DEVICE_ENABLE diff --git a/keyboards/blank_tehnologii/manibus/info.json b/keyboards/blank_tehnologii/manibus/info.json index 31df9e14eb18..3cd996d21b7c 100644 --- a/keyboards/blank_tehnologii/manibus/info.json +++ b/keyboards/blank_tehnologii/manibus/info.json @@ -28,77 +28,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.75}, - {"label":"1", "x":1, "y":0.5}, - {"label":"2", "x":2, "y":0.25}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0.25}, - {"label":"5", "x":5, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"label":"6", "x":9, "y":0.25}, - {"label":"7", "x":10, "y":0.25}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0.25}, - {"label":"0", "x":13, "y":0.5}, - {"label":"-", "x":14, "y":0.75}, + {"matrix": [5, 1], "x": 9, "y": 0.25}, + {"matrix": [5, 2], "x": 10, "y": 0.25}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.25}, + {"matrix": [5, 5], "x": 13, "y": 0.5}, + {"matrix": [5, 6], "x": 14, "y": 0.75}, - {"label":"Tab", "x":0, "y":1.75}, - {"label":"Q", "x":1, "y":1.5}, - {"label":"W", "x":2, "y":1.25}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1.25}, - {"label":"T", "x":5, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"label":"Y", "x":9, "y":1.25}, - {"label":"U", "x":10, "y":1.25}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1.25}, - {"label":"P", "x":13, "y":1.5}, - {"label":"=", "x":14, "y":1.75}, + {"matrix": [6, 1], "x": 9, "y": 1.25}, + {"matrix": [6, 2], "x": 10, "y": 1.25}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.25}, + {"matrix": [6, 5], "x": 13, "y": 1.5}, + {"matrix": [6, 6], "x": 14, "y": 1.75}, - {"label":"Caps", "x":0, "y":2.75}, - {"label":"A", "x":1, "y":2.5}, - {"label":"S", "x":2, "y":2.25}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2.25}, - {"label":"G", "x":5, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"label":"H", "x":9, "y":2.25}, - {"label":"J", "x":10, "y":2.25}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2.25}, - {"label":";", "x":13, "y":2.5}, - {"label":"'", "x":14, "y":2.75}, + {"matrix": [7, 1], "x": 9, "y": 2.25}, + {"matrix": [7, 2], "x": 10, "y": 2.25}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.25}, + {"matrix": [7, 5], "x": 13, "y": 2.5}, + {"matrix": [7, 6], "x": 14, "y": 2.75}, - {"label":"Shift", "x":0, "y":3.75}, - {"label":"Z", "x":1, "y":3.5}, - {"label":"X", "x":2, "y":3.25}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3.25}, - {"label":"B", "x":5, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, - {"label":"N", "x":9, "y":3.25}, - {"label":"M", "x":10, "y":3.25}, - {"label":",", "x":11, "y":3}, - {"label":".", "x":12, "y":3.25}, - {"label":"/", "x":13, "y":3.5}, - {"label":"|", "x":14, "y":3.75}, + {"matrix": [8, 1], "x": 9, "y": 3.25}, + {"matrix": [8, 2], "x": 10, "y": 3.25}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.25}, + {"matrix": [8, 5], "x": 13, "y": 3.5}, + {"matrix": [8, 6], "x": 14, "y": 3.75}, - {"label":"Control", "x":0, "y":4.75}, - {"label":"Home", "x":1, "y":4.5}, - {"label":"Insert", "x":2, "y":4.25}, - {"label":"Delete", "x":3, "y":4}, - {"label":"GUI", "x":4, "y":4.25}, - {"label":"Space", "x":5, "y":4.25, "h":1.5}, - {"label":"Alt", "x":6, "y":4.25, "h":2.25}, + {"matrix": [4, 0], "x": 0, "y": 4.75}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 4.25, "h": 1.5}, + {"matrix": [4, 6], "x": 6, "y": 4.25, "h": 2.25}, - {"label":"Enter", "x":8, "y":4.25, "h":2.25}, - {"label":"Backspace", "x":9, "y":4.25, "h":1.5}, - {"label":"MOD", "x":10, "y":4.25}, - {"label":"[", "x":11, "y":4}, - {"label":"]", "x":12, "y":4.25}, - {"label":"End", "x":13, "y":4.5}, - {"label":"~", "x":14, "y":4.75} + {"matrix": [9, 0], "x": 8, "y": 4.25, "h": 2.25}, + {"matrix": [9, 1], "x": 9, "y": 4.25, "h": 1.5}, + {"matrix": [9, 2], "x": 10, "y": 4.25}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 4], "x": 12, "y": 4.25}, + {"matrix": [9, 5], "x": 13, "y": 4.5}, + {"matrix": [9, 6], "x": 14, "y": 4.75} ] } } diff --git a/keyboards/blank_tehnologii/manibus/manibus.h b/keyboards/blank_tehnologii/manibus/manibus.h deleted file mode 100644 index e705d79eedb5..000000000000 --- a/keyboards/blank_tehnologii/manibus/manibus.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 SamuraiKek - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, LT1, RT1, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, LT1 }, \ - { KC_NO, R00, R01, R02, R03, R04, R05 }, \ - { KC_NO, R10, R11, R12, R13, R14, R15 }, \ - { KC_NO, R20, R21, R22, R23, R24, R25 }, \ - { KC_NO, R30, R31, R32, R33, R34, R35 }, \ - { RT1, R40, R41, R42, R43, R44, R45 }, \ - } diff --git a/keyboards/blockboy/ac980mini/ac980mini.c b/keyboards/blockboy/ac980mini/ac980mini.c index 272bac7b81bc..b6a29f94ea92 100644 --- a/keyboards/blockboy/ac980mini/ac980mini.c +++ b/keyboards/blockboy/ac980mini/ac980mini.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ac980mini.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // LED location configuration diff --git a/keyboards/blockboy/ac980mini/ac980mini.h b/keyboards/blockboy/ac980mini/ac980mini.h deleted file mode 100644 index 9dc7b49077f4..000000000000 --- a/keyboards/blockboy/ac980mini/ac980mini.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 rooski15 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - 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, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, K3F, K3G, \ - K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { 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, ___, K2D, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, ___, K3C, K3D, K3E, K3F, K3G, ___ }, \ - { K40, K41, K42, ___, ___, K45, ___, ___, ___, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \ -} diff --git a/keyboards/blockboy/ac980mini/info.json b/keyboards/blockboy/ac980mini/info.json index 1f1e88afe561..512e73e4d2d0 100644 --- a/keyboards/blockboy/ac980mini/info.json +++ b/keyboards/blockboy/ac980mini/info.json @@ -22,93 +22,98 @@ "driver": "WS2812" }, "layouts": { - "LAYOUT_all": { + "LAYOUT": { "layout": [ - { "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": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10, "y": 0 }, - { "matrix": [0, 11], "x": 11, "y": 0 }, - { "matrix": [0, 12], "x": 12, "y": 0 }, - { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [0, 14], "x": 15.5, "y": 0 }, - { "matrix": [0, 15], "x": 16.5, "y": 0 }, - { "matrix": [0, 16], "x": 17.5, "y": 0 }, - { "matrix": [0, 17], "x": 18.5, "y": 0 }, - - { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [1, 14], "x": 15.5, "y": 1 }, - { "matrix": [1, 15], "x": 16.5, "y": 1 }, - { "matrix": [1, 16], "x": 17.5, "y": 1 }, - - { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [2, 14], "x": 15.5, "y": 2 }, - { "matrix": [2, 15], "x": 16.5, "y": 2 }, - { "matrix": [2, 16], "x": 17.5, "y": 2 }, - { "h": 2, "matrix": [2, 17], "x": 18.5, "y": 1 }, - - { "matrix": [3, 0], "w": 2.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "x": 11.25, "y": 3 }, - { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 13], "x": 14.25, "y": 3.25 }, - { "matrix": [3, 14], "x": 15.5, "y": 3 }, - { "matrix": [3, 15], "x": 16.5, "y": 3 }, - { "matrix": [3, 16], "x": 17.5, "y": 3 }, - - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [4, 5], "w": 6.25, "x": 3.75, "y": 4 }, - { "matrix": [4, 9], "x": 10, "y": 4 }, - { "matrix": [4, 10], "x": 11, "y": 4 }, - { "matrix": [4, 11], "x": 12, "y": 4 }, - { "matrix": [4, 12], "x": 13.25, "y": 4.25 }, - { "matrix": [4, 13], "x": 14.25, "y": 4.25 }, - { "matrix": [4, 14], "x": 15.25, "y": 4.25 }, - { "matrix": [4, 15], "x": 16.5, "y": 4 }, - { "matrix": [4, 16], "x": 17.5, "y": 4 }, - { "h": 2, "matrix": [4, 17], "x": 18.5, "y": 3 } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [2, 17], "x": 18.5, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + {"matrix": [3, 16], "x": 17.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13.25, "y": 4.25}, + {"matrix": [4, 13], "x": 14.25, "y": 4.25}, + {"matrix": [4, 14], "x": 15.25, "y": 4.25}, + + {"matrix": [4, 15], "x": 16.5, "y": 4}, + {"matrix": [4, 16], "x": 17.5, "y": 4}, + {"matrix": [4, 17], "x": 18.5, "y": 3, "h": 2} ] } } diff --git a/keyboards/blockboy/ac980mini/keymaps/default/keymap.c b/keyboards/blockboy/ac980mini/keymaps/default/keymap.c index 64abcc1e701e..b5541ed23e2b 100644 --- a/keyboards/blockboy/ac980mini/keymaps/default/keymap.c +++ b/keyboards/blockboy/ac980mini/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┘ │ ← │ ↓ │ → │ └───┴───┴───┘ * └───┴───┴───┘ */ - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, @@ -39,21 +39,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT ), // RGB Control - [1] = LAYOUT_all( + [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, RGB_MOD, RGB_HUI, RGB_SAI, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/blockboy/ac980mini/keymaps/via/keymap.c b/keyboards/blockboy/ac980mini/keymaps/via/keymap.c index 7bcfcb11d753..ee1718484c5d 100644 --- a/keyboards/blockboy/ac980mini/keymaps/via/keymap.c +++ b/keyboards/blockboy/ac980mini/keymaps/via/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴───┴───┴───┘ │ ← │ ↓ │ → │ └───┴───┴───┘ * └───┴───┴───┘ */ - [0] = LAYOUT_all( + [0] = LAYOUT( QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_P7, KC_P8, KC_P9, KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_P4, KC_P5, KC_P6, KC_PPLS, @@ -39,21 +39,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT ), // RGB Control - [1] = LAYOUT_all( + [1] = LAYOUT( _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______, RGB_TOG, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, MO(2), _______, RGB_MOD, RGB_HUI, RGB_SAI, _______, _______, _______ ), - [2] = LAYOUT_all( + [2] = LAYOUT( QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [3] = LAYOUT_all( + [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, @@ -64,7 +64,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* - [x] = LAYOUT_all( + [x] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, diff --git a/keyboards/blockey/blockey.h b/keyboards/blockey/blockey.h deleted file mode 100644 index 7b007a2e978d..000000000000 --- a/keyboards/blockey/blockey.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2018 Eucalyn - * - * 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" - -// readability -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k50, k51, k52, k53, k54, k55, k56, \ - k10, k11, k12, k13, k14, k15, k16, k60, k61, k62, k63, k64, k65, k66, \ - k20, k21, k22, k23, k24, k25, k26, k70, k71, k72, k73, k74, k75, \ - k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \ - k40, k41, k42, k43, k46, k93, k94, k95 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, XXX, XXX, k46 }, \ - { k50, k51, k52, k53, k54, k55, k56 }, \ - { k60, k61, k62, k63, k64, k65, k66 }, \ - { k70, k71, k72, k73, k74, k75, XXX }, \ - { k80, k81, k82, k83, k84, k85, XXX }, \ - { XXX, XXX, XXX, k93, k94, k95, XXX } \ -} diff --git a/keyboards/blockey/info.json b/keyboards/blockey/info.json index 27aa9f62a1c4..044d1e9e1a48 100644 --- a/keyboards/blockey/info.json +++ b/keyboards/blockey/info.json @@ -20,7 +20,74 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"`", "x":0, "y":0}, {"label":"1", "x":1, "y":0}, {"label":"2", "x":2, "y":0}, {"label":"3", "x":3, "y":0}, {"label":"4", "x":4, "y":0}, {"label":"5", "x":5, "y":0}, {"label":"6", "x":6, "y":0}, {"label":"7", "x":7, "y":0}, {"label":"8", "x":8, "y":0}, {"label":"9", "x":9, "y":0}, {"label":"0", "x":10, "y":0}, {"label":"-", "x":11, "y":0}, {"label":"=", "x":12, "y":0}, {"label":"Back Space", "x":13, "y":0}, {"label":"Tab", "x":0.16, "y":1}, {"label":"Q", "x":1.16, "y":1}, {"label":"W", "x":2.16, "y":1}, {"label":"E", "x":3.16, "y":1}, {"label":"R", "x":4.16, "y":1}, {"label":"T", "x":5.16, "y":1}, {"label":"Y", "x":6.16, "y":1}, {"label":"U", "x":7.16, "y":1}, {"label":"I", "x":8.16, "y":1}, {"label":"O", "x":9.16, "y":1}, {"label":"P", "x":10.16, "y":1}, {"label":"[", "x":11.16, "y":1}, {"label":"]", "x":12.16, "y":1}, {"label":"\\", "x":13.16, "y":1}, {"label":"LCtrl", "x":0.33, "y":2}, {"label":"A", "x":1.33, "y":2}, {"label":"S", "x":2.33, "y":2}, {"label":"D", "x":3.33, "y":2}, {"label":"F", "x":4.33, "y":2}, {"label":"G", "x":5.33, "y":2}, {"label":"H", "x":6.33, "y":2}, {"label":"J", "x":7.33, "y":2}, {"label":"K", "x":8.33, "y":2}, {"label":"L", "x":9.33, "y":2}, {"label":";", "x":10.33, "y":2}, {"label":"\"", "x":11.33, "y":2}, {"label":"Enter", "x":12.66, "y":2}, {"label":"LShift", "x":0.5, "y":3}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":",", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"Up", "x":11.5, "y":3}, {"label":"Fn", "x":12.83, "y":3}, {"label":"Esc", "x":0, "y":4}, {"label":"Caps Lock", "x":1, "y":4}, {"label":"LAlt", "x":2, "y":4}, {"label":"LGUI", "x":3, "y":4}, {"label":"Space", "x":4, "y":4, "w":6}, {"label":"Left", "x":10.5, "y":4}, {"label":"Down", "x":11.5, "y":4}, {"label":"Right", "x":12.5, "y":4}] + "layout": [ + {"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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0.16, "y": 1}, + {"matrix": [1, 1], "x": 1.16, "y": 1}, + {"matrix": [1, 2], "x": 2.16, "y": 1}, + {"matrix": [1, 3], "x": 3.16, "y": 1}, + {"matrix": [1, 4], "x": 4.16, "y": 1}, + {"matrix": [1, 5], "x": 5.16, "y": 1}, + {"matrix": [1, 6], "x": 6.16, "y": 1}, + {"matrix": [6, 0], "x": 7.16, "y": 1}, + {"matrix": [6, 1], "x": 8.16, "y": 1}, + {"matrix": [6, 2], "x": 9.16, "y": 1}, + {"matrix": [6, 3], "x": 10.16, "y": 1}, + {"matrix": [6, 4], "x": 11.16, "y": 1}, + {"matrix": [6, 5], "x": 12.16, "y": 1}, + {"matrix": [6, 6], "x": 13.16, "y": 1}, + + {"matrix": [2, 0], "x": 0.33, "y": 2}, + {"matrix": [2, 1], "x": 1.33, "y": 2}, + {"matrix": [2, 2], "x": 2.33, "y": 2}, + {"matrix": [2, 3], "x": 3.33, "y": 2}, + {"matrix": [2, 4], "x": 4.33, "y": 2}, + {"matrix": [2, 5], "x": 5.33, "y": 2}, + {"matrix": [2, 6], "x": 6.33, "y": 2}, + {"matrix": [7, 0], "x": 7.33, "y": 2}, + {"matrix": [7, 1], "x": 8.33, "y": 2}, + {"matrix": [7, 2], "x": 9.33, "y": 2}, + {"matrix": [7, 3], "x": 10.33, "y": 2}, + {"matrix": [7, 4], "x": 11.33, "y": 2}, + {"matrix": [7, 5], "x": 12.66, "y": 2}, + + {"matrix": [3, 0], "x": 0.5, "y": 3}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [8, 0], "x": 7.5, "y": 3}, + {"matrix": [8, 1], "x": 8.5, "y": 3}, + {"matrix": [8, 2], "x": 9.5, "y": 3}, + {"matrix": [8, 3], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 5], "x": 12.83, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 6}, + {"matrix": [9, 3], "x": 10.5, "y": 4}, + {"matrix": [9, 4], "x": 11.5, "y": 4}, + {"matrix": [9, 5], "x": 12.5, "y": 4} + ] } } } diff --git a/keyboards/bop/bop.h b/keyboards/bop/bop.h deleted file mode 100644 index e4ae82529b52..000000000000 --- a/keyboards/bop/bop.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Brandon Lewis - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, K319, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, K419, \ - K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516, K517, K518, K519 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, K319 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, K419 }, \ - { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K514, K515, K516, K517, K518, K519 } \ -} diff --git a/keyboards/bop/info.json b/keyboards/bop/info.json index d892612a7f6c..48c3e31de856 100644 --- a/keyboards/bop/info.json +++ b/keyboards/bop/info.json @@ -18,131 +18,131 @@ "layouts": { "LAYOUT": { "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":16, "y":0}, - {"x":17, "y":0}, - {"x":18, "y":0}, - {"x":19, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + {"matrix": [0, 19], "x": 19, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, - {"x":17, "y":1}, - {"x":18, "y":1}, - {"x":19, "y":1}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, - {"x":17, "y":2}, - {"x":18, "y":2}, - {"x":19, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - {"x":15, "y":3}, - {"x":16, "y":3}, - {"x":17, "y":3}, - {"x":18, "y":3}, - {"x":19, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4}, - {"x":16, "y":4}, - {"x":17, "y":4}, - {"x":18, "y":4}, - {"x":19, "y":4}, - - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "y":5}, - {"x":4, "y":5}, - {"x":5, "y":5}, - {"x":6, "y":5}, - {"x":7, "y":5}, - {"x":8, "y":5}, - {"x":9, "y":5}, - {"x":10, "y":5}, - {"x":11, "y":5}, - {"x":12, "y":5}, - {"x":13, "y":5}, - {"x":14, "y":5}, - {"x":15, "y":5}, - {"x":16, "y":5}, - {"x":17, "y":5}, - {"x":18, "y":5}, - {"x":19, "y":5} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + {"matrix": [1, 19], "x": 19, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + {"matrix": [2, 18], "x": 18, "y": 2}, + {"matrix": [2, 19], "x": 19, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + {"matrix": [3, 18], "x": 18, "y": 3}, + {"matrix": [3, 19], "x": 19, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + {"matrix": [4, 18], "x": 18, "y": 4}, + {"matrix": [4, 19], "x": 19, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [5, 9], "x": 9, "y": 5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5}, + {"matrix": [5, 18], "x": 18, "y": 5}, + {"matrix": [5, 19], "x": 19, "y": 5} ] } } diff --git a/keyboards/box75/box75.h b/keyboards/box75/box75.h deleted file mode 100644 index 16ac3b226b3f..000000000000 --- a/keyboards/box75/box75.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2015 Á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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K3D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K59, K5A, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E}, \ - { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, ___, K5C, K5D, K5E} \ -} diff --git a/keyboards/box75/info.json b/keyboards/box75/info.json index 097366637ebd..35689400f7ca 100644 --- a/keyboards/box75/info.json +++ b/keyboards/box75/info.json @@ -18,95 +18,106 @@ "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.25, "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}, - {"x":14, "y":1.25}, - {"x":15.25, "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.25, "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.25, "y":3.25}, - - {"x":0, "y":4.25, "w":1.25}, - {"x":1.25, "y":4.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.125, "y":4.375}, - {"x":15.25, "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, "w":1.5}, - {"x":11.5, "y":5.25, "w":1.5}, - {"x":13.125, "y":5.375}, - {"x":14.125, "y":5.375}, - {"x":15.125, "y":5.375} + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.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}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + + {"matrix": [3, 13], "x": 15.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": [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": [3, 14], "x": 15.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": 1.75}, + + {"matrix": [4, 13], "x": 14.125, "y": 4.375}, + + {"matrix": [4, 14], "x": 15.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.5}, + {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 12], "x": 13.125, "y": 5.375}, + {"matrix": [5, 13], "x": 14.125, "y": 5.375}, + {"matrix": [5, 14], "x": 15.125, "y": 5.375} ] } } diff --git a/keyboards/bpiphany/hid_liber/hid_liber.h b/keyboards/bpiphany/hid_liber/hid_liber.h deleted file mode 100755 index 1e2ffe3c164b..000000000000 --- a/keyboards/bpiphany/hid_liber/hid_liber.h +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright 2011 Jun Wako : Original TMK layout - * Copyright 2018 bakageta - * - * 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 - -/* Tenkeyless keyboard default layout, ISO & ANSI (ISO is between Left Shift - * and Z, and the ANSI \ key above Return/Enter is used for the additional ISO - * switch in the ASD row next to enter. Use NUBS as keycode for the first and - * NUHS as the keycode for the second. - * - * ,---. ,---------------. ,---------------. ,---------------. ,-----------. - * |Esc| |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| - * `---' `---------------' `---------------' `---------------' `-----------' - * ,-----------------------------------------------------------. ,-----------. - * |~ | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =|Backsp | |Ins|Hom|PgU| - * |-----------------------------------------------------------| |-----------| - * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \| |Del|End|PgD| - * |-----------------------------------------------------------| `-----------' - * |Caps | A| S| D| F| G| H| J| K| L| ;| '|Return | - * |-----------------------------------------------------------| ,---. - * |Shft|ISO| Z| X| C| V| B| N| M| ,| .| /|Shift | |Up | - * |-----------------------------------------------------------| ,-----------. - * |Ctl|Gui|Alt| Space |Alt|Gui|App|Ctl| |Lef|Dow|Rig| - * `-----------------------------------------------------------' `-----------' - */ -#define LAYOUT( \ - KG1, KH7, KJ7, KJ6, KJ1, KO5, KL1, KA6, KA7, KD7, KD5, KD1, KD2, KB5, KB3, KO3, \ - KG7, KG5, KH5, KJ5, KI5, KI7, KK7, KK5, KL5, KA5, KC5, KC7, KL7, KD6, KQ7, KN7, KM7, \ - KG6, KG3, KH3, KJ3, KI3, KI6, KK6, KK3, KL3, KA3, KC3, KC6, KL6, KD4, KP7, KN5, KM5, \ - KH6, KG4, KH4, KJ4, KI4, KI1, KK1, KK4, KL4, KA4, KC4, KC1, KD0, \ - KF6, KH1, KG0, KH0, KJ0, KI0, KI2, KK2, KK0, KL0, KA0, KC2, KF4, KN1, \ - KO7, KE6, KB1, KP1, KB2, KR4, KA2, KO0, KN2, KP2, KQ2 \ -) { \ -/* 0 1 2 3 4 5 6 7 */ \ -/* A */ { KA0 , ___ , KA2 , KA3 , KA4 , KA5 , KA6 , KA7 }, \ -/* B */ { ___ , KB1 , KB2 , KB3 , ___ , KB5 , ___ , ___ }, \ -/* C */ { ___ , KC1 , KC2 , KC3 , KC4 , KC5 , KC6 , KC7 }, \ -/* D */ { KD0 , KD1 , KD2 , ___ , KD4 , KD5 , KD6 , KD7 }, \ -/* E */ { ___ , ___ , ___ , ___ , ___ , ___ , KE6 , ___ }, \ -/* F */ { ___ , ___ , ___ , ___ , KF4 , ___ , KF6 , ___ }, \ -/* G */ { KG0 , KG1 , ___ , KG3 , KG4 , KG5 , KG6 , KG7 }, \ -/* H */ { KH0 , KH1 , ___ , KH3 , KH4 , KH5 , KH6 , KH7 }, \ -/* I */ { KI0 , KI1 , KI2 , KI3 , KI4 , KI5 , KI6 , KI7 }, \ -/* J */ { KJ0 , KJ1 , ___ , KJ3 , KJ4 , KJ5 , KJ6 , KJ7 }, \ -/* K */ { KK0 , KK1 , KK2 , KK3 , KK4 , KK5 , KK6 , KK7 }, \ -/* L */ { KL0 , KL1 , ___ , KL3 , KL4 , KL5 , KL6 , KL7 }, \ -/* M */ { ___ , ___ , ___ , ___ , ___ , KM5 , ___ , KM7 }, \ -/* N */ { ___ , KN1 , KN2 , ___ , ___ , KN5 , ___ , KN7 }, \ -/* O */ { KO0 , ___ , ___ , KO3 , ___ , KO5 , ___ , KO7 }, \ -/* P */ { ___ , KP1 , KP2 , ___ , ___ , ___ , ___ , KP7 }, \ -/* Q */ { ___ , ___ , KQ2 , ___ , ___ , ___ , ___ , KQ7 }, \ -/* R */ { ___ , ___ , ___ , ___ , KR4 , ___ , ___ , ___ } \ -} diff --git a/keyboards/bpiphany/hid_liber/info.json b/keyboards/bpiphany/hid_liber/info.json index fb7ec97d196f..82fd77781a03 100644 --- a/keyboards/bpiphany/hid_liber/info.json +++ b/keyboards/bpiphany/hid_liber/info.json @@ -18,94 +18,107 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"KG1", "x":0, "y":0}, - {"label":"KH7", "x":2, "y":0}, - {"label":"KJ7", "x":3, "y":0}, - {"label":"KJ6", "x":4, "y":0}, - {"label":"KJ1", "x":5, "y":0}, - {"label":"KO5", "x":6.5, "y":0}, - {"label":"KL1", "x":7.5, "y":0}, - {"label":"KA6", "x":8.5, "y":0}, - {"label":"KA7", "x":9.5, "y":0}, - {"label":"KD7", "x":11, "y":0}, - {"label":"KD5", "x":12, "y":0}, - {"label":"KD1", "x":13, "y":0}, - {"label":"KD2", "x":14, "y":0}, - {"label":"KB5", "x":15.25, "y":0}, - {"label":"KB3", "x":16.25, "y":0}, - {"label":"KO3", "x":17.25, "y":0}, - {"label":"KG7", "x":0, "y":1.5}, - {"label":"KG5", "x":1, "y":1.5}, - {"label":"KH5", "x":2, "y":1.5}, - {"label":"KJ5", "x":3, "y":1.5}, - {"label":"KI5", "x":4, "y":1.5}, - {"label":"KI7", "x":5, "y":1.5}, - {"label":"KK7", "x":6, "y":1.5}, - {"label":"KK5", "x":7, "y":1.5}, - {"label":"KL5", "x":8, "y":1.5}, - {"label":"KA5", "x":9, "y":1.5}, - {"label":"KC5", "x":10, "y":1.5}, - {"label":"KC7", "x":11, "y":1.5}, - {"label":"KL7", "x":12, "y":1.5}, - {"label":"KD6", "x":13, "y":1.5, "w":2}, - {"label":"KQ7", "x":15.25, "y":1.5}, - {"label":"KN7", "x":16.25, "y":1.5}, - {"label":"KM7", "x":17.25, "y":1.5}, - {"label":"KG6", "x":0, "y":2.5, "w":1.5}, - {"label":"KG3", "x":1.5, "y":2.5}, - {"label":"KH3", "x":2.5, "y":2.5}, - {"label":"KJ3", "x":3.5, "y":2.5}, - {"label":"KI3", "x":4.5, "y":2.5}, - {"label":"KI6", "x":5.5, "y":2.5}, - {"label":"KK6", "x":6.5, "y":2.5}, - {"label":"KK3", "x":7.5, "y":2.5}, - {"label":"KL3", "x":8.5, "y":2.5}, - {"label":"KA3", "x":9.5, "y":2.5}, - {"label":"KC3", "x":10.5, "y":2.5}, - {"label":"KC6", "x":11.5, "y":2.5}, - {"label":"KL6", "x":12.5, "y":2.5}, - {"label":"KD4", "x":13.5, "y":2.5, "w":1.5}, - {"label":"KP7", "x":15.25, "y":2.5}, - {"label":"KN5", "x":16.25, "y":2.5}, - {"label":"KM5", "x":17.25, "y":2.5}, - {"label":"KH6", "x":0, "y":3.5, "w":1.75}, - {"label":"KG4", "x":1.75, "y":3.5}, - {"label":"KH4", "x":2.75, "y":3.5}, - {"label":"KJ4", "x":3.75, "y":3.5}, - {"label":"KI4", "x":4.75, "y":3.5}, - {"label":"KI1", "x":5.75, "y":3.5}, - {"label":"KK1", "x":6.75, "y":3.5}, - {"label":"KK4", "x":7.75, "y":3.5}, - {"label":"KL4", "x":8.75, "y":3.5}, - {"label":"KA4", "x":9.75, "y":3.5}, - {"label":"KC4", "x":10.75, "y":3.5}, - {"label":"KC1", "x":11.75, "y":3.5}, - {"label":"KD0", "x":12.75, "y":3.5, "w":2.25}, - {"label":"KF6", "x":0, "y":4.5, "w":1.25}, - {"label":"KH1", "x":1.25, "y":4.5}, - {"label":"KG0", "x":2.25, "y":4.5}, - {"label":"KH0", "x":3.25, "y":4.5}, - {"label":"KJ0", "x":4.25, "y":4.5}, - {"label":"KI0", "x":5.25, "y":4.5}, - {"label":"KI2", "x":6.25, "y":4.5}, - {"label":"KK2", "x":7.25, "y":4.5}, - {"label":"KK0", "x":8.25, "y":4.5}, - {"label":"KL0", "x":9.25, "y":4.5}, - {"label":"KA0", "x":10.25, "y":4.5}, - {"label":"KC2", "x":11.25, "y":4.5}, - {"label":"KF4", "x":12.25, "y":4.5, "w":2.75}, - {"label":"KN1", "x":16.25, "y":4.5}, - {"label":"KO7", "x":0, "y":5.5, "w":1.25}, - {"label":"KE6", "x":1.25, "y":5.5, "w":1.25}, - {"label":"KB1", "x":2.5, "y":5.5, "w":1.25}, - {"label":"KP1", "x":3.75, "y":5.5, "w":6.25}, - {"label":"KB2", "x":10, "y":5.5, "w":1.25}, - {"label":"KR4", "x":11.25, "y":5.5, "w":1.25}, - {"label":"KA2", "x":12.5, "y":5.5, "w":1.25}, - {"label":"KO0", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KN2", "x":15.25, "y":5.5}, - {"label":"KP2", "x":16.25, "y":5.5}, - {"label":"KQ2", "x":17.25, "y":5.5} + {"matrix": [6, 1], "x": 0, "y": 0}, + + {"matrix": [7, 7], "x": 2, "y": 0}, + {"matrix": [9, 7], "x": 3, "y": 0}, + {"matrix": [9, 6], "x": 4, "y": 0}, + {"matrix": [9, 1], "x": 5, "y": 0}, + + {"matrix": [14, 5], "x": 6.5, "y": 0}, + {"matrix": [11, 1], "x": 7.5, "y": 0}, + {"matrix": [0, 6], "x": 8.5, "y": 0}, + {"matrix": [0, 7], "x": 9.5, "y": 0}, + + {"matrix": [3, 7], "x": 11, "y": 0}, + {"matrix": [3, 5], "x": 12, "y": 0}, + {"matrix": [3, 1], "x": 13, "y": 0}, + {"matrix": [3, 2], "x": 14, "y": 0}, + + {"matrix": [1, 5], "x": 15.25, "y": 0}, + {"matrix": [1, 3], "x": 16.25, "y": 0}, + {"matrix": [14, 3], "x": 17.25, "y": 0}, + + {"matrix": [6, 7], "x": 0, "y": 1.5}, + {"matrix": [6, 5], "x": 1, "y": 1.5}, + {"matrix": [7, 5], "x": 2, "y": 1.5}, + {"matrix": [9, 5], "x": 3, "y": 1.5}, + {"matrix": [8, 5], "x": 4, "y": 1.5}, + {"matrix": [8, 7], "x": 5, "y": 1.5}, + {"matrix": [10, 7], "x": 6, "y": 1.5}, + {"matrix": [10, 5], "x": 7, "y": 1.5}, + {"matrix": [11, 5], "x": 8, "y": 1.5}, + {"matrix": [0, 5], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [2, 7], "x": 11, "y": 1.5}, + {"matrix": [11, 7], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [16, 7], "x": 15.25, "y": 1.5}, + {"matrix": [13, 7], "x": 16.25, "y": 1.5}, + {"matrix": [12, 7], "x": 17.25, "y": 1.5}, + + {"matrix": [6, 6], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [6, 3], "x": 1.5, "y": 2.5}, + {"matrix": [7, 3], "x": 2.5, "y": 2.5}, + {"matrix": [9, 3], "x": 3.5, "y": 2.5}, + {"matrix": [8, 3], "x": 4.5, "y": 2.5}, + {"matrix": [8, 6], "x": 5.5, "y": 2.5}, + {"matrix": [10, 6], "x": 6.5, "y": 2.5}, + {"matrix": [10, 3], "x": 7.5, "y": 2.5}, + {"matrix": [11, 3], "x": 8.5, "y": 2.5}, + {"matrix": [0, 3], "x": 9.5, "y": 2.5}, + {"matrix": [2, 3], "x": 10.5, "y": 2.5}, + {"matrix": [2, 6], "x": 11.5, "y": 2.5}, + {"matrix": [11, 6], "x": 12.5, "y": 2.5}, + {"matrix": [3, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [15, 7], "x": 15.25, "y": 2.5}, + {"matrix": [13, 5], "x": 16.25, "y": 2.5}, + {"matrix": [12, 5], "x": 17.25, "y": 2.5}, + + {"matrix": [7, 6], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [6, 4], "x": 1.75, "y": 3.5}, + {"matrix": [7, 4], "x": 2.75, "y": 3.5}, + {"matrix": [9, 4], "x": 3.75, "y": 3.5}, + {"matrix": [8, 4], "x": 4.75, "y": 3.5}, + {"matrix": [8, 1], "x": 5.75, "y": 3.5}, + {"matrix": [10, 1], "x": 6.75, "y": 3.5}, + {"matrix": [10, 4], "x": 7.75, "y": 3.5}, + {"matrix": [11, 4], "x": 8.75, "y": 3.5}, + {"matrix": [0, 4], "x": 9.75, "y": 3.5}, + {"matrix": [2, 4], "x": 10.75, "y": 3.5}, + {"matrix": [2, 1], "x": 11.75, "y": 3.5}, + {"matrix": [3, 0], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [5, 6], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [7, 1], "x": 1.25, "y": 4.5}, + {"matrix": [6, 0], "x": 2.25, "y": 4.5}, + {"matrix": [7, 0], "x": 3.25, "y": 4.5}, + {"matrix": [9, 0], "x": 4.25, "y": 4.5}, + {"matrix": [8, 0], "x": 5.25, "y": 4.5}, + {"matrix": [8, 2], "x": 6.25, "y": 4.5}, + {"matrix": [10, 2], "x": 7.25, "y": 4.5}, + {"matrix": [10, 0], "x": 8.25, "y": 4.5}, + {"matrix": [11, 0], "x": 9.25, "y": 4.5}, + {"matrix": [0, 0], "x": 10.25, "y": 4.5}, + {"matrix": [2, 2], "x": 11.25, "y": 4.5}, + {"matrix": [5, 4], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [13, 1], "x": 16.25, "y": 4.5}, + + {"matrix": [14, 7], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [4, 6], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [1, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [15, 1], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [1, 2], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [17, 4], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [0, 2], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [14, 0], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [13, 2], "x": 15.25, "y": 5.5}, + {"matrix": [15, 2], "x": 16.25, "y": 5.5}, + {"matrix": [16, 2], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/bubble75/hotswap/hotswap.c b/keyboards/bubble75/hotswap/hotswap.c index 97ca40446c1f..30c908a79f05 100644 --- a/keyboards/bubble75/hotswap/hotswap.c +++ b/keyboards/bubble75/hotswap/hotswap.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "hotswap.h" +#include "quantum.h" + #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/bubble75/hotswap/hotswap.h b/keyboards/bubble75/hotswap/hotswap.h deleted file mode 100644 index 9914ea651b8a..000000000000 --- a/keyboards/bubble75/hotswap/hotswap.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 Velocifire - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \ - K500, K501, K502, K505, K508, K509, K511, K513, K514 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, K508, K509, KC_NO, K511, KC_NO, K513, K514 } \ -} diff --git a/keyboards/bubble75/hotswap/info.json b/keyboards/bubble75/hotswap/info.json index fd913dfecff0..f57e41df460c 100644 --- a/keyboards/bubble75/hotswap/info.json +++ b/keyboards/bubble75/hotswap/info.json @@ -23,87 +23,98 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0}, - {"x":15, "y":0}, - {"x":0, "y":1.5}, - {"x":1, "y":1.5}, - {"x":2, "y":1.5}, - {"x":3, "y":1.5}, - {"x":4, "y":1.5}, - {"x":5, "y":1.5}, - {"x":6, "y":1.5}, - {"x":7, "y":1.5}, - {"x":8, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.5}, - {"x":11, "y":1.5}, - {"x":12, "y":1.5}, - {"x":13, "y":1.5, "w":2}, - {"x":15, "y":1.5}, - {"x":0, "y":2.5, "w":1.5}, - {"x":1.5, "y":2.5}, - {"x":2.5, "y":2.5}, - {"x":3.5, "y":2.5}, - {"x":4.5, "y":2.5}, - {"x":5.5, "y":2.5}, - {"x":6.5, "y":2.5}, - {"x":7.5, "y":2.5}, - {"x":8.5, "y":2.5}, - {"x":9.5, "y":2.5}, - {"x":10.5, "y":2.5}, - {"x":11.5, "y":2.5}, - {"x":12.5, "y":2.5}, - {"x":13.5, "y":2.5, "w":1.5}, - {"x":15, "y":2.5}, - {"x":0, "y":3.5, "w":1.75}, - {"x":1.75, "y":3.5}, - {"x":2.75, "y":3.5}, - {"x":3.75, "y":3.5}, - {"x":4.75, "y":3.5}, - {"x":5.75, "y":3.5}, - {"x":6.75, "y":3.5}, - {"x":7.75, "y":3.5}, - {"x":8.75, "y":3.5}, - {"x":9.75, "y":3.5}, - {"x":10.75, "y":3.5}, - {"x":11.75, "y":3.5}, - {"x":12.75, "y":3.5, "w":2.25}, - {"x":15, "y":3.5}, - {"x":0, "y":4.5, "w":2.25}, - {"x":2.25, "y":4.5}, - {"x":3.25, "y":4.5}, - {"x":4.25, "y":4.5}, - {"x":5.25, "y":4.5}, - {"x":6.25, "y":4.5}, - {"x":7.25, "y":4.5}, - {"x":8.25, "y":4.5}, - {"x":9.25, "y":4.5}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.5}, - {"x":12.25, "y":4.5, "w":1.75}, - {"x":14, "y":4.5}, - {"x":15, "y":4.5}, - {"x":0, "y":5.5, "w":1.25}, - {"x":1.25, "y":5.5, "w":1.25}, - {"x":2.5, "y":5.5, "w":1.25}, - {"x":3.75, "y":5.5, "w":6.25}, - {"x":10, "y":5.5, "w":1.25}, - {"x":11.25, "y":5.5, "w":1.25}, - {"x":13, "y":5.5}, - {"x":14, "y":5.5}, - {"x":15, "y":5.5}] + "layout": [ + {"label": "K000", "matrix": [0, 0], "x": 0, "y": 0}, + + {"label": "K001", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "K002", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "K003", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "K004", "matrix": [0, 4], "x": 4.5, "y": 0}, + + {"label": "K005", "matrix": [0, 5], "x": 6, "y": 0}, + {"label": "K006", "matrix": [0, 6], "x": 7, "y": 0}, + {"label": "K007", "matrix": [0, 7], "x": 8, "y": 0}, + {"label": "K008", "matrix": [0, 8], "x": 9, "y": 0}, + + {"label": "K009", "matrix": [0, 9], "x": 10.5, "y": 0}, + {"label": "K010", "matrix": [0, 10], "x": 11.5, "y": 0}, + {"label": "K011", "matrix": [0, 11], "x": 12.5, "y": 0}, + {"label": "K012", "matrix": [0, 12], "x": 13.5, "y": 0}, + + {"label": "K014", "matrix": [0, 14], "x": 15, "y": 0}, + + {"label": "K100", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "K101", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "K102", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "K103", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "K104", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "K105", "matrix": [1, 5], "x": 5, "y": 1.5}, + {"label": "K106", "matrix": [1, 6], "x": 6, "y": 1.5}, + {"label": "K107", "matrix": [1, 7], "x": 7, "y": 1.5}, + {"label": "K108", "matrix": [1, 8], "x": 8, "y": 1.5}, + {"label": "K109", "matrix": [1, 9], "x": 9, "y": 1.5}, + {"label": "K110", "matrix": [1, 10], "x": 10, "y": 1.5}, + {"label": "K111", "matrix": [1, 11], "x": 11, "y": 1.5}, + {"label": "K112", "matrix": [1, 12], "x": 12, "y": 1.5}, + {"label": "K113", "matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"label": "K114", "matrix": [1, 14], "x": 15, "y": 1.5}, + + {"label": "K200", "matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"label": "K201", "matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"label": "K202", "matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"label": "K203", "matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"label": "K204", "matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"label": "K205", "matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"label": "K206", "matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"label": "K207", "matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"label": "K208", "matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"label": "K209", "matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"label": "K210", "matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"label": "K211", "matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"label": "K212", "matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"label": "K213", "matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"label": "K214", "matrix": [2, 14], "x": 15, "y": 2.5}, + + {"label": "K300", "matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"label": "K301", "matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"label": "K302", "matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"label": "K303", "matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"label": "K304", "matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"label": "K305", "matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"label": "K306", "matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"label": "K307", "matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"label": "K308", "matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"label": "K309", "matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"label": "K310", "matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"label": "K311", "matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"label": "K312", "matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + {"label": "K314", "matrix": [3, 14], "x": 15, "y": 3.5}, + + {"label": "K400", "matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"label": "K401", "matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"label": "K402", "matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"label": "K403", "matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"label": "K404", "matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"label": "K405", "matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"label": "K406", "matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"label": "K407", "matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"label": "K408", "matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"label": "K409", "matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"label": "K410", "matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"label": "K411", "matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75}, + {"label": "K413", "matrix": [4, 13], "x": 14, "y": 4.5}, + {"label": "K414", "matrix": [4, 14], "x": 15, "y": 4.5}, + + {"label": "K500", "matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"label": "K501", "matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"label": "K502", "matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"label": "K505", "matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"label": "K508", "matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25}, + {"label": "K509", "matrix": [5, 9], "x": 11.25, "y": 5.5, "w": 1.25}, + {"label": "K511", "matrix": [5, 11], "x": 13, "y": 5.5}, + {"label": "K513", "matrix": [5, 13], "x": 14, "y": 5.5}, + {"label": "K514", "matrix": [5, 14], "x": 15, "y": 5.5} + ] } } } diff --git a/keyboards/canary/canary60rgb/canary60rgb.c b/keyboards/canary/canary60rgb/canary60rgb.c index 00e929e952aa..c47abf57fd57 100644 --- a/keyboards/canary/canary60rgb/canary60rgb.c +++ b/keyboards/canary/canary60rgb/canary60rgb.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "canary60rgb.h" + #include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/canary/canary60rgb/canary60rgb.h b/keyboards/canary/canary60rgb/canary60rgb.h deleted file mode 100644 index 59c677c5de49..000000000000 --- a/keyboards/canary/canary60rgb/canary60rgb.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 CANARYTEAM - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K45, K48, K49, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D } \ -} diff --git a/keyboards/canary/canary60rgb/info.json b/keyboards/canary/canary60rgb/info.json index 20ce131329c8..1d3b2d693bc5 100644 --- a/keyboards/canary/canary60rgb/info.json +++ b/keyboards/canary/canary60rgb/info.json @@ -24,73 +24,73 @@ "layouts": { "LAYOUT": { "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, "w":2}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2.25}, - {"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, "w":1.75}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 11], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "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}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/cannonkeys/crin/crin.h b/keyboards/cannonkeys/crin/crin.h deleted file mode 100644 index 4865b315b309..000000000000 --- a/keyboards/cannonkeys/crin/crin.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 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 ____ KC_NO - -#define LAYOUT( \ - K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, \ - K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, K116, K117, K118, \ - K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K315, K317, \ - K401, K402, K403, K406, K411, K412, K413, K415, K416, K417, K418 \ -) { \ - { K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, ____, K115, K116, K117, K118 }, \ - { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215, ____, ____, ____ }, \ - { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K315, ____, K317, ____ }, \ - { K401, K402, K403, ____, ____, K406, ____, ____, ____, ____, K411, K412, K413, ____, K415, K416, K417, K418 } \ -} diff --git a/keyboards/cannonkeys/crin/info.json b/keyboards/cannonkeys/crin/info.json index 0fa01b54a25d..37283d8419c2 100644 --- a/keyboards/cannonkeys/crin/info.json +++ b/keyboards/cannonkeys/crin/info.json @@ -29,7 +29,91 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Bksp", "x":13, "y":0}, {"label":"~", "x":14, "y":0}, {"label":"Insert", "x":15.25, "y":0}, {"label":"Home", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15.25, "y":1}, {"label":"End", "x":16.25, "y":1}, {"label":"PgDn", "x":17.25, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"|", "x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Fn", "x":14, "y":3}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [3, 16], "x": 16.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.25, "y": 4}, + {"matrix": [4, 16], "x": 16.25, "y": 4}, + {"matrix": [4, 17], "x": 17.25, "y": 4} + ] } } } diff --git a/keyboards/chocofly/v1/info.json b/keyboards/chocofly/v1/info.json index e7578ae942fe..f811a6b14b2b 100644 --- a/keyboards/chocofly/v1/info.json +++ b/keyboards/chocofly/v1/info.json @@ -23,71 +23,79 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "F1", "matrix": [0, 0], "x": 0, "y": 0.375 }, - { "label": "F2", "matrix": [1, 0], "x": 1, "y": 0.375 }, - { "label": "F3", "matrix": [0, 1], "x": 2, "y": 0.125 }, - { "label": "F4", "matrix": [1, 1], "x": 3, "y": 0 }, - { "label": "F5", "matrix": [0, 2], "x": 4, "y": 0.125 }, - { "label": "F6", "matrix": [1, 2], "x": 5, "y": 0.25 }, - { "label": "F7", "matrix": [1, 5], "x": 11.5, "y": 0.25 }, - { "label": "F8", "matrix": [0, 5], "x": 12.5, "y": 0.125 }, - { "label": "F9", "matrix": [1, 6], "x": 13.5, "y": 0 }, - { "label": "F10", "matrix": [0, 6], "x": 14.5, "y": 0.125 }, - { "label": "F11", "matrix": [1, 7], "x": 15.5, "y": 0.375 }, - { "label": "F12", "matrix": [0, 7], "x": 16.5, "y": 0.375 }, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [1, 0], "x": 1, "y": 0.375}, + {"matrix": [0, 1], "x": 2, "y": 0.125}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0.125}, + {"matrix": [1, 2], "x": 5, "y": 0.25}, - { "label": "Tab", "matrix": [2, 0], "x": 0, "y": 1.375 }, - { "label": "Q", "matrix": [3, 0], "x": 1, "y": 1.375 }, - { "label": "W", "matrix": [2, 1], "x": 2, "y": 1.125 }, - { "label": "E", "matrix": [3, 1], "x": 3, "y": 1 }, - { "label": "R", "matrix": [2, 2], "x": 4, "y": 1.125 }, - { "label": "T", "matrix": [3, 2], "x": 5, "y": 1.25 }, - { "label": "Y", "matrix": [3, 5], "x": 11.5, "y": 1.25 }, - { "label": "U", "matrix": [2, 5], "x": 12.5, "y": 1.125 }, - { "label": "I", "matrix": [3, 6], "x": 13.5, "y": 1 }, - { "label": "O", "matrix": [2, 6], "x": 14.5, "y": 1.125 }, - { "label": "P", "matrix": [3, 7], "x": 15.5, "y": 1.375 }, - { "label": "[{", "matrix": [2, 7], "x": 16.5, "y": 1.375 }, + {"matrix": [1, 5], "x": 11.5, "y": 0.25}, + {"matrix": [0, 5], "x": 12.5, "y": 0.125}, + {"matrix": [1, 6], "x": 13.5, "y": 0}, + {"matrix": [0, 6], "x": 14.5, "y": 0.125}, + {"matrix": [1, 7], "x": 15.5, "y": 0.375}, + {"matrix": [0, 7], "x": 16.5, "y": 0.375}, - { "label": "\\|", "matrix": [4, 0], "x": 0, "y": 2.375 }, - { "label": "A", "matrix": [5, 0], "x": 1, "y": 2.375 }, - { "label": "S", "matrix": [4, 1], "x": 2, "y": 2.125 }, - { "label": "D", "matrix": [5, 1], "x": 3, "y": 2 }, - { "label": "F", "matrix": [4, 2], "x": 4, "y": 2.125 }, - { "label": "G", "matrix": [5, 2], "x": 5, "y": 2.25 }, - { "label": "Mute", "matrix": [1, 3], "x": 6.5, "y": 2.375 }, - { "label": "H", "matrix": [5, 5], "x": 11.5, "y": 2.25 }, - { "label": "J", "matrix": [4, 5], "x": 12.5, "y": 2.125 }, - { "label": "K", "matrix": [5, 6], "x": 13.5, "y": 2 }, - { "label": "L", "matrix": [4, 6], "x": 14.5, "y": 2.125 }, - { "label": ";:", "matrix": [5, 7], "x": 15.5, "y": 2.375 }, - { "label": "'\"", "matrix": [4, 7], "x": 16.5, "y": 2.375 }, + {"matrix": [2, 0], "x": 0, "y": 1.375}, + {"matrix": [3, 0], "x": 1, "y": 1.375}, + {"matrix": [2, 1], "x": 2, "y": 1.125}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [2, 2], "x": 4, "y": 1.125}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, - { "label": "Ctrl", "matrix": [6, 0], "x": 0, "y": 3.375 }, - { "label": "Z", "matrix": [7, 0], "x": 1, "y": 3.375 }, - { "label": "X", "matrix": [6, 1], "x": 2, "y": 3.125 }, - { "label": "C", "matrix": [7, 1], "x": 3, "y": 3 }, - { "label": "V", "matrix": [6, 2], "x": 4, "y": 3.125 }, - { "label": "B", "matrix": [7, 2], "x": 5, "y": 3.25 }, - { "label": "`~", "matrix": [3, 3], "x": 6.25, "y": 3.375 }, - { "label": "Insert", "matrix": [2, 3], "x": 7.25, "y": 3.625 }, - { "label": "Print Screen", "matrix": [2, 4], "x": 9.25, "y": 3.625 }, - { "label": "]}", "matrix": [3, 4], "x": 10.25, "y": 3.375 }, - { "label": "N", "matrix": [7, 5], "x": 11.5, "y": 3.25 }, - { "label": "M", "matrix": [6, 5], "x": 12.5, "y": 3.125 }, - { "label": ",<", "matrix": [7, 6], "x": 13.5, "y": 3 }, - { "label": ".>", "matrix": [6, 6], "x": 14.5, "y": 3.125 }, - { "label": "/?", "matrix": [7, 7], "x": 15.5, "y": 3.375 }, - { "label": "Ctrl", "matrix": [6, 7], "x": 16.5, "y": 3.375 }, + {"matrix": [3, 5], "x": 11.5, "y": 1.25}, + {"matrix": [2, 5], "x": 12.5, "y": 1.125}, + {"matrix": [3, 6], "x": 13.5, "y": 1}, + {"matrix": [2, 6], "x": 14.5, "y": 1.125}, + {"matrix": [3, 7], "x": 15.5, "y": 1.375}, + {"matrix": [2, 7], "x": 16.5, "y": 1.375}, - { "label": "GUI", "matrix": [7, 3], "x": 3.5, "y": 4.125 }, - { "label": "Shift", "matrix": [6, 3], "x": 4.75, "y": 4.25 }, - { "label": "Space", "matrix": [5, 3], "x": 6, "y": 4.375 }, - { "label": "Alt", "matrix": [4, 3], "x": 7, "y": 4.625 }, - { "label": "Alt", "matrix": [4, 4], "x": 9.5, "y": 4.625 }, - { "label": "Fn", "matrix": [5, 4], "x": 10.5, "y": 4.375 }, - { "label": "Shift", "matrix": [6, 4], "x": 11.75, "y": 4.25 }, - { "label": "GUI", "matrix": [7, 4], "x": 13, "y": 4.125 } + {"matrix": [4, 0], "x": 0, "y": 2.375}, + {"matrix": [5, 0], "x": 1, "y": 2.375}, + {"matrix": [4, 1], "x": 2, "y": 2.125}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [4, 2], "x": 4, "y": 2.125}, + {"matrix": [5, 2], "x": 5, "y": 2.25}, + + {"matrix": [1, 3], "x": 6.5, "y": 2.375}, + + {"matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 5], "x": 12.5, "y": 2.125}, + {"matrix": [5, 6], "x": 13.5, "y": 2}, + {"matrix": [4, 6], "x": 14.5, "y": 2.125}, + {"matrix": [5, 7], "x": 15.5, "y": 2.375}, + {"matrix": [4, 7], "x": 16.5, "y": 2.375}, + + {"matrix": [6, 0], "x": 0, "y": 3.375}, + {"matrix": [7, 0], "x": 1, "y": 3.375}, + {"matrix": [6, 1], "x": 2, "y": 3.125}, + {"matrix": [7, 1], "x": 3, "y": 3}, + {"matrix": [6, 2], "x": 4, "y": 3.125}, + {"matrix": [7, 2], "x": 5, "y": 3.25}, + + {"matrix": [3, 3], "x": 6.25, "y": 3.375}, + {"matrix": [2, 3], "x": 7.25, "y": 3.625}, + + {"matrix": [2, 4], "x": 9.25, "y": 3.625}, + {"matrix": [3, 4], "x": 10.25, "y": 3.375}, + + {"matrix": [7, 5], "x": 11.5, "y": 3.25}, + {"matrix": [6, 5], "x": 12.5, "y": 3.125}, + {"matrix": [7, 6], "x": 13.5, "y": 3}, + {"matrix": [6, 6], "x": 14.5, "y": 3.125}, + {"matrix": [7, 7], "x": 15.5, "y": 3.375}, + {"matrix": [6, 7], "x": 16.5, "y": 3.375}, + + {"matrix": [7, 3], "x": 3.5, "y": 4.125}, + {"matrix": [6, 3], "x": 4.75, "y": 4.25}, + {"matrix": [5, 3], "x": 6, "y": 4.375}, + {"matrix": [4, 3], "x": 7, "y": 4.625}, + + {"matrix": [4, 4], "x": 9.5, "y": 4.625}, + {"matrix": [5, 4], "x": 10.5, "y": 4.375}, + {"matrix": [6, 4], "x": 11.75, "y": 4.25}, + {"matrix": [7, 4], "x": 13, "y": 4.125} ] } } diff --git a/keyboards/chocofly/v1/v1.h b/keyboards/chocofly/v1/v1.h deleted file mode 100644 index bf3c93f8be2d..000000000000 --- a/keyboards/chocofly/v1/v1.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2022 Vitaly Volkov (@vlkv) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define K__ KC_NO - -#define LAYOUT( \ - K01, K07, K02, K08, K03, K09, K11, K04, K12, K05, K13, K06, \ - K14, K22, K15, K23, K16, K24, K27, K19, K28, K20, K29, K21, \ - K30, K38, K31, K39, K32, K40, K10, K43, K35, K44, K36, K45, K37, \ - K46, K54, K47, K55, K48, K56, K25, K17, K18, K26, K59, K51, K60, K52, K61, K53, \ - K57, K49, K41, K33, K34, K42, K50, K58 \ -) \ -{ \ - { K01, K02, K03, K__, K__, K04, K05, K06}, \ - { K07, K08, K09, K10, K__, K11, K12, K13}, \ - { K14, K15, K16, K17, K18, K19, K20, K21}, \ - { K22, K23, K24, K25, K26, K27, K28, K29}, \ - { K30, K31, K32, K33, K34, K35, K36, K37}, \ - { K38, K39, K40, K41, K42, K43, K44, K45}, \ - { K46, K47, K48, K49, K50, K51, K52, K53}, \ - { K54, K55, K56, K57, K58, K59, K60, K61} \ -} diff --git a/keyboards/chromatonemini/chromatonemini.h b/keyboards/chromatonemini/chromatonemini.h index d42ee500ce8d..50e563e45202 100644 --- a/keyboards/chromatonemini/chromatonemini.h +++ b/keyboards/chromatonemini/chromatonemini.h @@ -18,29 +18,6 @@ #include "quantum.h" -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - enc, sustain, \ - up, \ - left, right, k01, k03, k05, k07, k09, k11, k13, k15, k17, k19, k21, k23, k25, k27, k29, k31, k33, k35, k37, \ - down, k02, k04, k06, k08, k10, k12, k14, k16, k18, k20, k22, k24, k26, k28, k30, k32, k34, k36 \ -) { \ - { enc, down, left, right, up, k01, k02, sustain }, \ - { k03, k04, k05, k06, k07, k08, k09, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, KC_NO }, \ - { k17, k18, k19, k20, k21, k22, k23, KC_NO }, \ - { k24, k25, k26, k27, k28, k29, k30, KC_NO }, \ - { k31, k32, k33, k34, k35, k36, k37, KC_NO } \ -} - - #ifdef RGB_MATRIX_ENABLE extern led_config_t g_led_config; extern const uint8_t led_scale_indicator[12][12]; diff --git a/keyboards/chromatonemini/info.json b/keyboards/chromatonemini/info.json index e81e52e6c0b5..cb36157afeea 100644 --- a/keyboards/chromatonemini/info.json +++ b/keyboards/chromatonemini/info.json @@ -33,52 +33,58 @@ "pid": "0xF4B4", "device_version": "0.0.1" }, - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"enc", "x":0.5, "y":0}, - {"label":"sustain", "x":1.5, "y":0}, - {"label":"up", "x":0.5, "y":1.5}, - {"label":"left", "x":0, "y":2.5}, - {"label":"right", "x":1, "y":2.5}, - {"label":"k01", "x":2.5, "y":2.5}, - {"label":"k03", "x":3.5, "y":2.5}, - {"label":"k05", "x":4.5, "y":2.5}, - {"label":"k07", "x":5.5, "y":2.5}, - {"label":"k09", "x":6.5, "y":2.5}, - {"label":"k11", "x":7.5, "y":2.5}, - {"label":"k13", "x":8.5, "y":2.5}, - {"label":"k15", "x":9.5, "y":2.5}, - {"label":"k17", "x":10.5, "y":2.5}, - {"label":"k19", "x":11.5, "y":2.5}, - {"label":"k21", "x":12.5, "y":2.5}, - {"label":"k23", "x":13.5, "y":2.5}, - {"label":"k25", "x":14.5, "y":2.5}, - {"label":"k27", "x":15.5, "y":2.5}, - {"label":"k29", "x":16.5, "y":2.5}, - {"label":"k31", "x":17.5, "y":2.5}, - {"label":"k33", "x":18.5, "y":2.5}, - {"label":"k35", "x":19.5, "y":2.5}, - {"label":"k37", "x":20.5, "y":2.5}, - {"label":"down", "x":0.5, "y":3.5}, - {"label":"k02", "x":3, "y":3.5}, - {"label":"k04", "x":4, "y":3.5}, - {"label":"k06", "x":5, "y":3.5}, - {"label":"k08", "x":6, "y":3.5}, - {"label":"k10", "x":7, "y":3.5}, - {"label":"k12", "x":8, "y":3.5}, - {"label":"k14", "x":9, "y":3.5}, - {"label":"k16", "x":10, "y":3.5}, - {"label":"k18", "x":11, "y":3.5}, - {"label":"k20", "x":12, "y":3.5}, - {"label":"k22", "x":13, "y":3.5}, - {"label":"k24", "x":14, "y":3.5}, - {"label":"k26", "x":15, "y":3.5}, - {"label":"k28", "x":16, "y":3.5}, - {"label":"k30", "x":17, "y":3.5}, - {"label":"k32", "x":18, "y":3.5}, - {"label":"k34", "x":19, "y":3.5}, - {"label":"k36", "x":20, "y":3.5}] + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 7], "x": 1.5, "y": 0}, + + {"matrix": [0, 4], "x": 0.5, "y": 1.5}, + + {"matrix": [0, 2], "x": 0, "y": 2.5}, + {"matrix": [0, 3], "x": 1, "y": 2.5}, + + {"matrix": [0, 5], "x": 2.5, "y": 2.5}, + {"matrix": [1, 0], "x": 3.5, "y": 2.5}, + {"matrix": [1, 2], "x": 4.5, "y": 2.5}, + {"matrix": [1, 4], "x": 5.5, "y": 2.5}, + {"matrix": [1, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 1], "x": 7.5, "y": 2.5}, + {"matrix": [2, 3], "x": 8.5, "y": 2.5}, + {"matrix": [2, 5], "x": 9.5, "y": 2.5}, + {"matrix": [3, 0], "x": 10.5, "y": 2.5}, + {"matrix": [3, 2], "x": 11.5, "y": 2.5}, + {"matrix": [3, 4], "x": 12.5, "y": 2.5}, + {"matrix": [3, 6], "x": 13.5, "y": 2.5}, + {"matrix": [4, 1], "x": 14.5, "y": 2.5}, + {"matrix": [4, 3], "x": 15.5, "y": 2.5}, + {"matrix": [4, 5], "x": 16.5, "y": 2.5}, + {"matrix": [5, 0], "x": 17.5, "y": 2.5}, + {"matrix": [5, 2], "x": 18.5, "y": 2.5}, + {"matrix": [5, 4], "x": 19.5, "y": 2.5}, + {"matrix": [5, 6], "x": 20.5, "y": 2.5}, + + {"matrix": [0, 1], "x": 0.5, "y": 3.5}, + + {"matrix": [0, 6], "x": 3, "y": 3.5}, + {"matrix": [1, 1], "x": 4, "y": 3.5}, + {"matrix": [1, 3], "x": 5, "y": 3.5}, + {"matrix": [1, 5], "x": 6, "y": 3.5}, + {"matrix": [2, 0], "x": 7, "y": 3.5}, + {"matrix": [2, 2], "x": 8, "y": 3.5}, + {"matrix": [2, 4], "x": 9, "y": 3.5}, + {"matrix": [2, 6], "x": 10, "y": 3.5}, + {"matrix": [3, 1], "x": 11, "y": 3.5}, + {"matrix": [3, 3], "x": 12, "y": 3.5}, + {"matrix": [3, 5], "x": 13, "y": 3.5}, + {"matrix": [4, 0], "x": 14, "y": 3.5}, + {"matrix": [4, 2], "x": 15, "y": 3.5}, + {"matrix": [4, 4], "x": 16, "y": 3.5}, + {"matrix": [4, 6], "x": 17, "y": 3.5}, + {"matrix": [5, 1], "x": 18, "y": 3.5}, + {"matrix": [5, 3], "x": 19, "y": 3.5}, + {"matrix": [5, 5], "x": 20, "y": 3.5} + ] } }, "encoder": { diff --git a/keyboards/ck60i/ck60i.c b/keyboards/ck60i/ck60i.c deleted file mode 100644 index b102aad40c62..000000000000 --- a/keyboards/ck60i/ck60i.c +++ /dev/null @@ -1,18 +0,0 @@ -/* -Copyright 2020 Á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 . -*/ - -#include "ck60i.h" diff --git a/keyboards/ck60i/ck60i.h b/keyboards/ck60i/ck60i.h deleted file mode 100644 index 5718fc3ecb75..000000000000 --- a/keyboards/ck60i/ck60i.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2015 Á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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ - { K40, K41, K42, ___, ___, ___, K46, ___, ___, K49, K4A, K4B, K4C, K4D} \ -} diff --git a/keyboards/ck60i/info.json b/keyboards/ck60i/info.json index e48f22ab494e..ac385efed3f6 100644 --- a/keyboards/ck60i/info.json +++ b/keyboards/ck60i/info.json @@ -31,75 +31,75 @@ "layouts": { "LAYOUT": { "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, "w":2}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, - {"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}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "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}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/clawsome/hatchback/hatchback.h b/keyboards/clawsome/hatchback/hatchback.h deleted file mode 100644 index b55f6adc2802..000000000000 --- a/keyboards/clawsome/hatchback/hatchback.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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" - -// clang-format off -#define LAYOUT( \ - K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K18, K09, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K38, K29, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K58, K49, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K96, K98, \ - KA0, KB0, KA1, KA2, KA3, KA4, KA5, KB5, KA6, KB6, KA7, KB8, KA9 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, KC_NO, K09 }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, KC_NO, K18, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, KC_NO, K29 }, \ - { K30, K31, K32, K33, K34, K35, K36, KC_NO, K38, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, KC_NO, K49 }, \ - { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, KC_NO, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K90, K91, K92, K93, K94, KC_NO, K96, KC_NO, K98, KC_NO }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KC_NO, KA9 }, \ - { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KC_NO, KB8, KC_NO }, \ -} -// clang-format on diff --git a/keyboards/clawsome/hatchback/info.json b/keyboards/clawsome/hatchback/info.json index 79af5d5279c8..90d1ad6ee251 100644 --- a/keyboards/clawsome/hatchback/info.json +++ b/keyboards/clawsome/hatchback/info.json @@ -18,95 +18,108 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0,F4)", "x":0, "y":0}, - {"label":"K01 (B0,F5)", "x":2, "y":0}, - {"label":"K11 (B6,F5)", "x":3, "y":0}, - {"label":"K02 (B0,F6)", "x":4, "y":0}, - {"label":"K12 (B6,F6)", "x":5, "y":0}, - {"label":"K03 (B0,F7)", "x":6.5, "y":0}, - {"label":"K13 (B6,F7)", "x":7.5, "y":0}, - {"label":"K04 (B0,B1)", "x":8.5, "y":0}, - {"label":"K14 (B6,B1)", "x":9.5, "y":0}, - {"label":"K05 (B0,B3)", "x":11, "y":0}, - {"label":"K15 (B6,B3)", "x":12, "y":0}, - {"label":"K06 (B0,B2)", "x":13, "y":0}, - {"label":"K16 (B6,B2)", "x":14, "y":0}, - {"label":"K07 (B0,D5)", "x":15.25, "y":0}, - {"label":"K18 (B6,C7)", "x":16.25, "y":0}, - {"label":"K09 (B0,F1)", "x":17.25, "y":0}, - {"label":"K20 (D4,F4)", "x":0, "y":1.5}, - {"label":"K30 (B4,F4)", "x":1, "y":1.5}, - {"label":"K21 (D4,F5)", "x":2, "y":1.5}, - {"label":"K31 (B4,F5)", "x":3, "y":1.5}, - {"label":"K22 (D4,F6)", "x":4, "y":1.5}, - {"label":"K32 (B4,F6)", "x":5, "y":1.5}, - {"label":"K23 (D4,F7)", "x":6, "y":1.5}, - {"label":"K33 (B4,F7)", "x":7, "y":1.5}, - {"label":"K24 (D4,B1)", "x":8, "y":1.5}, - {"label":"K34 (B4,B1)", "x":9, "y":1.5}, - {"label":"K25 (D4,B3)", "x":10, "y":1.5}, - {"label":"K35 (B4,B3)", "x":11, "y":1.5}, - {"label":"K26 (D4,B2)", "x":12, "y":1.5}, - {"label":"K36 (B4,B2)", "x":13, "y":1.5, "w":2}, - {"label":"K27 (D4,D5)", "x":15.25, "y":1.5}, - {"label":"K38 (B4,C7)", "x":16.25, "y":1.5}, - {"label":"K29 (D4,F1)", "x":17.25, "y":1.5}, - {"label":"K40 (D0,F4)", "x":0, "y":2.5, "w":1.5}, - {"label":"K50 (B5,F4)", "x":1.5, "y":2.5}, - {"label":"K41 (D0,F5)", "x":2.5, "y":2.5}, - {"label":"K51 (B5,F5)", "x":3.5, "y":2.5}, - {"label":"K42 (D0,F6)", "x":4.5, "y":2.5}, - {"label":"K52 (B5,F6)", "x":5.5, "y":2.5}, - {"label":"K43 (D0,F7)", "x":6.5, "y":2.5}, - {"label":"K53 (B5,F7)", "x":7.5, "y":2.5}, - {"label":"K44 (D0,B1)", "x":8.5, "y":2.5}, - {"label":"K54 (B5,B1)", "x":9.5, "y":2.5}, - {"label":"K45 (D0,B3)", "x":10.5, "y":2.5}, - {"label":"K55 (B5,B3)", "x":11.5, "y":2.5}, - {"label":"K46 (D0,B2)", "x":12.5, "y":2.5}, - {"label":"K56 (B5,B2)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K47 (D0,D5)", "x":15.25, "y":2.5}, - {"label":"K58 (B5,C7)", "x":16.25, "y":2.5}, - {"label":"K49 (D0,F1)", "x":17.25, "y":2.5}, - {"label":"K60 (D1,F4)", "x":0, "y":3.5, "w":1.75}, - {"label":"K70 (E6,F4)", "x":1.75, "y":3.5}, - {"label":"K61 (D1,F5)", "x":2.75, "y":3.5}, - {"label":"K71 (E6,F5)", "x":3.75, "y":3.5}, - {"label":"K62 (D1,F6)", "x":4.75, "y":3.5}, - {"label":"K72 (E6,F6)", "x":5.75, "y":3.5}, - {"label":"K63 (D1,F7)", "x":6.75, "y":3.5}, - {"label":"K73 (E6,F7)", "x":7.75, "y":3.5}, - {"label":"K64 (D1,B1)", "x":8.75, "y":3.5}, - {"label":"K74 (E6,B1)", "x":9.75, "y":3.5}, - {"label":"K65 (D1,B3)", "x":10.75, "y":3.5}, - {"label":"K75 (E6,B3)", "x":11.75, "y":3.5}, - {"label":"K76 (E6,B2)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K80 (D2,F4)", "x":0, "y":4.5, "w":2.25}, - {"label":"K90 (D7,F4)", "x":2.25, "y":4.5}, - {"label":"K81 (D2,F5)", "x":3.25, "y":4.5}, - {"label":"K91 (D7,F5)", "x":4.25, "y":4.5}, - {"label":"K82 (D2,F6)", "x":5.25, "y":4.5}, - {"label":"K92 (D7,F6)", "x":6.25, "y":4.5}, - {"label":"K83 (D2,F7)", "x":7.25, "y":4.5}, - {"label":"K93 (D7,F7)", "x":8.25, "y":4.5}, - {"label":"K84 (D2,B1)", "x":9.25, "y":4.5}, - {"label":"K94 (D7,B1)", "x":10.25, "y":4.5}, - {"label":"K85 (D2,B3)", "x":11.25, "y":4.5}, - {"label":"K96 (D7,B2)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K98 (D7,C7)", "x":16.25, "y":4.5}, - {"label":"KA0 (D3,F4)", "x":0, "y":5.5, "w":1.25}, - {"label":"KB0 (C6,F4)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"KA1 (D3,F5)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"KA2 (D3,F6)", "x":3.75, "y":5.5, "w":2.25}, - {"label":"KA3 (D3,F7)", "x":6, "y":5.5, "w":1.75}, - {"label":"KA4 (D3,B1)", "x":7.75, "y":5.5, "w":2.25}, - {"label":"KA5 (D3,B3)", "x":10, "y":5.5, "w":1.25}, - {"label":"KB5 (C6,B3)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"KA6 (D3,B2)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"KB6 (C6,B2)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KA7 (D3,D5)", "x":15.25, "y":5.5}, - {"label":"KB8 (C6,C7)", "x":16.25, "y":5.5}, - {"label":"KA9 (D3,F1)", "x":17.25, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [1, 5], "x": 12, "y": 0}, + {"matrix": [0, 6], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [0, 7], "x": 15.25, "y": 0}, + {"matrix": [1, 8], "x": 16.25, "y": 0}, + {"matrix": [0, 9], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 7], "x": 15.25, "y": 1.5}, + {"matrix": [3, 8], "x": 16.25, "y": 1.5}, + {"matrix": [2, 9], "x": 17.25, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.25, "y": 2.5}, + {"matrix": [5, 8], "x": 16.25, "y": 2.5}, + {"matrix": [4, 9], "x": 17.25, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4.5}, + {"matrix": [9, 1], "x": 4.25, "y": 4.5}, + {"matrix": [8, 2], "x": 5.25, "y": 4.5}, + {"matrix": [9, 2], "x": 6.25, "y": 4.5}, + {"matrix": [8, 3], "x": 7.25, "y": 4.5}, + {"matrix": [9, 3], "x": 8.25, "y": 4.5}, + {"matrix": [8, 4], "x": 9.25, "y": 4.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4.5}, + {"matrix": [8, 5], "x": 11.25, "y": 4.5}, + {"matrix": [9, 6], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 8], "x": 16.25, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 2], "x": 3.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 3], "x": 6, "y": 5.5, "w": 1.75}, + {"matrix": [10, 4], "x": 7.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + {"matrix": [11, 8], "x": 16.25, "y": 5.5}, + {"matrix": [10, 9], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/clawsome/roadster/info.json b/keyboards/clawsome/roadster/info.json index 69ecaee3681f..2e5bc24484ab 100644 --- a/keyboards/clawsome/roadster/info.json +++ b/keyboards/clawsome/roadster/info.json @@ -18,50 +18,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D2,D4)", "x":0, "y":0}, - {"label":"K01 (D2,C6)", "x":1, "y":0}, - {"label":"K02 (D2,D7)", "x":2, "y":0}, - {"label":"K03 (D2,E6)", "x":3, "y":0}, - {"label":"K04 (D2,B4)", "x":4, "y":0}, - {"label":"K05 (D2,B5)", "x":5, "y":0}, - {"label":"K06 (D2,B6)", "x":6, "y":0}, - {"label":"K07 (D2,B2)", "x":7, "y":0}, - {"label":"K08 (D2,B3)", "x":8, "y":0}, - {"label":"K09 (D2,B1)", "x":9, "y":0}, - {"label":"K0A (D2,F7)", "x":10, "y":0}, - {"label":"K0B (D2,F6)", "x":11, "y":0}, - {"label":"K10 (D3,D4)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D3,C6)", "x":1.5, "y":1}, - {"label":"K12 (D3,D7)", "x":2.5, "y":1}, - {"label":"K13 (D3,E6)", "x":3.5, "y":1}, - {"label":"K14 (D3,B4)", "x":4.5, "y":1}, - {"label":"K15 (D3,B5)", "x":5.5, "y":1}, - {"label":"K16 (D3,B6)", "x":6.5, "y":1}, - {"label":"K17 (D3,B2)", "x":7.5, "y":1}, - {"label":"K18 (D3,B3)", "x":8.5, "y":1}, - {"label":"K19 (D3,B1)", "x":9.5, "y":1}, - {"label":"K1B (D3,F6)", "x":10.5, "y":1, "w":1.5}, - {"label":"K20 (D0,D4)", "x":0, "y":2}, - {"label":"K21 (D0,C6)", "x":1, "y":2}, - {"label":"K22 (D0,D7)", "x":2, "y":2}, - {"label":"K23 (D0,E6)", "x":3, "y":2}, - {"label":"K24 (D0,B4)", "x":4, "y":2}, - {"label":"K25 (D0,B5)", "x":5, "y":2}, - {"label":"K26 (D0,B6)", "x":6, "y":2}, - {"label":"K27 (D0,B2)", "x":7, "y":2}, - {"label":"K28 (D0,B3)", "x":8, "y":2}, - {"label":"K29 (D0,B1)", "x":9, "y":2}, - {"label":"K2A (D0,F7)", "x":10, "y":2}, - {"label":"K2B (D0,F6)", "x":11, "y":2}, - {"label":"K30 (D1,D4)", "x":0, "y":3}, - {"label":"K31 (D1,C6)", "x":1, "y":3}, - {"label":"K32 (D1,D7)", "x":2, "y":3}, - {"label":"K34 (D1,B4)", "x":3, "y":3, "w":2}, - {"label":"K36 (D1,B6)", "x":5, "y":3, "w":2}, - {"label":"K38 (D1,B3)", "x":7, "y":3, "w":2}, - {"label":"K39 (D1,B1)", "x":9, "y":3}, - {"label":"K3A (D1,F7)", "x":10, "y":3}, - {"label":"K3B (D1,F6)", "x":11, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 7, "y": 3, "w": 2}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/clawsome/roadster/roadster.h b/keyboards/clawsome/roadster/roadster.h deleted file mode 100644 index a306085173bb..000000000000 --- a/keyboards/clawsome/roadster/roadster.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 AAClawson (AlisGraveNil) - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K34, K36, K38, K39, K3A, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, K31, K32, KC_NO, K34, KC_NO, K36, KC_NO, K38, K39, K3A, K3B }, \ -} diff --git a/keyboards/clawsome/suv/info.json b/keyboards/clawsome/suv/info.json index ddf951c9bbbc..2f0b2d6bfee7 100644 --- a/keyboards/clawsome/suv/info.json +++ b/keyboards/clawsome/suv/info.json @@ -18,112 +18,130 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (F0,D3)", "x":0, "y":0}, - {"label":"K01 (F0,D2)", "x":2, "y":0}, - {"label":"K11 (B6,D2)", "x":3, "y":0}, - {"label":"K02 (F0,D1)", "x":4, "y":0}, - {"label":"K12 (B6,D1)", "x":5, "y":0}, - {"label":"K03 (F0,B4)", "x":6.5, "y":0}, - {"label":"K13 (B6,B4)", "x":7.5, "y":0}, - {"label":"K04 (F0,B5)", "x":8.5, "y":0}, - {"label":"K14 (B6,B5)", "x":9.5, "y":0}, - {"label":"K05 (F0,B7)", "x":11, "y":0}, - {"label":"K15 (B6,B7)", "x":12, "y":0}, - {"label":"K06 (F0,D5)", "x":13, "y":0}, - {"label":"K16 (B6,D5)", "x":14, "y":0}, - {"label":"K07 (F0,C7)", "x":15.25, "y":0}, - {"label":"K17 (B6,C7)", "x":16.25, "y":0}, - {"label":"K08 (F0,F1)", "x":17.25, "y":0}, - {"label":"K20 (D0,D3)", "x":0, "y":1.5}, - {"label":"K30 (F6,D3)", "x":1, "y":1.5}, - {"label":"K21 (D0,D2)", "x":2, "y":1.5}, - {"label":"K31 (F6,D2)", "x":3, "y":1.5}, - {"label":"K22 (D0,D1)", "x":4, "y":1.5}, - {"label":"K32 (F6,D1)", "x":5, "y":1.5}, - {"label":"K23 (D0,B4)", "x":6, "y":1.5}, - {"label":"K33 (F6,B4)", "x":7, "y":1.5}, - {"label":"K24 (D0,B5)", "x":8, "y":1.5}, - {"label":"K34 (F6,B5)", "x":9, "y":1.5}, - {"label":"K25 (D0,B7)", "x":10, "y":1.5}, - {"label":"K35 (F6,B7)", "x":11, "y":1.5}, - {"label":"K26 (D0,D5)", "x":12, "y":1.5}, - {"label":"K36 (F6,D5)", "x":13, "y":1.5, "w":2}, - {"label":"K27 (D0,C7)", "x":15.25, "y":1.5}, - {"label":"K37 (F6,C7)", "x":16.25, "y":1.5}, - {"label":"K28 (D0,F1)", "x":17.25, "y":1.5}, - {"label":"K38 (F6,F1)", "x":18.5, "y":1.5}, - {"label":"K29 (D0,F5)", "x":19.5, "y":1.5}, - {"label":"K39 (F6,F5)", "x":20.5, "y":1.5}, - {"label":"K2A (D0,F4)", "x":21.5, "y":1.5}, - {"label":"K40 (D4,D3)", "x":0, "y":2.5, "w":1.5}, - {"label":"K50 (F7,D3)", "x":1.5, "y":2.5}, - {"label":"K41 (D4,D2)", "x":2.5, "y":2.5}, - {"label":"K51 (F7,D2)", "x":3.5, "y":2.5}, - {"label":"K42 (D4,D1)", "x":4.5, "y":2.5}, - {"label":"K52 (F7,D1)", "x":5.5, "y":2.5}, - {"label":"K43 (D4,B4)", "x":6.5, "y":2.5}, - {"label":"K53 (F7,B4)", "x":7.5, "y":2.5}, - {"label":"K44 (D4,B5)", "x":8.5, "y":2.5}, - {"label":"K54 (F7,B5)", "x":9.5, "y":2.5}, - {"label":"K45 (D4,B7)", "x":10.5, "y":2.5}, - {"label":"K55 (F7,B7)", "x":11.5, "y":2.5}, - {"label":"K46 (D4,D5)", "x":12.5, "y":2.5}, - {"label":"K56 (F7,D5)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K47 (D4,C7)", "x":15.25, "y":2.5}, - {"label":"K57 (F7,C7)", "x":16.25, "y":2.5}, - {"label":"K48 (D4,F1)", "x":17.25, "y":2.5}, - {"label":"K58 (F7,F1)", "x":18.5, "y":2.5}, - {"label":"K49 (D4,F5)", "x":19.5, "y":2.5}, - {"label":"K59 (F7,F5)", "x":20.5, "y":2.5}, - {"label":"K4A (D4,F4)", "x":21.5, "y":2.5, "h":2}, - {"label":"K60 (B3,D3)", "x":0, "y":3.5, "w":1.75}, - {"label":"K70 (B1,D3)", "x":1.75, "y":3.5}, - {"label":"K61 (B3,D2)", "x":2.75, "y":3.5}, - {"label":"K71 (B1,D2)", "x":3.75, "y":3.5}, - {"label":"K62 (B3,D1)", "x":4.75, "y":3.5}, - {"label":"K72 (B1,D1)", "x":5.75, "y":3.5}, - {"label":"K63 (B3,B4)", "x":6.75, "y":3.5}, - {"label":"K73 (B1,B4)", "x":7.75, "y":3.5}, - {"label":"K64 (B3,B5)", "x":8.75, "y":3.5}, - {"label":"K74 (B1,B5)", "x":9.75, "y":3.5}, - {"label":"K65 (B3,B7)", "x":10.75, "y":3.5}, - {"label":"K75 (B1,B7)", "x":11.75, "y":3.5}, - {"label":"K76 (B1,D5)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K78 (B1,F1)", "x":18.5, "y":3.5}, - {"label":"K69 (B3,F5)", "x":19.5, "y":3.5}, - {"label":"K79 (B1,F5)", "x":20.5, "y":3.5}, - {"label":"K80 (B0,D3)", "x":0, "y":4.5, "w":2.25}, - {"label":"K90 (C6,D3)", "x":2.25, "y":4.5}, - {"label":"K81 (B0,D2)", "x":3.25, "y":4.5}, - {"label":"K91 (C6,D2)", "x":4.25, "y":4.5}, - {"label":"K82 (B0,D1)", "x":5.25, "y":4.5}, - {"label":"K92 (C6,D1)", "x":6.25, "y":4.5}, - {"label":"K83 (B0,B4)", "x":7.25, "y":4.5}, - {"label":"K93 (C6,B4)", "x":8.25, "y":4.5}, - {"label":"K84 (B0,B5)", "x":9.25, "y":4.5}, - {"label":"K94 (C6,B5)", "x":10.25, "y":4.5}, - {"label":"K85 (B0,B7)", "x":11.25, "y":4.5}, - {"label":"K96 (C6,D5)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K97 (C6,C7)", "x":16.25, "y":4.5}, - {"label":"K98 (C6,F1)", "x":18.5, "y":4.5}, - {"label":"K89 (B0,F5)", "x":19.5, "y":4.5}, - {"label":"K99 (C6,F5)", "x":20.5, "y":4.5}, - {"label":"K8A (B0,F4)", "x":21.5, "y":4.5, "h":2}, - {"label":"KA0 (B2,D3)", "x":0, "y":5.5, "w":1.25}, - {"label":"KB0 (D7,D3)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"KA1 (B2,D2)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"KA2 (B2,D1)", "x":3.75, "y":5.5, "w":2.25}, - {"label":"KA3 (B2,B4)", "x":6, "y":5.5, "w":1.75}, - {"label":"KA4 (B2,B5)", "x":7.75, "y":5.5, "w":2.25}, - {"label":"KA5 (B2,B7)", "x":10, "y":5.5, "w":1.25}, - {"label":"KB5 (D7,B7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"KA6 (B2,D5)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"KB6 (D7,D5)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KA7 (B2,C7)", "x":15.25, "y":5.5}, - {"label":"KB7 (D7,C7)", "x":16.25, "y":5.5}, - {"label":"KA8 (B2,F1)", "x":17.25, "y":5.5}, - {"label":"KB8 (D7,F1)", "x":18.5, "y":5.5, "w":2}, - {"label":"KB9 (D7,F5)", "x":20.5, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [1, 5], "x": 12, "y": 0}, + {"matrix": [0, 6], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [0, 7], "x": 15.25, "y": 0}, + {"matrix": [1, 7], "x": 16.25, "y": 0}, + {"matrix": [0, 8], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 7], "x": 15.25, "y": 1.5}, + {"matrix": [3, 7], "x": 16.25, "y": 1.5}, + {"matrix": [2, 8], "x": 17.25, "y": 1.5}, + + {"matrix": [3, 8], "x": 18.5, "y": 1.5}, + {"matrix": [2, 9], "x": 19.5, "y": 1.5}, + {"matrix": [3, 9], "x": 20.5, "y": 1.5}, + {"matrix": [2, 10], "x": 21.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.25, "y": 2.5}, + {"matrix": [5, 7], "x": 16.25, "y": 2.5}, + {"matrix": [4, 8], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 8], "x": 18.5, "y": 2.5}, + {"matrix": [4, 9], "x": 19.5, "y": 2.5}, + {"matrix": [5, 9], "x": 20.5, "y": 2.5}, + {"matrix": [4, 10], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [7, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [7, 8], "x": 18.5, "y": 3.5}, + {"matrix": [6, 9], "x": 19.5, "y": 3.5}, + {"matrix": [7, 9], "x": 20.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4.5}, + {"matrix": [9, 1], "x": 4.25, "y": 4.5}, + {"matrix": [8, 2], "x": 5.25, "y": 4.5}, + {"matrix": [9, 2], "x": 6.25, "y": 4.5}, + {"matrix": [8, 3], "x": 7.25, "y": 4.5}, + {"matrix": [9, 3], "x": 8.25, "y": 4.5}, + {"matrix": [8, 4], "x": 9.25, "y": 4.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4.5}, + {"matrix": [8, 5], "x": 11.25, "y": 4.5}, + {"matrix": [9, 6], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 7], "x": 16.25, "y": 4.5}, + + {"matrix": [9, 8], "x": 18.5, "y": 4.5}, + {"matrix": [8, 9], "x": 19.5, "y": 4.5}, + {"matrix": [9, 9], "x": 20.5, "y": 4.5}, + {"matrix": [8, 10], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 2], "x": 3.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 3], "x": 6, "y": 5.5, "w": 1.75}, + {"matrix": [10, 4], "x": 7.75, "y": 5.5, "w": 2.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5}, + {"matrix": [10, 8], "x": 17.25, "y": 5.5}, + + {"matrix": [11, 8], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [11, 9], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/clawsome/suv/suv.h b/keyboards/clawsome/suv/suv.h deleted file mode 100644 index 64ed0e7d0f47..000000000000 --- a/keyboards/clawsome/suv/suv.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 AAClawson (AlisGraveNil) - * - * 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( \ - K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, K37, K28, K38, K29, K39, K2A, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, K58, K49, K59, K4A, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, K78, K69, K79, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K96, K97, K98, K89, K99, K8A, \ - KA0, KB0, KA1, KA2, KA3, KA4, KA5, KB5, KA6, KB6, KA7, KB7, KA8, KB8, KB9 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, KC_NO, KC_NO }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, K17, KC_NO, KC_NO, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO, K69, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, K78, K79, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO, K89, K8A }, \ - { K90, K91, K92, K93, K94, KC_NO, K96, K97, K98, K99, KC_NO }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8, KC_NO, KC_NO }, \ - { KB0, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KB6, KB7, KB8, KB9, KC_NO }, \ -} diff --git a/keyboards/clickety_split/leeloo/info.json b/keyboards/clickety_split/leeloo/info.json index 9978f4dd5568..78794cbddb8f 100644 --- a/keyboards/clickety_split/leeloo/info.json +++ b/keyboards/clickety_split/leeloo/info.json @@ -33,73 +33,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.5}, - {"label":"1", "x":1, "y":0.4}, - {"label":"2", "x":2, "y":0.2}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0.2}, - {"label":"5", "x":5, "y":0.4}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.2}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.2}, + {"matrix": [0, 5], "x": 5, "y": 0.4}, - {"label":"6", "x":9, "y":0.4}, - {"label":"7", "x":10, "y":0.2}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0.2}, - {"label":"0", "x":13, "y":0.4}, - {"label":"Back Slash", "x":14, "y":0.5}, + {"matrix": [5, 5], "x": 9, "y": 0.4}, + {"matrix": [5, 4], "x": 10, "y": 0.2}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.2}, + {"matrix": [5, 1], "x": 13, "y": 0.4}, + {"matrix": [5, 0], "x": 14, "y": 0.5}, - {"label":"TAB", "x":0, "y":1.5}, - {"label":"Q", "x":1, "y":1.4}, - {"label":"W", "x":2, "y":1.2}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1.2}, - {"label":"T", "x":5, "y":1.4}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.2}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.2}, + {"matrix": [1, 5], "x": 5, "y": 1.4}, - {"label":"Y", "x":9, "y":1.4}, - {"label":"U", "x":10, "y":1.2}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1.2}, - {"label":"P", "x":13, "y":1.4}, - {"label":"GRV", "x":14, "y":1.5}, + {"matrix": [6, 5], "x": 9, "y": 1.4}, + {"matrix": [6, 4], "x": 10, "y": 1.2}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.2}, + {"matrix": [6, 1], "x": 13, "y": 1.4}, + {"matrix": [6, 0], "x": 14, "y": 1.5}, - {"label":"CAPS", "x":0, "y":2.5}, - {"label":"A", "x":1, "y":2.4}, - {"label":"S", "x":2, "y":2.2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2.2}, - {"label":"G", "x":5, "y":2.4}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.2}, + {"matrix": [2, 5], "x": 5, "y": 2.4}, - {"label":"H", "x":9, "y":2.4}, - {"label":"J", "x":10, "y":2.2}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2.2}, - {"label":";", "x":13, "y":2.4}, - {"label":"'", "x":14, "y":2.5}, + {"matrix": [7, 5], "x": 9, "y": 2.4}, + {"matrix": [7, 4], "x": 10, "y": 2.2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.2}, + {"matrix": [7, 1], "x": 13, "y": 2.4}, + {"matrix": [7, 0], "x": 14, "y": 2.5}, - {"label":"Shift", "x":0, "y":3.5}, - {"label":"Z", "x":1, "y":3.4}, - {"label":"X", "x":2, "y":3.2}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3.2}, - {"label":"B", "x":5, "y":3.4}, - {"label":"GUI", "x":6.25, "y":3.4}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.4}, + {"matrix": [3, 2], "x": 2, "y": 3.2}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.2}, + {"matrix": [3, 5], "x": 5, "y": 3.4}, + {"matrix": [4, 5], "x": 6.25, "y": 3.4}, - {"label":"GUI", "x":7.75, "y":3.4}, - {"label":"N", "x":9, "y":3.4}, - {"label":"M", "x":10, "y":3.2}, - {"label":",", "x":11, "y":3}, - {"label":".", "x":12, "y":3.2}, - {"label":"/", "x":13, "y":3.4}, - {"label":"Shift", "x":14, "y":3.5}, + {"matrix": [9, 5], "x": 7.75, "y": 3.4}, + {"matrix": [8, 5], "x": 9, "y": 3.4}, + {"matrix": [8, 4], "x": 10, "y": 3.2}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.2}, + {"matrix": [8, 1], "x": 13, "y": 3.4}, + {"matrix": [8, 0], "x": 14, "y": 3.5}, - {"label":"Alt", "x":2.7, "y":4.6}, - {"label":"Ctrl", "x":3.8, "y":4.5}, - {"label":"Enter", "x":4.9, "y":4.55}, - {"label":"MINS", "x":6.1, "y":4.65}, + {"matrix": [4, 1], "x": 2.7, "y": 4.6}, + {"matrix": [4, 2], "x": 3.8, "y": 4.5}, + {"matrix": [4, 3], "x": 4.9, "y": 4.55}, + {"matrix": [4, 4], "x": 6.1, "y": 4.65}, - {"label":"EQL", "x":7.9, "y":4.65}, - {"label":"Space", "x":9.1, "y":4.55}, - {"label":"Back Space", "x":10.2, "y":4.5}, - {"label":"Delete", "x":11.3, "y":4.6} + {"matrix": [9, 4], "x": 7.9, "y": 4.65}, + {"matrix": [9, 3], "x": 9.1, "y": 4.55}, + {"matrix": [9, 2], "x": 10.2, "y": 4.5}, + {"matrix": [9, 1], "x": 11.3, "y": 4.6} ] } } diff --git a/keyboards/clickety_split/leeloo/rev1/rev1.h b/keyboards/clickety_split/leeloo/rev1/rev1.h deleted file mode 100644 index 7469cc2d83d3..000000000000 --- a/keyboards/clickety_split/leeloo/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2022 Clickety Split Ltd. - * https://clicketysplit.ca - * - * 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( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L45, R45, R35, R34, R33, R32, R31, R30, \ - L41, L42, L43, L44, R44, R43, R42, R41 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, L41, L42, L43, L44, L45 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { KC_NO, R41, R42, R43, R44, R45 } \ - } diff --git a/keyboards/cmm_studio/fuji65/fuji65.h b/keyboards/cmm_studio/fuji65/fuji65.h deleted file mode 100644 index d5c1e02eceb9..000000000000 --- a/keyboards/cmm_studio/fuji65/fuji65.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 CMM.Studio Freather - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, XXX, K2E }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, XXX }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/cmm_studio/fuji65/info.json b/keyboards/cmm_studio/fuji65/info.json index 824213303eea..2225bedad3dd 100644 --- a/keyboards/cmm_studio/fuji65/info.json +++ b/keyboards/cmm_studio/fuji65/info.json @@ -21,73 +21,78 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (B5,F7)", "x": 0, "y": 0 }, - { "label": "K01 (B5,F6)", "x": 1, "y": 0 }, - { "label": "K02 (B5,F5)", "x": 2, "y": 0 }, - { "label": "K03 (B5,F4)", "x": 3, "y": 0 }, - { "label": "K04 (B5,F1)", "x": 4, "y": 0 }, - { "label": "K05 (B5,F0)", "x": 5, "y": 0 }, - { "label": "K06 (B5,B0)", "x": 6, "y": 0 }, - { "label": "K07 (B5,B1)", "x": 7, "y": 0 }, - { "label": "K08 (B5,B2)", "x": 8, "y": 0 }, - { "label": "K09 (B5,B3)", "x": 9, "y": 0 }, - { "label": "K0A (B5,D5)", "x": 10, "y": 0 }, - { "label": "K0B (B5,D3)", "x": 11, "y": 0 }, - { "label": "K0C (B5,D2)", "x": 12, "y": 0 }, - { "label": "K0D (B5,D1)", "x": 13, "y": 0 }, - { "label": "K0E (B5,D0)", "x": 14, "y": 0 }, - { "label": "K10 (B4,F7)", "x": 0, "y": 1, "w": 1.5 }, - { "label": "K11 (B4,F6)", "x": 1.5, "y": 1 }, - { "label": "K12 (B4,F5)", "x": 2.5, "y": 1 }, - { "label": "K13 (B4,F4)", "x": 3.5, "y": 1 }, - { "label": "K14 (B4,F1)", "x": 4.5, "y": 1 }, - { "label": "K15 (B4,F0)", "x": 5.5, "y": 1 }, - { "label": "K16 (B4,B0)", "x": 6.5, "y": 1 }, - { "label": "K17 (B4,B1)", "x": 7.5, "y": 1 }, - { "label": "K18 (B4,B2)", "x": 8.5, "y": 1 }, - { "label": "K19 (B4,B3)", "x": 9.5, "y": 1 }, - { "label": "K1A (B4,D5)", "x": 10.5, "y": 1 }, - { "label": "K1B (B4,D3)", "x": 11.5, "y": 1 }, - { "label": "K1C (B4,D2)", "x": 12.5, "y": 1 }, - { "label": "K1D (B4,D1)", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "K1E (B4,D0)", "x": 15, "y": 1 }, - { "label": "K20 (D7,F7)", "x": 0, "y": 2, "w": 1.75 }, - { "label": "K21 (D7,F6)", "x": 1.75, "y": 2 }, - { "label": "K22 (D7,F5)", "x": 2.75, "y": 2 }, - { "label": "K23 (D7,F4)", "x": 3.75, "y": 2 }, - { "label": "K24 (D7,F1)", "x": 4.75, "y": 2 }, - { "label": "K25 (D7,F0)", "x": 5.75, "y": 2 }, - { "label": "K26 (D7,B0)", "x": 6.75, "y": 2 }, - { "label": "K27 (D7,B1)", "x": 7.75, "y": 2 }, - { "label": "K28 (D7,B2)", "x": 8.75, "y": 2 }, - { "label": "K29 (D7,B3)", "x": 9.75, "y": 2 }, - { "label": "K2A (D7,D5)", "x": 10.75, "y": 2 }, - { "label": "K2B (D7,D3)", "x": 11.75, "y": 2 }, - { "label": "K2C (D7,D2)", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "K2E (D7,D0)", "x": 15, "y": 2 }, - { "label": "K30 (D6,F7)", "x": 0, "y": 3, "w": 2.25 }, - { "label": "K32 (D6,F5)", "x": 2.25, "y": 3 }, - { "label": "K33 (D6,F4)", "x": 3.25, "y": 3 }, - { "label": "K34 (D6,F1)", "x": 4.25, "y": 3 }, - { "label": "K35 (D6,F0)", "x": 5.25, "y": 3 }, - { "label": "K36 (D6,B0)", "x": 6.25, "y": 3 }, - { "label": "K37 (D6,B1)", "x": 7.25, "y": 3 }, - { "label": "K38 (D6,B2)", "x": 8.25, "y": 3 }, - { "label": "K39 (D6,B3)", "x": 9.25, "y": 3 }, - { "label": "K3A (D6,D5)", "x": 10.25, "y": 3 }, - { "label": "K3B (D6,D3)", "x": 11.25, "y": 3 }, - { "label": "K3C (D6,D2)", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "K3D (D6,D1)", "x": 14, "y": 3 }, - { "label": "K3E (D6,D0)", "x": 15, "y": 3 }, - { "label": "K40 (B6,F7)", "x": 0, "y": 4, "w": 1.25 }, - { "label": "K41 (B6,F6)", "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "K42 (B6,F5)", "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "K46 (B6,B0)", "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "K49 (B6,B3)", "x": 10, "y": 4, "w": 1.25 }, - { "label": "K4A (B6,D5)", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "K4B (B6,D3)", "x": 13, "y": 4 }, - { "label": "K4C (B6,D2)", "x": 14, "y": 4 }, - { "label": "K4D (B6,D1)", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} ] } } diff --git a/keyboards/compound/compound.h b/keyboards/compound/compound.h deleted file mode 100644 index 697ca3d0f81f..000000000000 --- a/keyboards/compound/compound.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 Rafael Yumagulov - -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" - -// Improve readability -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40, k41, k42, k46, k4a, k4b, k4c \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, XXX}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \ - {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, XXX, XXX} \ -} diff --git a/keyboards/compound/info.json b/keyboards/compound/info.json index f3b95cec428e..9f31c7efc1c4 100644 --- a/keyboards/compound/info.json +++ b/keyboards/compound/info.json @@ -18,72 +18,72 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - {"x": 0, "y": 3, "w": 2.25}, - {"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}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, - {"x": 0, "y": 4, "w": 1.5}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4, "w": 1.5}, - {"x": 4, "y": 4, "w": 7}, - {"x": 11, "y": 4, "w": 1.5}, - {"x": 12.5, "y": 4}, - {"x": 13.5, "y": 4, "w": 1.5} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/converter/hp_46010a/hp_46010a.h b/keyboards/converter/hp_46010a/hp_46010a.h deleted file mode 100644 index 86fb3806f077..000000000000 --- a/keyboards/converter/hp_46010a/hp_46010a.h +++ /dev/null @@ -1,60 +0,0 @@ -/* -Copyright 2018 listofoptions - -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" - -/* ,---------. ,---------------------------------------------------------. ,---------. ,-------------------. - * | res|stop| | f1| f2| f3| f4|menu|user| f5| f6| f7| f8| |clrl|clrd| | | | | | - * `---------' `---------------------------------------------------------' `---------' `-------------------' - * ,------------------------------------------------------------------------..---------. ,-------------------. - * | `| 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| +| back||insl|dell| | *| /| +| -| - * |------------------------------------------------------------------------||---------| |-------------------| - * | tab| q| w| e| r| t| y| u| i| o| p| [| ]| \||insc|delc| | 7| 8| 9|pade| - * |------------------------------------------------------------------------||---------| |-------------------| - * |caps|ctrl| a| s| d| f| g| h| j| k| l| ;| '| retr|| cur|prev| | 4| 5| 6| ,| - * |------------------------------------------------------------------------------------ |-------------------| - * |dele|lshf | z| x| c| v| b| n| m| ,| .| /|rshf |sel | up|next| | 1| 2| 3| tab| - * |-------------------------------------------------------------------------|---------| |--------------- | - * |prnt| |lalt| space |ralt| |left|down|rght| | 0| .| | - * `-----------------------------------------------------------------------------------' `-------------------' - */ - -#define LAYOUT( \ - KEY_RES, KEY_STOP, KEY_F1, KEY_F2, KEY_F3, KEY_F4,KEY_MENU,KEY_USER, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_CLRL, KEY_CLRD, KEY_B1, KEY_B2, KEY_B3, KEY_B4, \ - KEY_GRAV, KEY_1, KEY_2, KEY_3, KEY_4, KEY_5, KEY_6, KEY_7, KEY_8, KEY_9, KEY_0, KEY_MINU, KEY_PLUS, KEY_BACK, KEY_INSL, KEY_DELL, KEY_MULT, KEY_DIV, KEY_ADD, KEY_SUBT, \ - KEY_TAB, KEY_Q,KEY_W, KEY_E, KEY_R, KEY_T, KEY_Y, KEY_U, KEY_I, KEY_O, KEY_P, KEY_LBRA, KEY_RBRA, KEY_PIPE, KEY_INSC, KEY_DELC, KEY_P7, KEY_P8, KEY_P9, KEY_PADE, \ - KEY_CAPS, KEY_CTRL, KEY_A, KEY_S, KEY_D, KEY_F, KEY_G, KEY_H, KEY_J, KEY_K, KEY_L, KEY_SEMI, KEY_QUOT, KEY_RETR, KEY_CUR, KEY_PREV, KEY_P4, KEY_P5, KEY_P6, KEY_PCOM, \ - KEY_DELE, KEY_LSHF, KEY_Z, KEY_X, KEY_C, KEY_V, KEY_B, KEY_N, KEY_M, KEY_COMA, KEY_DOT, KEY_SLAS,KEY_RSHF, KEY_SEL, KEY_UP, KEY_NEXT, KEY_P1, KEY_P2, KEY_P3, KEY_PTAB, \ - KEY_PRNT, KEY_LALT, KEY_SPACE , KEY_RALT, KEY_LEFT, KEY_DOWN, KEY_RGHT, KEY_P0, KEY_PDOT \ -) { \ - {KEY_USER, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_CLRL, KEY_CLRD, KEY_MENU }, \ - {KEY_9, KEY_0, KEY_MINU, KEY_PLUS, KEY_BACK, KEY_INSL, KEY_DELL, KEY_8 }, \ - {KEY_O, KEY_P, KEY_LBRA, KEY_RBRA, KEY_PIPE, KEY_INSC, KEY_DELC, KEY_I }, \ - {KEY_K, KEY_L, KEY_SEMI, KEY_QUOT, KEY_RETR, KEY_CUR, KEY_PREV, KEY_J }, \ - {KEY_COMA, KEY_DOT, KEY_SLAS, KEY_1, KEY_SEL, KEY_UP, KEY_NEXT, KEY_M }, \ - {KEY_SPACE, KEY_LALT, KEY_RALT, KC_NO, KEY_LEFT, KEY_DOWN, KEY_RGHT, KC_NO }, \ - {KEY_F3, KEY_F2, KEY_F1, KEY_GRAV, KEY_CTRL, KEY_STOP, KEY_G, KEY_F4 }, \ - {KEY_6, KEY_5, KEY_4, KEY_3, KEY_CAPS, KEY_RSHF, KEY_LSHF, KEY_7 }, \ - {KEY_Y, KEY_T, KEY_R, KEY_E, KEY_W, KEY_Q, KEY_TAB, KEY_U }, \ - {KEY_RES, KEY_F, KEY_D, KEY_S, KEY_A, KC_NO, KEY_2, KEY_H }, \ - {KEY_P7, KEY_P4, KEY_P8, KEY_P5, KEY_P9, KEY_P6, KEY_PADE, KEY_PCOM }, \ - {KEY_MULT, KEY_P1, KEY_DIV, KEY_P2, KEY_ADD, KEY_P3, KEY_SUBT, KEY_PTAB }, \ - {KEY_B1, KEY_P0, KEY_B2, KC_NO, KEY_B3, KEY_PDOT, KEY_B4, KC_NO }, \ - {KEY_B, KEY_V, KEY_C, KEY_X, KEY_Z, KEY_PRNT, KEY_DELE, KEY_N }, \ -} diff --git a/keyboards/converter/hp_46010a/info.json b/keyboards/converter/hp_46010a/info.json index 8492d5f2009e..da29c72fac72 100644 --- a/keyboards/converter/hp_46010a/info.json +++ b/keyboards/converter/hp_46010a/info.json @@ -13,113 +13,131 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Reset", "x":0, "y":0}, - {"label":"Stop", "x":1, "y":0}, - {"label":"F1", "x":2.5, "y":0, "w":1.25}, - {"label":"F2", "x":3.75, "y":0, "w":1.25}, - {"label":"F3", "x":5, "y":0, "w":1.25}, - {"label":"F4", "x":6.25, "y":0, "w":1.25}, - {"label":"Menu", "x":7.5, "y":0}, - {"label":"User", "x":8.5, "y":0}, - {"label":"F5", "x":9.5, "y":0, "w":1.25}, - {"label":"F6", "x":10.75, "y":0, "w":1.25}, - {"label":"F7", "x":12, "y":0, "w":1.25}, - {"label":"F8", "x":13.25, "y":0, "w":1.25}, - {"label":"Clear line", "x":15, "y":0}, - {"label":"Clear display", "x":16, "y":0}, - {"x":18, "y":0}, - {"x":19, "y":0}, - {"x":20, "y":0}, - {"x":21, "y":0}, - {"label":"`", "x":0, "y":2, "w":1.25}, - {"label":"1", "x":1.25, "y":2}, - {"label":"2", "x":2.25, "y":2}, - {"label":"3", "x":3.25, "y":2}, - {"label":"4", "x":4.25, "y":2}, - {"label":"5", "x":5.25, "y":2}, - {"label":"6", "x":6.25, "y":2}, - {"label":"7", "x":7.25, "y":2}, - {"label":"8", "x":8.25, "y":2}, - {"label":"9", "x":9.25, "y":2}, - {"label":"0", "x":10.25, "y":2}, - {"label":"-", "x":11.25, "y":2}, - {"label":"=", "x":12.25, "y":2}, - {"label":"Backspace", "x":13.25, "y":2, "w":1.5}, - {"label":"Insert line", "x":15, "y":2}, - {"label":"Delete line", "x":16, "y":2}, - {"label":"*", "x":18, "y":2}, - {"label":"/", "x":19, "y":2}, - {"label":"+", "x":20, "y":2}, - {"label":"-", "x":21, "y":2}, - {"label":"Tab", "x":0, "y":3, "w":1.75}, - {"label":"Q", "x":1.75, "y":3}, - {"label":"W", "x":2.75, "y":3}, - {"label":"E", "x":3.75, "y":3}, - {"label":"R", "x":4.75, "y":3}, - {"label":"T", "x":5.75, "y":3}, - {"label":"Y", "x":6.75, "y":3}, - {"label":"U", "x":7.75, "y":3}, - {"label":"I", "x":8.75, "y":3}, - {"label":"O", "x":9.75, "y":3}, - {"label":"P", "x":10.75, "y":3}, - {"label":"[", "x":11.75, "y":3}, - {"label":"]", "x":12.75, "y":3}, - {"label":"\\", "x":13.75, "y":3}, - {"label":"Insert char", "x":15, "y":3}, - {"label":"Delete char", "x":16, "y":3}, - {"label":"7", "x":18, "y":3}, - {"label":"8", "x":19, "y":3}, - {"label":"9", "x":20, "y":3}, - {"label":"Enter", "x":21, "y":3}, - {"label":"Caps Lock", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"A", "x":2, "y":4}, - {"label":"S", "x":3, "y":4}, - {"label":"D", "x":4, "y":4}, - {"label":"F", "x":5, "y":4}, - {"label":"G", "x":6, "y":4}, - {"label":"H", "x":7, "y":4}, - {"label":"J", "x":8, "y":4}, - {"label":"K", "x":9, "y":4}, - {"label":"L", "x":10, "y":4}, - {"label":";", "x":11, "y":4}, - {"label":"'", "x":12, "y":4}, - {"label":"Return", "x":13, "y":4, "w":1.75}, - {"label":"Cursor", "x":15, "y":4}, - {"label":"Prev", "x":16, "y":4}, - {"label":"4", "x":18, "y":4}, - {"label":"5", "x":19, "y":4}, - {"label":"6", "x":20, "y":4}, - {"label":",", "x":21, "y":4}, - {"label":"Del", "x":0, "y":5}, - {"label":"Shift", "x":1.25, "y":5, "w":1.25}, - {"label":"Z", "x":2.5, "y":5}, - {"label":"X", "x":3.5, "y":5}, - {"label":"C", "x":4.5, "y":5}, - {"label":"V", "x":5.5, "y":5}, - {"label":"B", "x":6.5, "y":5}, - {"label":"N", "x":7.5, "y":5}, - {"label":"M", "x":8.5, "y":5}, - {"label":",", "x":9.5, "y":5}, - {"label":".", "x":10.5, "y":5}, - {"label":"/", "x":11.5, "y":5}, - {"label":"Shift", "x":12.5, "y":5, "w":1.25}, - {"label":"Select", "x":14, "y":5}, - {"label":"Up", "x":15, "y":5}, - {"label":"Next", "x":16, "y":5}, - {"label":"1", "x":18, "y":5}, - {"label":"2", "x":19, "y":5}, - {"label":"3", "x":20, "y":5}, - {"label":"Tab", "x":21, "y":5, "h":2}, - {"label":"Win", "x":0, "y":6}, - {"label":"Extend Char", "x":2.5, "y":6}, - {"x":3.5, "y":6, "w":8}, - {"label":"Extend Char", "x":11.5, "y":6}, - {"label":"Left", "x":14, "y":6}, - {"label":"Down", "x":15, "y":6}, - {"label":"Right", "x":16, "y":6}, - {"label":"0", "x":18, "y":6, "w":2}, - {"label":".", "x":20, "y":6} + {"matrix": [9, 0], "x": 0, "y": 0}, + {"matrix": [6, 5], "x": 1, "y": 0}, + + {"matrix": [6, 2], "x": 2.5, "y": 0, "w": 1.25}, + {"matrix": [6, 1], "x": 3.75, "y": 0, "w": 1.25}, + {"matrix": [6, 0], "x": 5, "y": 0, "w": 1.25}, + {"matrix": [6, 7], "x": 6.25, "y": 0, "w": 1.25}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 0], "x": 8.5, "y": 0}, + {"matrix": [0, 1], "x": 9.5, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 10.75, "y": 0, "w": 1.25}, + {"matrix": [0, 3], "x": 12, "y": 0, "w": 1.25}, + {"matrix": [0, 4], "x": 13.25, "y": 0, "w": 1.25}, + + {"matrix": [0, 5], "x": 15, "y": 0}, + {"matrix": [0, 6], "x": 16, "y": 0}, + + {"matrix": [12, 0], "x": 18, "y": 0}, + {"matrix": [12, 2], "x": 19, "y": 0}, + {"matrix": [12, 4], "x": 20, "y": 0}, + {"matrix": [12, 6], "x": 21, "y": 0}, + + {"matrix": [6, 3], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [4, 3], "x": 1.25, "y": 2}, + {"matrix": [9, 6], "x": 2.25, "y": 2}, + {"matrix": [7, 3], "x": 3.25, "y": 2}, + {"matrix": [7, 2], "x": 4.25, "y": 2}, + {"matrix": [7, 1], "x": 5.25, "y": 2}, + {"matrix": [7, 0], "x": 6.25, "y": 2}, + {"matrix": [7, 7], "x": 7.25, "y": 2}, + {"matrix": [1, 7], "x": 8.25, "y": 2}, + {"matrix": [1, 0], "x": 9.25, "y": 2}, + {"matrix": [1, 1], "x": 10.25, "y": 2}, + {"matrix": [1, 2], "x": 11.25, "y": 2}, + {"matrix": [1, 3], "x": 12.25, "y": 2}, + {"matrix": [1, 4], "x": 13.25, "y": 2, "w": 1.5}, + + {"matrix": [1, 5], "x": 15, "y": 2}, + {"matrix": [1, 6], "x": 16, "y": 2}, + + {"matrix": [11, 0], "x": 18, "y": 2}, + {"matrix": [11, 2], "x": 19, "y": 2}, + {"matrix": [11, 4], "x": 20, "y": 2}, + {"matrix": [11, 6], "x": 21, "y": 2}, + + {"matrix": [8, 6], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [8, 5], "x": 1.75, "y": 3}, + {"matrix": [8, 4], "x": 2.75, "y": 3}, + {"matrix": [8, 3], "x": 3.75, "y": 3}, + {"matrix": [8, 2], "x": 4.75, "y": 3}, + {"matrix": [8, 1], "x": 5.75, "y": 3}, + {"matrix": [8, 0], "x": 6.75, "y": 3}, + {"matrix": [8, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 7], "x": 8.75, "y": 3}, + {"matrix": [2, 0], "x": 9.75, "y": 3}, + {"matrix": [2, 1], "x": 10.75, "y": 3}, + {"matrix": [2, 2], "x": 11.75, "y": 3}, + {"matrix": [2, 3], "x": 12.75, "y": 3}, + {"matrix": [2, 4], "x": 13.75, "y": 3}, + + {"matrix": [2, 5], "x": 15, "y": 3}, + {"matrix": [2, 6], "x": 16, "y": 3}, + + {"matrix": [10, 0], "x": 18, "y": 3}, + {"matrix": [10, 2], "x": 19, "y": 3}, + {"matrix": [10, 4], "x": 20, "y": 3}, + {"matrix": [10, 6], "x": 21, "y": 3}, + + {"matrix": [7, 4], "x": 0, "y": 4}, + {"matrix": [6, 4], "x": 1, "y": 4}, + {"matrix": [9, 4], "x": 2, "y": 4}, + {"matrix": [9, 3], "x": 3, "y": 4}, + {"matrix": [9, 2], "x": 4, "y": 4}, + {"matrix": [9, 1], "x": 5, "y": 4}, + {"matrix": [6, 6], "x": 6, "y": 4}, + {"matrix": [9, 7], "x": 7, "y": 4}, + {"matrix": [3, 7], "x": 8, "y": 4}, + {"matrix": [3, 0], "x": 9, "y": 4}, + {"matrix": [3, 1], "x": 10, "y": 4}, + {"matrix": [3, 2], "x": 11, "y": 4}, + {"matrix": [3, 3], "x": 12, "y": 4}, + {"matrix": [3, 4], "x": 13, "y": 4, "w": 1.75}, + + {"matrix": [3, 5], "x": 15, "y": 4}, + {"matrix": [3, 6], "x": 16, "y": 4}, + + {"matrix": [10, 1], "x": 18, "y": 4}, + {"matrix": [10, 3], "x": 19, "y": 4}, + {"matrix": [10, 5], "x": 20, "y": 4}, + {"matrix": [10, 7], "x": 21, "y": 4}, + + {"matrix": [13, 6], "x": 0, "y": 5}, + {"matrix": [7, 6], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [13, 4], "x": 2.5, "y": 5}, + {"matrix": [13, 3], "x": 3.5, "y": 5}, + {"matrix": [13, 2], "x": 4.5, "y": 5}, + {"matrix": [13, 1], "x": 5.5, "y": 5}, + {"matrix": [13, 0], "x": 6.5, "y": 5}, + {"matrix": [13, 7], "x": 7.5, "y": 5}, + {"matrix": [4, 7], "x": 8.5, "y": 5}, + {"matrix": [4, 0], "x": 9.5, "y": 5}, + {"matrix": [4, 1], "x": 10.5, "y": 5}, + {"matrix": [4, 2], "x": 11.5, "y": 5}, + {"matrix": [7, 5], "x": 12.5, "y": 5, "w": 1.25}, + + {"matrix": [4, 4], "x": 14, "y": 5}, + {"matrix": [4, 5], "x": 15, "y": 5}, + {"matrix": [4, 6], "x": 16, "y": 5}, + + {"matrix": [11, 1], "x": 18, "y": 5}, + {"matrix": [11, 3], "x": 19, "y": 5}, + {"matrix": [11, 5], "x": 20, "y": 5}, + {"matrix": [11, 7], "x": 21, "y": 5, "h": 2}, + + {"matrix": [13, 5], "x": 0, "y": 6}, + {"matrix": [5, 1], "x": 2.5, "y": 6}, + {"matrix": [5, 0], "x": 3.5, "y": 6, "w": 8}, + {"matrix": [5, 2], "x": 11.5, "y": 6}, + + {"matrix": [5, 4], "x": 14, "y": 6}, + {"matrix": [5, 5], "x": 15, "y": 6}, + {"matrix": [5, 6], "x": 16, "y": 6}, + + {"matrix": [12, 1], "x": 18, "y": 6, "w": 2}, + {"matrix": [12, 5], "x": 20, "y": 6} ] } } diff --git a/keyboards/converter/modelm101/info.json b/keyboards/converter/modelm101/info.json index a3698672ba6d..cfbc3a51c425 100644 --- a/keyboards/converter/modelm101/info.json +++ b/keyboards/converter/modelm101/info.json @@ -17,7 +17,129 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "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.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, "w":2}, {"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":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"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":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "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":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [2, 3], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [1, 9], "x": 8.5, "y": 0}, + {"matrix": [2, 9], "x": 9.5, "y": 0}, + + {"matrix": [2, 6], "x": 11, "y": 0}, + {"matrix": [3, 6], "x": 12, "y": 0}, + {"matrix": [3, 11], "x": 13, "y": 0}, + {"matrix": [3, 12], "x": 14, "y": 0}, + + {"matrix": [3, 15], "x": 15.25, "y": 0}, + {"matrix": [4, 15], "x": 16.25, "y": 0}, + {"matrix": [6, 14], "x": 17.25, "y": 0}, + + {"matrix": [2, 2], "x": 0, "y": 1.5}, + {"matrix": [3, 2], "x": 1, "y": 1.5}, + {"matrix": [3, 3], "x": 2, "y": 1.5}, + {"matrix": [3, 4], "x": 3, "y": 1.5}, + {"matrix": [3, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 5], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [3, 7], "x": 7, "y": 1.5}, + {"matrix": [3, 8], "x": 8, "y": 1.5}, + {"matrix": [3, 9], "x": 9, "y": 1.5}, + {"matrix": [3, 10], "x": 10, "y": 1.5}, + {"matrix": [2, 10], "x": 11, "y": 1.5}, + {"matrix": [2, 8], "x": 12, "y": 1.5}, + {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 12], "x": 15.25, "y": 1.5}, + {"matrix": [2, 14], "x": 16.25, "y": 1.5}, + {"matrix": [2, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [6, 11], "x": 18.5, "y": 1.5}, + {"matrix": [6, 12], "x": 19.5, "y": 1.5}, + {"matrix": [6, 13], "x": 20.5, "y": 1.5}, + {"matrix": [7, 13], "x": 21.5, "y": 1.5}, + + {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 2.5}, + {"matrix": [4, 3], "x": 2.5, "y": 2.5}, + {"matrix": [4, 4], "x": 3.5, "y": 2.5}, + {"matrix": [4, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 5], "x": 5.5, "y": 2.5}, + {"matrix": [1, 7], "x": 6.5, "y": 2.5}, + {"matrix": [4, 7], "x": 7.5, "y": 2.5}, + {"matrix": [4, 8], "x": 8.5, "y": 2.5}, + {"matrix": [4, 9], "x": 9.5, "y": 2.5}, + {"matrix": [4, 10], "x": 10.5, "y": 2.5}, + {"matrix": [1, 10], "x": 11.5, "y": 2.5}, + {"matrix": [1, 8], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 11], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 13], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 11], "x": 18.5, "y": 2.5}, + {"matrix": [4, 12], "x": 19.5, "y": 2.5}, + {"matrix": [4, 13], "x": 20.5, "y": 2.5}, + {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5}, + {"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": [0, 5], "x": 5.75, "y": 3.5}, + {"matrix": [0, 7], "x": 6.75, "y": 3.5}, + {"matrix": [5, 7], "x": 7.75, "y": 3.5}, + {"matrix": [5, 8], "x": 8.75, "y": 3.5}, + {"matrix": [5, 9], "x": 9.75, "y": 3.5}, + {"matrix": [5, 10], "x": 10.75, "y": 3.5}, + {"matrix": [0, 10], "x": 11.75, "y": 3.5}, + {"matrix": [6, 10], "x": 12.75, "y": 3.5}, + {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [1, 11], "x": 18.5, "y": 3.5}, + {"matrix": [1, 12], "x": 19.5, "y": 3.5}, + {"matrix": [1, 13], "x": 20.5, "y": 3.5}, + + {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [0, 3], "x": 1.25, "y": 4.5}, + {"matrix": [6, 2], "x": 2.25, "y": 4.5}, + {"matrix": [6, 3], "x": 3.25, "y": 4.5}, + {"matrix": [6, 4], "x": 4.25, "y": 4.5}, + {"matrix": [6, 5], "x": 5.25, "y": 4.5}, + {"matrix": [7, 5], "x": 6.25, "y": 4.5}, + {"matrix": [7, 7], "x": 7.25, "y": 4.5}, + {"matrix": [6, 7], "x": 8.25, "y": 4.5}, + {"matrix": [6, 8], "x": 9.25, "y": 4.5}, + {"matrix": [6, 9], "x": 10.25, "y": 4.5}, + {"matrix": [7, 10], "x": 11.25, "y": 4.5}, + {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [0, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 11], "x": 18.5, "y": 4.5}, + {"matrix": [5, 12], "x": 19.5, "y": 4.5}, + {"matrix": [5, 13], "x": 20.5, "y": 4.5}, + {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [7, 14], "x": 15.25, "y": 5.5}, + {"matrix": [7, 11], "x": 16.25, "y": 5.5}, + {"matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [0, 13], "x": 20.5, "y": 5.5} + ] } } } diff --git a/keyboards/converter/modelm101/modelm101.c b/keyboards/converter/modelm101/modelm101.c index 02d861b917d8..fa8669dc8105 100644 --- a/keyboards/converter/modelm101/modelm101.c +++ b/keyboards/converter/modelm101/modelm101.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "modelm101.h" +#include "quantum.h" void led_init_ports(void) { /* Setting status LEDs pins to output and +5V (off) */ diff --git a/keyboards/converter/modelm101/modelm101.h b/keyboards/converter/modelm101/modelm101.h deleted file mode 100644 index 1a2cdc8b68b2..000000000000 --- a/keyboards/converter/modelm101/modelm101.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * 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" - -/* This a shortcut to help you visually see your layout. - * The first section contains "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \ -) \ -{ \ -/* 00 */ { KC_NO, KC_NO, K5A, K1B, K5E, K2F, K5F, K2G, K5G, KC_NO, K2L, KC_NO, K0I, K0J, K1N, K0B }, \ -/* 01 */ { KC_NO, K1A, K3A, K2A, K5D, K3F, K4N, K3G, K3M, K5H, K3L, K2O, K2P, K2Q, KC_NO, KC_NO }, \ -/* 02 */ { K0A, KC_NO, K4A, K5B, K5C, K4F, K5J, K4G, K4M, K5I, K4L, K3O, K4O, K4Q, K4P, KC_NO }, \ -/* 03 */ { KC_NO, KC_NO, K4B, K4C, K4D, K4E, K5K, K4H, K4I, K4J, K4K, K5L, K5M, K3Q, K3P, K5N }, \ -/* 04 */ { KC_NO, KC_NO, K3B, K3C, K3D, K3E, KC_NO, K3H, K3I, K3J, K3K, K3R, K3S, K3T, K3U, K5O }, \ -/* 05 */ { KC_NO, KC_NO, K2B, K2C, K2D, K2E, K3N, K2H, K2I, K2J, K2K, K1O, K1P, K1Q, K1R, KC_NO }, \ -/* 06 */ { K0E, K1M, K1C, K1D, K1E, K1F, K2N, K1I, K1J, K1K, K2M, K4R, K4S, K4T, K5P, KC_NO }, \ -/* 07 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C, K1H, KC_NO, KC_NO, K1L, K0G, K0H, K4U, K0F, K0D }, \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ \ No newline at end of file diff --git a/keyboards/converter/modelm101_teensy2/info.json b/keyboards/converter/modelm101_teensy2/info.json index efeb041c3c1f..f5558dcfffc4 100644 --- a/keyboards/converter/modelm101_teensy2/info.json +++ b/keyboards/converter/modelm101_teensy2/info.json @@ -21,7 +21,129 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "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.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, "w":2}, {"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":"Num Lock", "x":18.5, "y":1.5}, {"label":"/", "x":19.5, "y":1.5}, {"label":"*", "x":20.5, "y":1.5}, {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5}, {"label":"8", "x":19.5, "y":2.5}, {"label":"9", "x":20.5, "y":2.5}, {"label":"+", "x":21.5, "y":2.5, "h":2}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.5}, {"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":"~", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"4", "x":18.5, "y":3.5}, {"label":"5", "x":19.5, "y":3.5}, {"label":"6", "x":20.5, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"label":"|", "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":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"1", "x":18.5, "y":4.5}, {"label":"2", "x":19.5, "y":4.5}, {"label":"3", "x":20.5, "y":4.5}, {"label":"Enter", "x":21.5, "y":4.5, "h":2}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}, {"label":"0", "x":18.5, "y":5.5, "w":2}, {"label":".", "x":20.5, "y":5.5}] + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [2, 3], "x": 2, "y": 0}, + {"matrix": [2, 4], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [1, 9], "x": 8.5, "y": 0}, + {"matrix": [2, 9], "x": 9.5, "y": 0}, + + {"matrix": [2, 6], "x": 11, "y": 0}, + {"matrix": [3, 6], "x": 12, "y": 0}, + {"matrix": [3, 11], "x": 13, "y": 0}, + {"matrix": [3, 12], "x": 14, "y": 0}, + + {"matrix": [3, 15], "x": 15.25, "y": 0}, + {"matrix": [4, 15], "x": 16.25, "y": 0}, + {"matrix": [6, 14], "x": 17.25, "y": 0}, + + {"matrix": [2, 2], "x": 0, "y": 1.5}, + {"matrix": [3, 2], "x": 1, "y": 1.5}, + {"matrix": [3, 3], "x": 2, "y": 1.5}, + {"matrix": [3, 4], "x": 3, "y": 1.5}, + {"matrix": [3, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 5], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [3, 7], "x": 7, "y": 1.5}, + {"matrix": [3, 8], "x": 8, "y": 1.5}, + {"matrix": [3, 9], "x": 9, "y": 1.5}, + {"matrix": [3, 10], "x": 10, "y": 1.5}, + {"matrix": [2, 10], "x": 11, "y": 1.5}, + {"matrix": [2, 8], "x": 12, "y": 1.5}, + {"matrix": [1, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 12], "x": 15.25, "y": 1.5}, + {"matrix": [2, 14], "x": 16.25, "y": 1.5}, + {"matrix": [2, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [6, 11], "x": 18.5, "y": 1.5}, + {"matrix": [6, 12], "x": 19.5, "y": 1.5}, + {"matrix": [6, 13], "x": 20.5, "y": 1.5}, + {"matrix": [7, 13], "x": 21.5, "y": 1.5}, + + {"matrix": [1, 2], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 2.5}, + {"matrix": [4, 3], "x": 2.5, "y": 2.5}, + {"matrix": [4, 4], "x": 3.5, "y": 2.5}, + {"matrix": [4, 5], "x": 4.5, "y": 2.5}, + {"matrix": [1, 5], "x": 5.5, "y": 2.5}, + {"matrix": [1, 7], "x": 6.5, "y": 2.5}, + {"matrix": [4, 7], "x": 7.5, "y": 2.5}, + {"matrix": [4, 8], "x": 8.5, "y": 2.5}, + {"matrix": [4, 9], "x": 9.5, "y": 2.5}, + {"matrix": [4, 10], "x": 10.5, "y": 2.5}, + {"matrix": [1, 10], "x": 11.5, "y": 2.5}, + {"matrix": [1, 8], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 11], "x": 15.25, "y": 2.5}, + {"matrix": [3, 14], "x": 16.25, "y": 2.5}, + {"matrix": [3, 13], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 11], "x": 18.5, "y": 2.5}, + {"matrix": [4, 12], "x": 19.5, "y": 2.5}, + {"matrix": [4, 13], "x": 20.5, "y": 2.5}, + {"matrix": [4, 14], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [1, 3], "x": 0, "y": 3.5, "w": 1.5}, + {"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": [0, 5], "x": 5.75, "y": 3.5}, + {"matrix": [0, 7], "x": 6.75, "y": 3.5}, + {"matrix": [5, 7], "x": 7.75, "y": 3.5}, + {"matrix": [5, 8], "x": 8.75, "y": 3.5}, + {"matrix": [5, 9], "x": 9.75, "y": 3.5}, + {"matrix": [5, 10], "x": 10.75, "y": 3.5}, + {"matrix": [0, 10], "x": 11.75, "y": 3.5}, + {"matrix": [6, 10], "x": 12.75, "y": 3.5}, + {"matrix": [6, 6], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [1, 11], "x": 18.5, "y": 3.5}, + {"matrix": [1, 12], "x": 19.5, "y": 3.5}, + {"matrix": [1, 13], "x": 20.5, "y": 3.5}, + + {"matrix": [1, 1], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [0, 3], "x": 1.25, "y": 4.5}, + {"matrix": [6, 2], "x": 2.25, "y": 4.5}, + {"matrix": [6, 3], "x": 3.25, "y": 4.5}, + {"matrix": [6, 4], "x": 4.25, "y": 4.5}, + {"matrix": [6, 5], "x": 5.25, "y": 4.5}, + {"matrix": [7, 5], "x": 6.25, "y": 4.5}, + {"matrix": [7, 7], "x": 7.25, "y": 4.5}, + {"matrix": [6, 7], "x": 8.25, "y": 4.5}, + {"matrix": [6, 8], "x": 9.25, "y": 4.5}, + {"matrix": [6, 9], "x": 10.25, "y": 4.5}, + {"matrix": [7, 10], "x": 11.25, "y": 4.5}, + {"matrix": [6, 1], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [0, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 11], "x": 18.5, "y": 4.5}, + {"matrix": [5, 12], "x": 19.5, "y": 4.5}, + {"matrix": [5, 13], "x": 20.5, "y": 4.5}, + {"matrix": [5, 14], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [0, 15], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [7, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [7, 15], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [6, 0], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [7, 14], "x": 15.25, "y": 5.5}, + {"matrix": [7, 11], "x": 16.25, "y": 5.5}, + {"matrix": [7, 12], "x": 17.25, "y": 5.5}, + + {"matrix": [0, 12], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [0, 13], "x": 20.5, "y": 5.5} + ] } } } diff --git a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.h b/keyboards/converter/modelm101_teensy2/modelm101_teensy2.h deleted file mode 100644 index 1a2cdc8b68b2..000000000000 --- a/keyboards/converter/modelm101_teensy2/modelm101_teensy2.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 iw0rm3r - * - * 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" - -/* This a shortcut to help you visually see your layout. - * The first section contains "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \ -) \ -{ \ -/* 00 */ { KC_NO, KC_NO, K5A, K1B, K5E, K2F, K5F, K2G, K5G, KC_NO, K2L, KC_NO, K0I, K0J, K1N, K0B }, \ -/* 01 */ { KC_NO, K1A, K3A, K2A, K5D, K3F, K4N, K3G, K3M, K5H, K3L, K2O, K2P, K2Q, KC_NO, KC_NO }, \ -/* 02 */ { K0A, KC_NO, K4A, K5B, K5C, K4F, K5J, K4G, K4M, K5I, K4L, K3O, K4O, K4Q, K4P, KC_NO }, \ -/* 03 */ { KC_NO, KC_NO, K4B, K4C, K4D, K4E, K5K, K4H, K4I, K4J, K4K, K5L, K5M, K3Q, K3P, K5N }, \ -/* 04 */ { KC_NO, KC_NO, K3B, K3C, K3D, K3E, KC_NO, K3H, K3I, K3J, K3K, K3R, K3S, K3T, K3U, K5O }, \ -/* 05 */ { KC_NO, KC_NO, K2B, K2C, K2D, K2E, K3N, K2H, K2I, K2J, K2K, K1O, K1P, K1Q, K1R, KC_NO }, \ -/* 06 */ { K0E, K1M, K1C, K1D, K1E, K1F, K2N, K1I, K1J, K1K, K2M, K4R, K4S, K4T, K5P, KC_NO }, \ -/* 07 */ { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1G, K0C, K1H, KC_NO, KC_NO, K1L, K0G, K0H, K4U, K0F, K0D }, \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ \ No newline at end of file diff --git a/keyboards/converter/palm_usb/stowaway/info.json b/keyboards/converter/palm_usb/stowaway/info.json index 34b1e1f83fb2..9a263327adf8 100644 --- a/keyboards/converter/palm_usb/stowaway/info.json +++ b/keyboards/converter/palm_usb/stowaway/info.json @@ -1,77 +1,85 @@ { - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"1", "x":0.5, "y":0}, - {"label":"2", "x":1.5, "y":0}, - {"label":"3", "x":2.5, "y":0}, - {"label":"4", "x":3.5, "y":0}, - {"label":"5", "x":4.5, "y":0}, - {"label":"6", "x":5.5, "y":0}, - {"label":"7", "x":6.5, "y":0}, - {"label":"8", "x":7.5, "y":0}, - {"label":"9", "x":8.5, "y":0}, - {"label":"0", "x":9.5, "y":0}, - {"label":"MINS", "x":10.5, "y":0}, - {"label":"EQL", "x":11.5, "y":0}, - {"label":"BACK", "x":12.5, "y":0, "w":1.5}, - {"label":"APP0", "x":14.25, "y":1, "h":0.6875}, - {"label":"TAB", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"LBRC", "x":11, "y":1}, - {"label":"RBRC", "x":12, "y":1}, - {"label":"BSLS", "x":13, "y":1}, - {"label":"APP1", "x":14.25, "y":1.6875, "h":0.6875}, - {"label":"CAPS", "x":0, "y":2, "w":1.25}, - {"label":"A", "x":1.25, "y":2}, - {"label":"S", "x":2.25, "y":2}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2}, - {"label":"G", "x":5.25, "y":2}, - {"label":"H", "x":6.25, "y":2}, - {"label":"J", "x":7.25, "y":2}, - {"label":"K", "x":8.25, "y":2}, - {"label":"L", "x":9.25, "y":2}, - {"label":"SCLN", "x":10.25, "y":2}, - {"label":"QUOT", "x":11.25, "y":2}, - {"label":"ENT", "x":12.25, "y":2, "w":1.75}, - {"label":"APP2", "x":14.25, "y":2.375, "h":0.6875}, - {"label":"LSFT", "x":0, "y":3, "w":1.75}, - {"label":"Z", "x":1.75, "y":3}, - {"label":"X", "x":2.75, "y":3}, - {"label":"C", "x":3.75, "y":3}, - {"label":"V", "x":4.75, "y":3}, - {"label":"B", "x":5.75, "y":3}, - {"label":"N", "x":6.75, "y":3}, - {"label":"M", "x":7.75, "y":3}, - {"label":"COMM", "x":8.75, "y":3}, - {"label":"DOT", "x":9.75, "y":3}, - {"label":"SLSH", "x":10.75, "y":3}, - {"label":"RSFT", "x":11.75, "y":3, "w":1.25}, - {"label":"UP", "x":13, "y":3}, - {"label":"APP3", "x":14.25, "y":3.0625, "h":0.6875}, - {"label":"LCTL", "x":0, "y":4, "w":1.25}, - {"label":"FN", "x":1.25, "y":4}, - {"label":"LALT", "x":2.25, "y":4}, - {"label":"CMD", "x":3.25, "y":4}, - {"label":"SPACE", "x":4.25, "y":4, "w":3.5}, - {"label":"SPACE/New", "x":7.75, "y":4}, - {"label":"GRAVE", "x":8.75, "y":4}, - {"label":"DONE", "x":9.75, "y":4}, - {"label":"DEL", "x":10.75, "y":4, "w":1.25}, - {"label":"LEFT", "x":12, "y":4}, - {"label":"DOWN", "x":13, "y":4}, - {"label":"RIGHT", "x":14, "y":4} - ] + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [6, 4], "x": 7.5, "y": 0}, + {"matrix": [6, 5], "x": 8.5, "y": 0}, + {"matrix": [6, 6], "x": 9.5, "y": 0}, + {"matrix": [6, 0], "x": 10.5, "y": 0}, + {"matrix": [6, 1], "x": 11.5, "y": 0}, + {"matrix": [6, 2], "x": 12.5, "y": 0, "w": 1.5}, + + {"matrix": [6, 3], "x": 14.25, "y": 1, "h": 0.6875}, + + {"matrix": [3, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [7, 4], "x": 7, "y": 1}, + {"matrix": [7, 5], "x": 8, "y": 1}, + {"matrix": [7, 6], "x": 9, "y": 1}, + {"matrix": [7, 7], "x": 10, "y": 1}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + + {"matrix": [7, 3], "x": 14.25, "y": 1.6875, "h": 0.6875}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [8, 4], "x": 7.25, "y": 2}, + {"matrix": [8, 5], "x": 8.25, "y": 2}, + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 7], "x": 10.25, "y": 2}, + {"matrix": [8, 0], "x": 11.25, "y": 2}, + {"matrix": [8, 1], "x": 12.25, "y": 2, "w": 1.75}, + + {"matrix": [8, 2], "x": 14.25, "y": 2.375, "h": 0.6875}, + + {"matrix": [11, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [0, 3], "x": 1.75, "y": 3}, + {"matrix": [2, 0], "x": 2.75, "y": 3}, + {"matrix": [5, 4], "x": 3.75, "y": 3}, + {"matrix": [5, 5], "x": 4.75, "y": 3}, + {"matrix": [5, 6], "x": 5.75, "y": 3}, + {"matrix": [5, 7], "x": 6.75, "y": 3}, + {"matrix": [9, 4], "x": 7.75, "y": 3}, + {"matrix": [9, 5], "x": 8.75, "y": 3}, + {"matrix": [9, 6], "x": 9.75, "y": 3}, + {"matrix": [9, 0], "x": 10.75, "y": 3}, + {"matrix": [11, 1], "x": 11.75, "y": 3, "w": 1.25}, + {"matrix": [9, 1], "x": 13, "y": 3}, + + {"matrix": [9, 2], "x": 14.25, "y": 3.0625, "h": 0.6875}, + + {"matrix": [3, 2], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 1.25, "y": 4}, + {"matrix": [4, 3], "x": 2.25, "y": 4}, + {"matrix": [1, 0], "x": 3.25, "y": 4}, + {"matrix": [2, 7], "x": 4.25, "y": 4, "w": 3.5}, + {"matrix": [6, 7], "x": 7.75, "y": 4}, + {"matrix": [1, 7], "x": 8.75, "y": 4}, + {"matrix": [9, 7], "x": 9.75, "y": 4}, + {"matrix": [10, 0], "x": 10.75, "y": 4, "w": 1.25}, + {"matrix": [10, 1], "x": 12, "y": 4}, + {"matrix": [10, 2], "x": 13, "y": 4}, + {"matrix": [10, 3], "x": 14, "y": 4} + ] + } } - } } diff --git a/keyboards/converter/palm_usb/stowaway/stowaway.h b/keyboards/converter/palm_usb/stowaway/stowaway.h deleted file mode 100644 index 71af9bf4a813..000000000000 --- a/keyboards/converter/palm_usb/stowaway/stowaway.h +++ /dev/null @@ -1,53 +0,0 @@ -/* -Copyright 2018 milestogo - -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" - - -/* Stowaway Keyboard - based on matrix from http://www.splorp.com/pdf/stowawayhwref.pdf - - 1, 2, 3, 4, 5, 6, 7, 8, 9, 0, MINS, EQL, BACK APP0, - TAB, Q, W, E, R, T, Y, U, I, O, P, LBRC, RBRC, BSLS, APP1, - CAPS, A, S, D, F, G, H, J, K, L, SCLN, QUOT, ENT, APP2, - LSFT, Z, X, C, V, B, N, M, COMM, DOT, SLSH, RSFT, UP, APP3, - LCTL, FN, LALT, CMD, SPACE,SPACE,GRAVE,DONE, DEL, LEFT, DOWN, RIGHT - -*/ -#define LAYOUT( \ - K000, K001, K002, K004, K005, K006, K007, K064, K065, K066, K060, K061, K062, K063,\ - K031, K011, K012, K013, K014, K015, K016, K074, K075, K076, K077, K070, K071, K072, K073,\ - K030, K021, K022, K023, K024, K025, K026, K084, K085, K086, K087, K080, K081, K082,\ - K110, K003, K020, K054, K055, K056, K057, K094, K095, K096, K090, K111, K091, K092,\ - K032, K042, K043, K010, K027, K067, K017, K097, K100, K101, K102, K103 \ -) { \ - { K000, K001, K002 , K003, K004, K005, K006, K007 }, \ - { K010, K011, K012 , K013, K014, K015, K016, K017 }, \ - { K020, K021, K022 , K023, K024, K025, K026, K027 }, \ - { K030, K031, K032 , KC_NO,KC_NO, KC_NO,KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K042 , K043, KC_NO, KC_NO,KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO,K054, K055, K056, K057 }, \ - { K060, K061, K062 , K063, K064, K065, K066, K067 }, \ - { K070, K071, K072 , K073, K074, K075, K076, K077 }, \ - { K080, K081, K082 , KC_NO,K084, K085, K086, K087 }, \ - { K090, K091, K092 , KC_NO,K094, K095, K096, K097 }, \ - { K100, K101, K102 , K103, KC_NO, KC_NO,KC_NO, KC_NO }, \ - { K110, K111, KC_NO, KC_NO,KC_NO, KC_NO,KC_NO, KC_NO } \ -} - diff --git a/keyboards/converter/periboard_512/info.json b/keyboards/converter/periboard_512/info.json index b21e21abdff8..08cc8ee9bf33 100644 --- a/keyboards/converter/periboard_512/info.json +++ b/keyboards/converter/periboard_512/info.json @@ -18,115 +18,127 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0, "h":0.833}, - {"label":"F1", "x":2, "y":0, "h":0.833}, - {"label":"F2", "x":3, "y":0, "h":0.833}, - {"label":"F3", "x":4, "y":0, "h":0.833}, - {"label":"F4", "x":5, "y":0, "h":0.833}, - {"label":"F5", "x":6, "y":0, "h":0.833}, - {"label":"F6", "x":7, "y":0, "h":0.833}, - {"label":"F7", "x":8, "y":0, "h":0.833}, - {"label":"F8", "x":9, "y":0, "h":0.833}, - {"label":"F9", "x":10, "y":0, "h":0.833}, - {"label":"F10", "x":11, "y":0, "h":0.833}, - {"label":"F11", "x":12, "y":0, "h":0.833}, - {"label":"F12", "x":13, "y":0, "h":0.833}, - {"label":"PrtSc", "x":14.25, "y":0, "h":0.833}, - {"label":"Scroll Lock", "x":15.25, "y":0, "h":0.833}, - {"label":"Pause", "x":16.25, "y":0, "h":0.833}, - - {"label":"~", "x":0, "y":1.333}, - {"label":"!", "x":1, "y":1.333}, - {"label":"@", "x":2, "y":1.333}, - {"label":"#", "x":3, "y":1.333}, - {"label":"$", "x":4, "y":1.333}, - {"label":"%", "x":5, "y":1.333}, - {"label":"^", "x":6, "y":1.333}, - {"label":"&", "x":7, "y":1.333}, - {"label":"*", "x":8, "y":1.333}, - {"label":"(", "x":9, "y":1.333}, - {"label":")", "x":10, "y":1.333}, - {"label":"_", "x":11, "y":1.333}, - {"label":"+", "x":12, "y":1.333}, - {"label":"Backspace", "x":13, "y":1.333, "w":2}, - {"label":"Insert", "x":16.25, "y":3, "h":0.833}, - {"label":"Home", "x":15.25, "y":1.333, "h":0.833}, - {"label":"PgUp", "x":16.25, "y":1.333, "h":0.833}, - {"label":"Num Lock", "x":17.5, "y":1.333}, - {"label":"/", "x":18.5, "y":1.333}, - {"label":"*", "x":19.5, "y":1.333}, - {"label":"-", "x":20.5, "y":1.333}, - - {"label":"Tab", "x":0, "y":2.333, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.333}, - {"label":"W", "x":2.5, "y":2.333}, - {"label":"E", "x":3.5, "y":2.333}, - {"label":"R", "x":4.5, "y":2.333}, - {"label":"T", "x":5.5, "y":2.333}, - {"label":"Y", "x":6.5, "y":2.333}, - {"label":"U", "x":7.5, "y":2.333}, - {"label":"I", "x":8.5, "y":2.333}, - {"label":"O", "x":9.5, "y":2.333}, - {"label":"P", "x":10.5, "y":2.333}, - {"label":"{", "x":11.5, "y":2.333}, - {"label":"}", "x":12.5, "y":2.333}, - {"label":"|", "x":13.5, "y":2.333, "w":1.5}, - {"label":"Delete", "x":15.25, "y":3, "h":0.833}, - {"label":"End", "x":15.25, "y":2.167, "h":0.833}, - {"label":"PgDn", "x":16.25, "y":2.167, "h":0.833}, - {"label":"7", "x":17.5, "y":2.333}, - {"label":"8", "x":18.5, "y":2.333}, - {"label":"9", "x":19.5, "y":2.333}, - {"label":"+", "x":20.5, "y":2.333, "h":2}, - - {"label":"Caps Lock", "x":0, "y":3.333, "w":1.75}, - {"label":"A", "x":1.75, "y":3.333}, - {"label":"S", "x":2.75, "y":3.333}, - {"label":"D", "x":3.75, "y":3.333}, - {"label":"F", "x":4.75, "y":3.333}, - {"label":"G", "x":5.75, "y":3.333}, - {"label":"H", "x":6.75, "y":3.333}, - {"label":"J", "x":7.75, "y":3.333}, - {"label":"K", "x":8.75, "y":3.333}, - {"label":"L", "x":9.75, "y":3.333}, - {"label":":", "x":10.75, "y":3.333}, - {"label":"\"", "x":11.75, "y":3.333}, - {"label":"Enter", "x":12.75, "y":3.333, "w":2.25}, - {"label":"4", "x":17.5, "y":3.333}, - {"label":"5", "x":18.5, "y":3.333}, - {"label":"6", "x":19.5, "y":3.333}, - - {"label":"Shift", "x":0, "y":4.333, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.333}, - {"label":"X", "x":3.25, "y":4.333}, - {"label":"C", "x":4.25, "y":4.333}, - {"label":"V", "x":5.25, "y":4.333}, - {"label":"B", "x":6.25, "y":4.333}, - {"label":"N", "x":7.25, "y":4.333}, - {"label":"M", "x":8.25, "y":4.333}, - {"label":"<", "x":9.25, "y":4.333}, - {"label":">", "x":10.25, "y":4.333}, - {"label":"?", "x":11.25, "y":4.333}, - {"label":"Shift", "x":12.25, "y":4.333, "w":2.75}, - {"label":"Up", "x":15.75, "y":3.833, "h":0.833}, - {"label":"1", "x":17.5, "y":4.333}, - {"label":"2", "x":18.5, "y":4.333}, - {"label":"3", "x":19.5, "y":4.333}, - {"label":"Enter", "x":20.5, "y":4.333, "h":2}, - - {"label":"Ctrl", "x":0, "y":5.333, "w":1.25}, - {"label":"GUI", "x":1.25, "y":5.333, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.333, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.333, "w":6.25}, - {"label":"Alt", "x":10, "y":5.333, "w":1.25}, - {"label":"GUI", "x":11.25, "y":5.333, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.333, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":5.333, "w":1.25}, - {"label":"Left", "x":15.25, "y":4.667, "h":0.833}, - {"label":"Down", "x":15.75, "y":5.5, "h":0.833}, - {"label":"Right", "x":16.25, "y":4.667, "h":0.833}, - {"label":"0", "x":17.5, "y":5.333, "w":2}, - {"label":".", "x":19.5, "y":5.333} + {"matrix": [5, 7], "x": 0, "y": 0, "h": 0.833}, + + {"matrix": [0, 6], "x": 2, "y": 0, "h": 0.833}, + {"matrix": [0, 5], "x": 3, "y": 0, "h": 0.833}, + {"matrix": [4, 5], "x": 4, "y": 0, "h": 0.833}, + {"matrix": [5, 5], "x": 5, "y": 0, "h": 0.833}, + {"matrix": [5, 16], "x": 6, "y": 0, "h": 0.833}, + {"matrix": [5, 3], "x": 7, "y": 0, "h": 0.833}, + {"matrix": [4, 2], "x": 8, "y": 0, "h": 0.833}, + {"matrix": [0, 2], "x": 9, "y": 0, "h": 0.833}, + {"matrix": [0, 16], "x": 10, "y": 0, "h": 0.833}, + {"matrix": [1, 16], "x": 11, "y": 0, "h": 0.833}, + {"matrix": [1, 14], "x": 12, "y": 0, "h": 0.833}, + {"matrix": [1, 15], "x": 13, "y": 0, "h": 0.833}, + {"matrix": [1, 11], "x": 14.25, "y": 0, "h": 0.833}, + {"matrix": [2, 11], "x": 15.25, "y": 0, "h": 0.833}, + {"matrix": [6, 12], "x": 16.25, "y": 0, "h": 0.833}, + + {"matrix": [0, 7], "x": 0, "y": 1.333}, + {"matrix": [1, 7], "x": 1, "y": 1.333}, + {"matrix": [1, 6], "x": 2, "y": 1.333}, + {"matrix": [1, 5], "x": 3, "y": 1.333}, + {"matrix": [1, 10], "x": 4, "y": 1.333}, + {"matrix": [0, 10], "x": 5, "y": 1.333}, + {"matrix": [0, 18], "x": 6, "y": 1.333}, + {"matrix": [1, 18], "x": 7, "y": 1.333}, + {"matrix": [1, 3], "x": 8, "y": 1.333}, + {"matrix": [1, 2], "x": 9, "y": 1.333}, + {"matrix": [1, 1], "x": 10, "y": 1.333}, + {"matrix": [0, 1], "x": 11, "y": 1.333}, + {"matrix": [0, 3], "x": 12, "y": 1.333}, + {"matrix": [4, 16], "x": 13, "y": 1.333, "w": 2}, + + {"matrix": [0, 15], "x": 16.25, "y": 3, "h": 0.833}, + + {"matrix": [0, 12], "x": 15.25, "y": 1.333, "h": 0.833}, + {"matrix": [0, 13], "x": 16.25, "y": 1.333, "h": 0.833}, + + {"matrix": [6, 14], "x": 17.5, "y": 1.333}, + {"matrix": [6, 15], "x": 18.5, "y": 1.333}, + {"matrix": [6, 13], "x": 19.5, "y": 1.333}, + {"matrix": [7, 13], "x": 20.5, "y": 1.333}, + + {"matrix": [4, 7], "x": 0, "y": 2.333, "w": 1.5}, + {"matrix": [2, 7], "x": 1.5, "y": 2.333}, + {"matrix": [2, 6], "x": 2.5, "y": 2.333}, + {"matrix": [2, 5], "x": 3.5, "y": 2.333}, + {"matrix": [2, 10], "x": 4.5, "y": 2.333}, + {"matrix": [4, 10], "x": 5.5, "y": 2.333}, + {"matrix": [4, 4], "x": 6.5, "y": 2.333}, + {"matrix": [2, 4], "x": 7.5, "y": 2.333}, + {"matrix": [2, 3], "x": 8.5, "y": 2.333}, + {"matrix": [2, 2], "x": 9.5, "y": 2.333}, + {"matrix": [2, 1], "x": 10.5, "y": 2.333}, + {"matrix": [4, 1], "x": 11.5, "y": 2.333}, + {"matrix": [4, 3], "x": 12.5, "y": 2.333}, + {"matrix": [3, 16], "x": 13.5, "y": 2.333, "w": 1.5}, + + {"matrix": [0, 14], "x": 15.25, "y": 3, "h": 0.833}, + + {"matrix": [1, 12], "x": 15.25, "y": 2.167, "h": 0.833}, + {"matrix": [1, 13], "x": 16.25, "y": 2.167, "h": 0.833}, + + {"matrix": [2, 14], "x": 17.5, "y": 2.333}, + {"matrix": [2, 15], "x": 18.5, "y": 2.333}, + {"matrix": [2, 13], "x": 19.5, "y": 2.333}, + {"matrix": [2, 12], "x": 20.5, "y": 2.333, "h": 2}, + + {"matrix": [4, 6], "x": 0, "y": 3.333, "w": 1.75}, + {"matrix": [3, 7], "x": 1.75, "y": 3.333}, + {"matrix": [3, 6], "x": 2.75, "y": 3.333}, + {"matrix": [3, 5], "x": 3.75, "y": 3.333}, + {"matrix": [3, 10], "x": 4.75, "y": 3.333}, + {"matrix": [5, 10], "x": 5.75, "y": 3.333}, + {"matrix": [5, 4], "x": 6.75, "y": 3.333}, + {"matrix": [3, 4], "x": 7.75, "y": 3.333}, + {"matrix": [3, 3], "x": 8.75, "y": 3.333}, + {"matrix": [3, 2], "x": 9.75, "y": 3.333}, + {"matrix": [3, 1], "x": 10.75, "y": 3.333}, + {"matrix": [5, 1], "x": 11.75, "y": 3.333}, + {"matrix": [6, 16], "x": 12.75, "y": 3.333, "w": 2.25}, + + {"matrix": [4, 14], "x": 17.5, "y": 3.333}, + {"matrix": [4, 15], "x": 18.5, "y": 3.333}, + {"matrix": [4, 13], "x": 19.5, "y": 3.333}, + + {"matrix": [4, 9], "x": 0, "y": 4.333, "w": 2.25}, + {"matrix": [6, 7], "x": 2.25, "y": 4.333}, + {"matrix": [6, 6], "x": 3.25, "y": 4.333}, + {"matrix": [6, 5], "x": 4.25, "y": 4.333}, + {"matrix": [6, 10], "x": 5.25, "y": 4.333}, + {"matrix": [7, 10], "x": 6.25, "y": 4.333}, + {"matrix": [7, 4], "x": 7.25, "y": 4.333}, + {"matrix": [6, 4], "x": 8.25, "y": 4.333}, + {"matrix": [6, 3], "x": 9.25, "y": 4.333}, + {"matrix": [6, 2], "x": 10.25, "y": 4.333}, + {"matrix": [7, 1], "x": 11.25, "y": 4.333}, + {"matrix": [6, 9], "x": 12.25, "y": 4.333, "w": 2.75}, + + {"matrix": [5, 12], "x": 15.75, "y": 3.833, "h": 0.833}, + + {"matrix": [3, 14], "x": 17.5, "y": 4.333}, + {"matrix": [3, 15], "x": 18.5, "y": 4.333}, + {"matrix": [3, 13], "x": 19.5, "y": 4.333}, + {"matrix": [3, 12], "x": 20.5, "y": 4.333, "h": 2}, + + {"matrix": [0, 8], "x": 0, "y": 5.333, "w": 1.25}, + {"matrix": [3, 17], "x": 1.25, "y": 5.333, "w": 1.25}, + {"matrix": [5, 11], "x": 2.5, "y": 5.333, "w": 1.25}, + {"matrix": [7, 16], "x": 3.75, "y": 5.333, "w": 6.25}, + {"matrix": [7, 11], "x": 10, "y": 5.333, "w": 1.25}, + {"matrix": [6, 0], "x": 11.25, "y": 5.333, "w": 1.25}, + {"matrix": [2, 17], "x": 12.5, "y": 5.333, "w": 1.25}, + {"matrix": [6, 8], "x": 13.75, "y": 5.333, "w": 1.25}, + + {"matrix": [7, 12], "x": 15.25, "y": 4.667, "h": 0.833}, + {"matrix": [7, 14], "x": 15.75, "y": 5.5, "h": 0.833}, + {"matrix": [7, 15], "x": 16.25, "y": 4.667, "h": 0.833}, + + {"matrix": [5, 15], "x": 17.5, "y": 5.333, "w": 2}, + {"matrix": [5, 13], "x": 19.5, "y": 5.333} ] } } diff --git a/keyboards/converter/periboard_512/periboard_512.h b/keyboards/converter/periboard_512/periboard_512.h deleted file mode 100644 index d79264233916..000000000000 --- a/keyboards/converter/periboard_512/periboard_512.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Sife - * - * 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( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K, K0L, K0M \ -) \ -{ \ - { KC_NO, K4L, K5I, K4M, KC_NO, K5C, K5B, K4A, K0A, KC_NO, K4F, KC_NO, K4P, K4Q, K3O, K4O, K5J, KC_NO, K4G }, \ - { KC_NO, K4K, K4J, K4I, KC_NO, K4D, K4C, K4B, KC_NO, KC_NO, K4E, K5N, K3P, K3Q, K5L, K5M, K5K, KC_NO, K4H }, \ - { KC_NO, K3K, K3J, K3I, K3H, K3D, K3C, K3B, KC_NO, KC_NO, K3E, K5O, K3U, K3T, K3R, K3S, KC_NO, K0G, KC_NO }, \ - { KC_NO, K2K, K2J, K2I, K2H, K2D, K2C, K2B, KC_NO, KC_NO, K2E, KC_NO, K1Q, K1P, K1N, K1O, K3N, K0B, KC_NO }, \ - { KC_NO, K3L, K5H, K3M, K3G, K5D, K2A, K3A, KC_NO, K1A, K3F, KC_NO, KC_NO, K2P, K2N, K2O, K4N, KC_NO, KC_NO }, \ - { KC_NO, K2L, KC_NO, K5G, K2G, K5E, KC_NO, K5A, KC_NO, KC_NO, K2F, K0C, K1M, K0M, KC_NO, K0L, K5F, KC_NO, KC_NO }, \ - { K0F, KC_NO, K1J, K1I, K1H, K1D, K1C, K1B, K0H, K1L, K1E, KC_NO, K5P, K4T, K4R, K4S, K2M, KC_NO, KC_NO }, \ - { KC_NO, K1K, KC_NO, KC_NO, K1G, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1F, K0E, K0I, K4U, K0J, K0K, K0D, KC_NO, KC_NO }, \ -} diff --git a/keyboards/converter/siemens_tastatur/info.json b/keyboards/converter/siemens_tastatur/info.json index db6560a03ad8..8ed2523c2603 100644 --- a/keyboards/converter/siemens_tastatur/info.json +++ b/keyboards/converter/siemens_tastatur/info.json @@ -13,87 +13,87 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "w": 1.5}, - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0, "h": 2}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0, "h": 2}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, - {"x": 17, "y": 0}, - {"x": 18, "y": 0}, - {"x": 19, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + {"matrix": [0, 15], "x": 16, "y": 0}, + {"matrix": [0, 16], "x": 17, "y": 0}, + {"matrix": [0, 17], "x": 18, "y": 0}, + {"matrix": [0, 18], "x": 19, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1, "w": 1.5}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, - {"x": 17, "y": 1}, - {"x": 18, "y": 1}, - {"x": 19, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1}, + {"matrix": [1, 16], "x": 17, "y": 1}, + {"matrix": [1, 17], "x": 18, "y": 1}, + {"matrix": [1, 18], "x": 19, "y": 1}, - {"x": 0, "y": 2, "w": 1.25}, - {"x": 1.25, "y": 2}, - {"x": 2.25, "y": 2}, - {"x": 3.25, "y": 2}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "y": 2}, - {"x": 8.25, "y": 2}, - {"x": 9.25, "y": 2}, - {"x": 10.25, "y": 2}, - {"x": 11.25, "y": 2}, - {"x": 12.25, "y": 2, "w": 1.25}, - {"x": 13.5, "y": 2, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2, "w": 1.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "h": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - {"x": 17, "y": 2}, - {"x": 18, "y": 2}, - {"x": 19, "y": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + {"matrix": [2, 15], "x": 16, "y": 2}, + {"matrix": [2, 16], "x": 17, "y": 2}, + {"matrix": [2, 17], "x": 18, "y": 2}, + {"matrix": [2, 18], "x": 19, "y": 2}, - {"x": 0, "y": 3, "w": 1.75}, - {"x": 1.75, "y": 3}, - {"x": 2.75, "y": 3}, - {"x": 3.75, "y": 3}, - {"x": 4.75, "y": 3}, - {"x": 5.75, "y": 3}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, - {"x": 17, "y": 3}, - {"x": 18, "y": 3}, - {"x": 19, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + {"matrix": [3, 15], "x": 16, "y": 3}, + {"matrix": [3, 16], "x": 17, "y": 3}, + {"matrix": [3, 17], "x": 18, "y": 3}, + {"matrix": [3, 18], "x": 19, "y": 3}, - {"x": 3.5, "y": 4, "w": 6.5} + {"matrix": [3, 11], "x": 3.5, "y": 4, "w": 6.5} ] } } diff --git a/keyboards/converter/siemens_tastatur/siemens_tastatur.h b/keyboards/converter/siemens_tastatur/siemens_tastatur.h deleted file mode 100644 index f14cd82a8d7c..000000000000 --- a/keyboards/converter/siemens_tastatur/siemens_tastatur.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2019 Yiancar - -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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, k0i, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, k1h, k1i, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3e, k3f, k3g, k3h, k3i, \ - k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, k0h, k0i }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, k1f, k1g, k1h, k1i }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, k2h, k2i }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, KC_NO, KC_NO, k3e, k3f, k3g, k3h, k3i }, \ -} diff --git a/keyboards/converter/sun_usb/type3/info.json b/keyboards/converter/sun_usb/type3/info.json index 383d7d65e5df..6e065eaa73b2 100644 --- a/keyboards/converter/sun_usb/type3/info.json +++ b/keyboards/converter/sun_usb/type3/info.json @@ -1,103 +1,118 @@ { - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"STOP", "x":0, "y":0}, - {"label":"AGAIN", "x":1, "y":0}, - {"label":"CAPS LOCK", "x":2.5, "y":0}, - {"label":"F2", "x":3.5, "y":0}, - {"label":"F3", "x":4.5, "y":0, "w":2}, - {"label":"F4", "x":6.5, "y":0, "w":2}, - {"label":"F5", "x":8.5, "y":0, "w":2}, - {"label":"F6", "x":10.5, "y":0, "w":2}, - {"label":"F7", "x":12.5, "y":0, "w":2}, - {"label":"F8", "x":14.5, "y":0}, - {"label":"F9", "x":15.5, "y":0}, - {"label":"BACKSPACE", "x":16.5, "y":0}, - {"label":"R1", "x":18, "y":0}, - {"label":"R2", "x":19, "y":0}, - {"label":"R3", "x":20, "y":0}, - {"label":"PROPS", "x":0, "y":1}, - {"label":"UNDO", "x":1, "y":1}, - {"label":"ESC", "x":2.5, "y":1}, - {"label":"1", "x":3.5, "y":1}, - {"label":"2", "x":4.5, "y":1}, - {"label":"3", "x":5.5, "y":1}, - {"label":"4", "x":6.5, "y":1}, - {"label":"5", "x":7.5, "y":1}, - {"label":"6", "x":8.5, "y":1}, - {"label":"7", "x":9.5, "y":1}, - {"label":"8", "x":10.5, "y":1}, - {"label":"9", "x":11.5, "y":1}, - {"label":"0", "x":12.5, "y":1}, - {"label":"MINUS", "x":13.5, "y":1}, - {"label":"EQUAL", "x":14.5, "y":1}, - {"label":"BACKSLASH", "x":15.5, "y":1}, - {"label":"GRAVE", "x":16.5, "y":1}, - {"label":"R4", "x":18, "y":1}, - {"label":"R5", "x":19, "y":1}, - {"label":"R6", "x":20, "y":1}, - {"label":"FRONT", "x":0, "y":2}, - {"label":"COPY", "x":1, "y":2}, - {"label":"TAB", "x":2.5, "y":2, "w":1.5}, - {"label":"Q", "x":4, "y":2}, - {"label":"W", "x":5, "y":2}, - {"label":"E", "x":6, "y":2}, - {"label":"R", "x":7, "y":2}, - {"label":"T", "x":8, "y":2}, - {"label":"Y", "x":9, "y":2}, - {"label":"U", "x":10, "y":2}, - {"label":"I", "x":11, "y":2}, - {"label":"O", "x":12, "y":2}, - {"label":"P", "x":13, "y":2}, - {"label":"LBRACKET", "x":14, "y":2}, - {"label":"RBRACKET", "x":15, "y":2}, - {"label":"DELETE", "x":16, "y":2, "w":1.5}, - {"label":"R7", "x":18, "y":2}, - {"label":"R8", "x":19, "y":2}, - {"label":"R9", "x":20, "y":2}, - {"label":"OPEN", "x":0, "y":3}, - {"label":"PASTE", "x":1, "y":3}, - {"label":"CONTROL", "x":2.5, "y":3, "w":1.75}, - {"label":"A", "x":4.25, "y":3}, - {"label":"S", "x":5.25, "y":3}, - {"label":"D", "x":6.25, "y":3}, - {"label":"F", "x":7.25, "y":3}, - {"label":"G", "x":8.25, "y":3}, - {"label":"H", "x":9.25, "y":3}, - {"label":"J", "x":10.25, "y":3}, - {"label":"K", "x":11.25, "y":3}, - {"label":"L", "x":12.25, "y":3}, - {"label":"SEMICOLON", "x":13.25, "y":3}, - {"label":"QUOTE", "x":14.25, "y":3}, - {"label":"RETURN", "x":15.25, "y":3, "w":2.25}, - {"label":"R10", "x":18, "y":3}, - {"label":"R11", "x":19, "y":3}, - {"label":"R12", "x":20, "y":3}, - {"label":"FIND", "x":0, "y":4}, - {"label":"CUT", "x":1, "y":4}, - {"label":"LSHIFT", "x":2.5, "y":4, "w":2.25}, - {"label":"Z", "x":4.75, "y":4}, - {"label":"X", "x":5.75, "y":4}, - {"label":"C", "x":6.75, "y":4}, - {"label":"V", "x":7.75, "y":4}, - {"label":"B", "x":8.75, "y":4}, - {"label":"N", "x":9.75, "y":4}, - {"label":"M", "x":10.75, "y":4}, - {"label":"COMMA", "x":11.75, "y":4}, - {"label":"PERIOD", "x":12.75, "y":4}, - {"label":"SLASH", "x":13.75, "y":4}, - {"label":"RSHIFT", "x":14.75, "y":4, "w":1.75}, - {"label":"LINE FEED", "x":16.5, "y":4}, - {"label":"R13", "x":18, "y":4}, - {"label":"R14", "x":19, "y":4}, - {"label":"R15", "x":20, "y":4}, - {"label":"CAPS", "x":2.5, "y":5, "w":1.25}, - {"label":"LEFT", "x":3.75, "y":5, "w":1.5}, - {"label":"SPACE", "x":5.25, "y":5, "w":9}, - {"label":"RIGHT", "x":14.25, "y":5, "w":1.5}, - {"label":"ALTERNATE", "x":15.75, "y":5, "w":1.75} - ] + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 1], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + + {"matrix": [0, 5], "x": 2.5, "y": 0}, + {"matrix": [0, 6], "x": 3.5, "y": 0}, + {"matrix": [1, 0], "x": 4.5, "y": 0, "w": 2}, + {"matrix": [1, 2], "x": 6.5, "y": 0, "w": 2}, + {"matrix": [1, 4], "x": 8.5, "y": 0, "w": 2}, + {"matrix": [1, 6], "x": 10.5, "y": 0, "w": 2}, + {"matrix": [2, 0], "x": 12.5, "y": 0, "w": 2}, + {"matrix": [2, 1], "x": 14.5, "y": 0}, + {"matrix": [2, 2], "x": 15.5, "y": 0}, + {"matrix": [5, 3], "x": 16.5, "y": 0}, + + {"matrix": [2, 5], "x": 18, "y": 0}, + {"matrix": [2, 6], "x": 19, "y": 0}, + {"matrix": [2, 7], "x": 20, "y": 0}, + + {"matrix": [3, 1], "x": 0, "y": 1}, + {"matrix": [3, 2], "x": 1, "y": 1}, + + {"matrix": [3, 5], "x": 2.5, "y": 1}, + {"matrix": [3, 6], "x": 3.5, "y": 1}, + {"matrix": [3, 7], "x": 4.5, "y": 1}, + {"matrix": [4, 0], "x": 5.5, "y": 1}, + {"matrix": [4, 1], "x": 6.5, "y": 1}, + {"matrix": [4, 2], "x": 7.5, "y": 1}, + {"matrix": [4, 3], "x": 8.5, "y": 1}, + {"matrix": [4, 4], "x": 9.5, "y": 1}, + {"matrix": [4, 5], "x": 10.5, "y": 1}, + {"matrix": [4, 6], "x": 11.5, "y": 1}, + {"matrix": [4, 7], "x": 12.5, "y": 1}, + {"matrix": [5, 0], "x": 13.5, "y": 1}, + {"matrix": [5, 1], "x": 14.5, "y": 1}, + {"matrix": [11, 0], "x": 15.5, "y": 1}, + {"matrix": [5, 2], "x": 16.5, "y": 1}, + + {"matrix": [5, 5], "x": 18, "y": 1}, + {"matrix": [5, 6], "x": 19, "y": 1}, + {"matrix": [5, 7], "x": 20, "y": 1}, + + {"matrix": [6, 1], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + + {"matrix": [6, 5], "x": 2.5, "y": 2, "w": 1.5}, + {"matrix": [6, 6], "x": 4, "y": 2}, + {"matrix": [6, 7], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 6, "y": 2}, + {"matrix": [7, 1], "x": 7, "y": 2}, + {"matrix": [7, 2], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 6], "x": 12, "y": 2}, + {"matrix": [7, 7], "x": 13, "y": 2}, + {"matrix": [8, 0], "x": 14, "y": 2}, + {"matrix": [8, 1], "x": 15, "y": 2}, + {"matrix": [8, 2], "x": 16, "y": 2, "w": 1.5}, + + {"matrix": [8, 4], "x": 18, "y": 2}, + {"matrix": [8, 5], "x": 19, "y": 2}, + {"matrix": [8, 6], "x": 20, "y": 2}, + + {"matrix": [9, 0], "x": 0, "y": 3}, + {"matrix": [9, 1], "x": 1, "y": 3}, + + {"matrix": [9, 4], "x": 2.5, "y": 3, "w": 1.75}, + {"matrix": [9, 5], "x": 4.25, "y": 3}, + {"matrix": [9, 6], "x": 5.25, "y": 3}, + {"matrix": [9, 7], "x": 6.25, "y": 3}, + {"matrix": [10, 0], "x": 7.25, "y": 3}, + {"matrix": [10, 1], "x": 8.25, "y": 3}, + {"matrix": [10, 2], "x": 9.25, "y": 3}, + {"matrix": [10, 3], "x": 10.25, "y": 3}, + {"matrix": [10, 4], "x": 11.25, "y": 3}, + {"matrix": [10, 5], "x": 12.25, "y": 3}, + {"matrix": [10, 6], "x": 13.25, "y": 3}, + {"matrix": [10, 7], "x": 14.25, "y": 3}, + {"matrix": [11, 1], "x": 15.25, "y": 3, "w": 2.25}, + + {"matrix": [11, 3], "x": 18, "y": 3}, + {"matrix": [11, 4], "x": 19, "y": 3}, + {"matrix": [11, 5], "x": 20, "y": 3}, + + {"matrix": [11, 7], "x": 0, "y": 4}, + {"matrix": [12, 1], "x": 1, "y": 4}, + + {"matrix": [12, 3], "x": 2.5, "y": 4, "w": 2.25}, + {"matrix": [12, 4], "x": 4.75, "y": 4}, + {"matrix": [12, 5], "x": 5.75, "y": 4}, + {"matrix": [12, 6], "x": 6.75, "y": 4}, + {"matrix": [12, 7], "x": 7.75, "y": 4}, + {"matrix": [13, 0], "x": 8.75, "y": 4}, + {"matrix": [13, 1], "x": 9.75, "y": 4}, + {"matrix": [13, 2], "x": 10.75, "y": 4}, + {"matrix": [13, 3], "x": 11.75, "y": 4}, + {"matrix": [13, 4], "x": 12.75, "y": 4}, + {"matrix": [13, 5], "x": 13.75, "y": 4}, + {"matrix": [13, 6], "x": 14.75, "y": 4, "w": 1.75}, + {"matrix": [13, 7], "x": 16.5, "y": 4}, + + {"matrix": [14, 0], "x": 18, "y": 4}, + {"matrix": [14, 1], "x": 19, "y": 4}, + {"matrix": [14, 2], "x": 20, "y": 4}, + + {"matrix": [14, 7], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [15, 0], "x": 3.75, "y": 5, "w": 1.5}, + {"matrix": [15, 1], "x": 5.25, "y": 5, "w": 9}, + {"matrix": [15, 2], "x": 14.25, "y": 5, "w": 1.5}, + {"matrix": [2, 3], "x": 15.75, "y": 5, "w": 1.75} + ] + } } - } } diff --git a/keyboards/converter/sun_usb/type3/type3.h b/keyboards/converter/sun_usb/type3/type3.h deleted file mode 100644 index b84a703d6b8b..000000000000 --- a/keyboards/converter/sun_usb/type3/type3.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2012 Jun Wako - -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 XXX KC_NO - -/* Sun type 3 keyboard -,-------. ,-----------------------------------------------------------. ,-----------. -| 01| 03| | 05| 06| 08| 0A| 0C| 0E| 10| 11| 12| 2B| | 15| 16| 17| -|-------| |-----------------------------------------------------------| |-----------| -| 19| 1A| | 1D| 1E| 1F| 20| 21| 22| 23| 24| 25| 26| 27| 28| 29| 58| 2A| | 2D| 2E| 2F| -|-------| |-----------------------------------------------------------| |-----------| -| 31| 33| | 35 | 36| 37| 38| 39| 3A| 3B| 3C| 3D| 3E| 3F| 40| 41| 42 | | 44| 45| 46| -|-------| |-----------------------------------------------------------| |-----------| -| 48| 49| | 4C | 4D| 4E| 4F| 50| 51| 52| 53| 54| 55| 56| 57| 59 | | 5B| 5C| 5D| -|-------| |-----------------------------------------------------------| |-----------| -| 5F| 61| | 63 | 64| 65| 66| 67| 68| 69| 6A| 6B| 6C| 6D| 6E| 6F| | 70| 71| 72| -`-------' |-----------------------------------------------------------| `-----------' - | 77 | 78 | 79 | 7A | 13 | - `-----------------------------------------------------------' -*/ -#define LAYOUT( \ - k01, k03, k05, k06, k08, k0A, k0C, k0E, k10, k11, k12, k2B, k15, k16, k17, \ - k19, k1A, k1D, k1E, k1F, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k58, k2A, k2D, k2E, k2F, \ - k31, k33, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k40, k41, k42, k44, k45, k46, \ - k48, k49, k4C, k4D, k4E, k4F, k50, k51, k52, k53, k54, k55, k56, k57, k59, k5B, k5C, k5D, \ - k5F, k61, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, k70, k71, k72, \ - k77, k78, k79, k7A, k13 \ -) { \ - { XXX, k01, XXX, k03, XXX, k05, k06, XXX }, \ - { k08, XXX, k0A, XXX, k0C, XXX, k0E, XXX }, \ - { k10, k11, k12, k13, XXX, k15, k16, k17 }, \ - { XXX, k19, k1A, XXX, XXX, k1D, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k2A, k2B, XXX, k2D, k2E, k2F }, \ - { XXX, k31, XXX, k33, XXX, k35, k36, k37 }, \ - { k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, k41, k42, XXX, k44, k45, k46, XXX }, \ - { k48, k49, XXX, XXX, k4C, k4D, k4E, k4F }, \ - { k50, k51, k52, k53, k54, k55, k56, k57 }, \ - { k58, k59, XXX, k5B, k5C, k5D, XXX, k5F }, \ - { XXX, k61, XXX, k63, k64, k65, k66, k67 }, \ - { k68, k69, k6A, k6B, k6C, k6D, k6E, k6F }, \ - { k70, k71, k72, XXX, XXX, XXX, XXX, k77 }, \ - { k78, k79, k7A, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/cool836a/cool836a.h b/keyboards/cool836a/cool836a.h deleted file mode 100644 index 08a036d4c01b..000000000000 --- a/keyboards/cool836a/cool836a.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 Ohashi - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K300, K301, K302, K303, K304, K305, \ - K100, K101, K102, K103, K104, K105, K400, K401, K402, K403, K404, K405, \ - K200, K201, K202, K203, K204, K205, K500, K501, K502, K503, K504, K505 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005 }, \ - { K100, K101, K102, K103, K104, K105 }, \ - { K200, K201, K202, K203, K204, K205 }, \ - { K300, K301, K302, K303, K304, K305 }, \ - { K400, K401, K402, K403, K404, K405 }, \ - { K500, K501, K502, K503, K504, K505 }, \ -} diff --git a/keyboards/cool836a/info.json b/keyboards/cool836a/info.json index bcdbbef97cde..8f7f688a6b16 100644 --- a/keyboards/cool836a/info.json +++ b/keyboards/cool836a/info.json @@ -18,12 +18,47 @@ "layouts": { "LAYOUT": { "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": 7.5, "y": 0},{"x": 8.5, "y": 0},{"x": 9.5, "y": 0},{"x": 10.5, "y": 0},{"x": 11.5,"y": 0},{"x": 12.5,"y": 0}, - {"x": 0, "y": 1},{"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": 8, "y": 1},{"x": 9, "y": 1},{"x": 10, "y": 1},{"x": 11, "y": 1},{"x": 12,"y": 1},{"x": 13,"y": 1}, - {"x": 0, "y": 2},{"x": 2, "y": 2},{"x": 3, "y": 2},{"x": 4, "y": 2},{"x": 5, "y": 2},{"x": 6, "y": 2}, - {"x": 7.5, "y": 2},{"x": 8.5, "y": 2},{"x": 9.5, "y": 2},{"x": 10.5, "y": 2},{"x": 11.5,"y": 2},{"x": 12.5,"y": 2} + {"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": [3, 0], "x": 7.5, "y": 0}, + {"matrix": [3, 1], "x": 8.5, "y": 0}, + {"matrix": [3, 2], "x": 9.5, "y": 0}, + {"matrix": [3, 3], "x": 10.5, "y": 0}, + {"matrix": [3, 4], "x": 11.5, "y": 0}, + {"matrix": [3, 5], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [4, 0], "x": 8, "y": 1}, + {"matrix": [4, 1], "x": 9, "y": 1}, + {"matrix": [4, 2], "x": 10, "y": 1}, + {"matrix": [4, 3], "x": 11, "y": 1}, + {"matrix": [4, 4], "x": 12, "y": 1}, + {"matrix": [4, 5], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "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": [5, 0], "x": 7.5, "y": 2}, + {"matrix": [5, 1], "x": 8.5, "y": 2}, + {"matrix": [5, 2], "x": 9.5, "y": 2}, + {"matrix": [5, 3], "x": 10.5, "y": 2}, + {"matrix": [5, 4], "x": 11.5, "y": 2}, + {"matrix": [5, 5], "x": 12.5, "y": 2} ] } } diff --git a/keyboards/coseyfannitutti/mullet/info.json b/keyboards/coseyfannitutti/mullet/info.json index 5e645373a37e..c97d1815e2a4 100644 --- a/keyboards/coseyfannitutti/mullet/info.json +++ b/keyboards/coseyfannitutti/mullet/info.json @@ -20,7 +20,80 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Fn", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/coseyfannitutti/mullet/mullet.h b/keyboards/coseyfannitutti/mullet/mullet.h deleted file mode 100644 index 848fd19226f8..000000000000 --- a/keyboards/coseyfannitutti/mullet/mullet.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 COSEYFANNITUTTI - * - * 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 _x_ KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, _x_, K2D, K2E }, \ -{ K30, _x_, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, _x_, _x_, _x_, K46, _x_, _x_, _x_, K4A, K4B, K4C, K4D, K4E} \ -} diff --git a/keyboards/cosmo65/cosmo65.h b/keyboards/cosmo65/cosmo65.h deleted file mode 100644 index a782b0dc7495..000000000000 --- a/keyboards/cosmo65/cosmo65.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -Copyright 2022 BentoBox Studio -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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, \ - k40, k41, k42, k43, k44, k45, k46, k49, k410, k411, k412, k413 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k010, k011, k012, k013 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k46, KC_NO, KC_NO, k49, k410, k411, k412, k413 } \ -} diff --git a/keyboards/cosmo65/info.json b/keyboards/cosmo65/info.json index 7495f065948e..d20de266e473 100644 --- a/keyboards/cosmo65/info.json +++ b/keyboards/cosmo65/info.json @@ -21,72 +21,77 @@ "layouts": { "LAYOUT": { "layout": [ - { "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": [0, 8], "x": 8, "y": 0 }, - { "matrix": [0, 9], "x": 9, "y": 0 }, - { "matrix": [0, 10], "x": 10, "y": 0 }, - { "matrix": [0, 11], "x": 11, "y": 0 }, - { "matrix": [0, 12], "x": 12, "y": 0 }, - { "matrix": [0, 13], "w": 2, "x": 13, "y": 0 }, - { "matrix": [1, 0], "w": 1.5, "x": 0, "y": 1 }, - { "matrix": [1, 1], "x": 1.5, "y": 1 }, - { "matrix": [1, 2], "x": 2.5, "y": 1 }, - { "matrix": [1, 3], "x": 3.5, "y": 1 }, - { "matrix": [1, 4], "x": 4.5, "y": 1 }, - { "matrix": [1, 5], "x": 5.5, "y": 1 }, - { "matrix": [1, 6], "x": 6.5, "y": 1 }, - { "matrix": [1, 7], "x": 7.5, "y": 1 }, - { "matrix": [1, 8], "x": 8.5, "y": 1 }, - { "matrix": [1, 9], "x": 9.5, "y": 1 }, - { "matrix": [1, 10], "x": 10.5, "y": 1 }, - { "matrix": [1, 11], "x": 11.5, "y": 1 }, - { "matrix": [1, 12], "x": 12.5, "y": 1 }, - { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1 }, - { "matrix": [2, 0], "w": 1.75, "x": 0, "y": 2 }, - { "matrix": [2, 1], "x": 1.75, "y": 2 }, - { "matrix": [2, 2], "x": 2.75, "y": 2 }, - { "matrix": [2, 3], "x": 3.75, "y": 2 }, - { "matrix": [2, 4], "x": 4.75, "y": 2 }, - { "matrix": [2, 5], "x": 5.75, "y": 2 }, - { "matrix": [2, 6], "x": 6.75, "y": 2 }, - { "matrix": [2, 7], "x": 7.75, "y": 2 }, - { "matrix": [2, 8], "x": 8.75, "y": 2 }, - { "matrix": [2, 9], "x": 9.75, "y": 2 }, - { "matrix": [2, 10], "x": 10.75, "y": 2 }, - { "matrix": [2, 11], "x": 11.75, "y": 2 }, - { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2 }, - { "matrix": [3, 0], "w": 1.25, "x": 0, "y": 3 }, - { "matrix": [3, 1], "x": 2.25, "y": 3 }, - { "matrix": [3, 2], "x": 3.25, "y": 3 }, - { "matrix": [3, 3], "x": 4.25, "y": 3 }, - { "matrix": [3, 4], "x": 5.25, "y": 3 }, - { "matrix": [3, 5], "x": 6.25, "y": 3 }, - { "matrix": [3, 6], "x": 7.25, "y": 3 }, - { "matrix": [3, 7], "x": 8.25, "y": 3 }, - { "matrix": [3, 8], "x": 9.25, "y": 3 }, - { "matrix": [3, 9], "x": 10.25, "y": 3 }, - { "matrix": [3, 10], "x": 11.25, "y": 3 }, - { "matrix": [3, 11], "w": 1.75, "x": 12.25, "y": 3 }, - { "matrix": [3, 12], "x": 14, "y": 3 }, - { "matrix": [4, 0], "w": 1.25, "x": 0, "y": 4 }, - { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4 }, - { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4 }, - { "matrix": [4, 3], "x": 1.25, "y": 3 }, - { "matrix": [4, 4], "w": 2.75, "x": 3.75, "y": 4 }, - { "matrix": [4, 5], "w": 1.25, "x": 6.5, "y": 4 }, - { "matrix": [4, 6], "w": 2.25, "x": 7.75, "y": 4 }, - { "matrix": [4, 9], "w": 1.25, "x": 10, "y": 4 }, - { "matrix": [4, 10], "w": 1.25, "x": 11.25, "y": 4 }, - { "matrix": [4, 11], "x": 13, "y": 4 }, - { "matrix": [4, 12], "x": 14, "y": 4 }, - { "matrix": [4, 13], "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 1.25, "y": 3}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 5], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} ] } } diff --git a/keyboards/cozykeys/bloomer/v2/info.json b/keyboards/cozykeys/bloomer/v2/info.json index daa2e8780718..1d519d7aad67 100644 --- a/keyboards/cozykeys/bloomer/v2/info.json +++ b/keyboards/cozykeys/bloomer/v2/info.json @@ -12,93 +12,109 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0.868, "y": 0, "r": 10 }, - { "label": "k01", "x": 1.853, "y": 0.174, "r": 10 }, - { "label": "k02", "x": 2.856, "y": 0.244, "r": 10 }, - { "label": "k03", "x": 3.896, "y": 0.107, "r": 10 }, - { "label": "k04", "x": 4.826, "y": 0.591, "r": 10 }, - { "label": "k05", "x": 5.765, "y": 1.023, "r": 10 }, - { "label": "k06", "x": 7.031, "y": 0.724, "r": 0 }, - { "label": "k07", "x": 8.031, "y": 0.46, "r": 0 }, - { "label": "k08", "x": 9.031, "y": 0.724, "r": 0 }, - { "label": "k09", "x": 10.297, "y": 1.023, "r": -10 }, - { "label": "k10", "x": 11.236, "y": 0.591, "r": -10 }, - { "label": "k11", "x": 12.166, "y": 0.107, "r": -10 }, - { "label": "k12", "x": 13.196, "y": 0.192, "r": -10 }, - { "label": "k13", "x": 14.208, "y": 0.174, "r": -10 }, - { "label": "k14", "x": 15.193, "y": 0, "r": -10 }, - { "label": "k15", "x": 0.695, "y": 0.985, "r": 10 }, - { "label": "k16", "x": 1.679, "y": 1.158, "r": 10 }, - { "label": "k17", "x": 2.682, "y": 1.229, "r": 10 }, - { "label": "k18", "x": 3.722, "y": 1.092, "r": 10 }, - { "label": "k19", "x": 4.652, "y": 1.576, "r": 10 }, - { "label": "k20", "x": 5.591, "y": 2.008, "r": 10 }, - { "label": "k21", "x": 7.031, "y": 2.249, "r": 0 }, - { "label": "k22", "x": 8.031, "y": 1.985, "r": 0 }, - { "label": "k23", "x": 9.031, "y": 2.249, "r": 0 }, - { "label": "k24", "x": 10.47, "y": 2.008, "r": -10 }, - { "label": "k25", "x": 11.409, "y": 1.576, "r": -10 }, - { "label": "k26", "x": 12.34, "y": 1.092, "r": -10 }, - { "label": "k27", "x": 13.37, "y": 1.177, "r": -10 }, - { "label": "k28", "x": 14.382, "y": 1.158, "r": -10 }, - { "label": "k29", "x": 15.367, "y": 0.985, "r": -10 }, - { "label": "k30", "x": 0.521, "y": 1.97, "r": 10 }, - { "label": "k31", "x": 1.506, "y": 2.143, "r": 10 }, - { "label": "k32", "x": 2.509, "y": 2.214, "r": 10 }, - { "label": "k33", "x": 3.548, "y": 2.077, "r": 10 }, - { "label": "k34", "x": 4.478, "y": 2.561, "r": 10 }, - { "label": "k35", "x": 5.418, "y": 2.993, "r": 10 }, - { "label": "k36", "x": 7.031, "y": 3.249, "r": 0 }, - { "label": "k37", "x": 8.031, "y": 2.985, "r": 0 }, - { "label": "k38", "x": 9.031, "y": 3.249, "r": 0 }, - { "label": "k39", "x": 10.644, "y": 2.993, "r": -10 }, - { "label": "k40", "x": 11.583, "y": 2.561, "r": -10 }, - { "label": "k41", "x": 12.513, "y": 2.077, "r": -10 }, - { "label": "k42", "x": 13.544, "y": 2.162, "r": -10 }, - { "label": "k43", "x": 14.556, "y": 2.143, "r": -10 }, - { "label": "k44", "x": 15.541, "y": 1.97, "r": -10 }, - { "label": "k45", "x": 0.347, "y": 2.954, "r": 10 }, - { "label": "k46", "x": 1.332, "y": 3.128, "r": 10 }, - { "label": "k47", "x": 2.335, "y": 3.198, "r": 10 }, - { "label": "k48", "x": 3.375, "y": 3.062, "r": 10 }, - { "label": "k49", "x": 4.305, "y": 3.546, "r": 10 }, - { "label": "k50", "x": 5.244, "y": 3.978, "r": 10 }, - { "label": "k51", "x": 10.818, "y": 3.978, "r": -10 }, - { "label": "k52", "x": 11.757, "y": 3.546, "r": -10 }, - { "label": "k53", "x": 12.687, "y": 3.062, "r": -10 }, - { "label": "k54", "x": 13.717, "y": 3.147, "r": -10 }, - { "label": "k55", "x": 14.729, "y": 3.128, "r": -10 }, - { "label": "k56", "x": 15.714, "y": 2.954, "r": -10 }, - { "label": "k57", "x": 0.174, "y": 3.939, "r": 10 }, - { "label": "k58", "x": 1.158, "y": 4.113, "r": 10 }, - { "label": "k59", "x": 2.161, "y": 4.183, "r": 10 }, - { "label": "k60", "x": 3.201, "y": 4.047, "r": 10 }, - { "label": "k61", "x": 4.131, "y": 4.53, "r": 10 }, - { "label": "k62", "x": 5.07, "y": 4.963, "r": 10 }, - { "label": "k63", "x": 7.031, "y": 4.984, "r": 0 }, - { "label": "k64", "x": 8.031, "y": 4.51, "r": 0 }, - { "label": "k65", "x": 9.031, "y": 4.984, "r": 0 }, - { "label": "k66", "x": 10.991, "y": 4.963, "r": -10 }, - { "label": "k67", "x": 11.93, "y": 4.53, "r": -10 }, - { "label": "k68", "x": 12.861, "y": 4.047, "r": -10 }, - { "label": "k69", "x": 13.891, "y": 4.131, "r": -10 }, - { "label": "k70", "x": 14.903, "y": 4.113, "r": -10 }, - { "label": "k71", "x": 15.888, "y": 3.939, "r": -10 }, - { "label": "k72", "x": 0, "y": 4.924, "r": 10 }, - { "label": "k73", "x": 0.985, "y": 5.098, "r": 10 }, - { "label": "k74", "x": 1.988, "y": 5.168, "r": 10 }, - { "label": "k75", "x": 3.027, "y": 5.031, "r": 10 }, - { "label": "k76", "x": 3.957, "y": 5.515, "r": 10 }, - { "label": "k77", "x": 4.897, "y": 5.947, "r": 10 }, - { "label": "k78", "x": 5.883, "y": 6.115, "r": 10 }, - { "label": "k79", "x": 8.031, "y": 5.51, "r": 0 }, - { "label": "k80", "x": 10.179, "y": 6.115, "r": -10 }, - { "label": "k81", "x": 11.165, "y": 5.947, "r": -10 }, - { "label": "k82", "x": 12.104, "y": 5.515, "r": -10 }, - { "label": "k83", "x": 13.034, "y": 5.031, "r": -10 }, - { "label": "k84", "x": 14.065, "y": 5.116, "r": -10 }, - { "label": "k85", "x": 15.077, "y": 5.098, "r": -10 }, - { "label": "k86", "x": 16.062, "y": 4.924, "r": -10 } + {"matrix": [0, 0], "x": 0.868, "y": 0, "r": 10}, + {"matrix": [0, 1], "x": 1.853, "y": 0.174, "r": 10}, + {"matrix": [0, 2], "x": 2.856, "y": 0.244, "r": 10}, + {"matrix": [0, 3], "x": 3.896, "y": 0.107, "r": 10}, + {"matrix": [0, 4], "x": 4.826, "y": 0.591, "r": 10}, + {"matrix": [0, 5], "x": 5.765, "y": 1.023, "r": 10}, + + {"matrix": [0, 6], "x": 7.031, "y": 0.724, "r": 0}, + {"matrix": [0, 7], "x": 8.031, "y": 0.46, "r": 0}, + {"matrix": [0, 8], "x": 9.031, "y": 0.724, "r": 0}, + + {"matrix": [0, 9], "x": 10.297, "y": 1.023, "r": -10}, + {"matrix": [0, 10], "x": 11.236, "y": 0.591, "r": -10}, + {"matrix": [0, 11], "x": 12.166, "y": 0.107, "r": -10}, + {"matrix": [0, 12], "x": 13.196, "y": 0.192, "r": -10}, + {"matrix": [0, 13], "x": 14.208, "y": 0.174, "r": -10}, + {"matrix": [0, 14], "x": 15.193, "y": 0, "r": -10}, + + {"matrix": [1, 0], "x": 0.695, "y": 0.985, "r": 10}, + {"matrix": [1, 1], "x": 1.679, "y": 1.158, "r": 10}, + {"matrix": [1, 2], "x": 2.682, "y": 1.229, "r": 10}, + {"matrix": [1, 3], "x": 3.722, "y": 1.092, "r": 10}, + {"matrix": [1, 4], "x": 4.652, "y": 1.576, "r": 10}, + {"matrix": [1, 5], "x": 5.591, "y": 2.008, "r": 10}, + + {"matrix": [1, 6], "x": 7.031, "y": 2.249, "r": 0}, + {"matrix": [1, 7], "x": 8.031, "y": 1.985, "r": 0}, + {"matrix": [1, 8], "x": 9.031, "y": 2.249, "r": 0}, + + {"matrix": [1, 9], "x": 10.47, "y": 2.008, "r": -10}, + {"matrix": [1, 10], "x": 11.409, "y": 1.576, "r": -10}, + {"matrix": [1, 11], "x": 12.34, "y": 1.092, "r": -10}, + {"matrix": [1, 12], "x": 13.37, "y": 1.177, "r": -10}, + {"matrix": [1, 13], "x": 14.382, "y": 1.158, "r": -10}, + {"matrix": [1, 14], "x": 15.367, "y": 0.985, "r": -10}, + + {"matrix": [2, 0], "x": 0.521, "y": 1.97, "r": 10}, + {"matrix": [2, 1], "x": 1.506, "y": 2.143, "r": 10}, + {"matrix": [2, 2], "x": 2.509, "y": 2.214, "r": 10}, + {"matrix": [2, 3], "x": 3.548, "y": 2.077, "r": 10}, + {"matrix": [2, 4], "x": 4.478, "y": 2.561, "r": 10}, + {"matrix": [2, 5], "x": 5.418, "y": 2.993, "r": 10}, + + {"matrix": [2, 6], "x": 7.031, "y": 3.249, "r": 0}, + {"matrix": [2, 7], "x": 8.031, "y": 2.985, "r": 0}, + {"matrix": [2, 8], "x": 9.031, "y": 3.249, "r": 0}, + + {"matrix": [2, 9], "x": 10.644, "y": 2.993, "r": -10}, + {"matrix": [2, 10], "x": 11.583, "y": 2.561, "r": -10}, + {"matrix": [2, 11], "x": 12.513, "y": 2.077, "r": -10}, + {"matrix": [2, 12], "x": 13.544, "y": 2.162, "r": -10}, + {"matrix": [2, 13], "x": 14.556, "y": 2.143, "r": -10}, + {"matrix": [2, 14], "x": 15.541, "y": 1.97, "r": -10}, + + {"matrix": [3, 0], "x": 0.347, "y": 2.954, "r": 10}, + {"matrix": [3, 1], "x": 1.332, "y": 3.128, "r": 10}, + {"matrix": [3, 2], "x": 2.335, "y": 3.198, "r": 10}, + {"matrix": [3, 3], "x": 3.375, "y": 3.062, "r": 10}, + {"matrix": [3, 4], "x": 4.305, "y": 3.546, "r": 10}, + {"matrix": [3, 5], "x": 5.244, "y": 3.978, "r": 10}, + + {"matrix": [3, 9], "x": 10.818, "y": 3.978, "r": -10}, + {"matrix": [3, 10], "x": 11.757, "y": 3.546, "r": -10}, + {"matrix": [3, 11], "x": 12.687, "y": 3.062, "r": -10}, + {"matrix": [3, 12], "x": 13.717, "y": 3.147, "r": -10}, + {"matrix": [3, 13], "x": 14.729, "y": 3.128, "r": -10}, + {"matrix": [3, 14], "x": 15.714, "y": 2.954, "r": -10}, + + {"matrix": [4, 0], "x": 0.174, "y": 3.939, "r": 10}, + {"matrix": [4, 1], "x": 1.158, "y": 4.113, "r": 10}, + {"matrix": [4, 2], "x": 2.161, "y": 4.183, "r": 10}, + {"matrix": [4, 3], "x": 3.201, "y": 4.047, "r": 10}, + {"matrix": [4, 4], "x": 4.131, "y": 4.53, "r": 10}, + {"matrix": [4, 5], "x": 5.07, "y": 4.963, "r": 10}, + + {"matrix": [4, 6], "x": 7.031, "y": 4.984, "r": 0}, + {"matrix": [4, 7], "x": 8.031, "y": 4.51, "r": 0}, + {"matrix": [4, 8], "x": 9.031, "y": 4.984, "r": 0}, + + {"matrix": [4, 9], "x": 10.991, "y": 4.963, "r": -10}, + {"matrix": [4, 10], "x": 11.93, "y": 4.53, "r": -10}, + {"matrix": [4, 11], "x": 12.861, "y": 4.047, "r": -10}, + {"matrix": [4, 12], "x": 13.891, "y": 4.131, "r": -10}, + {"matrix": [4, 13], "x": 14.903, "y": 4.113, "r": -10}, + {"matrix": [4, 14], "x": 15.888, "y": 3.939, "r": -10}, + + {"matrix": [5, 0], "x": 0, "y": 4.924, "r": 10}, + {"matrix": [5, 1], "x": 0.985, "y": 5.098, "r": 10}, + {"matrix": [5, 2], "x": 1.988, "y": 5.168, "r": 10}, + {"matrix": [5, 3], "x": 3.027, "y": 5.031, "r": 10}, + {"matrix": [5, 4], "x": 3.957, "y": 5.515, "r": 10}, + {"matrix": [5, 5], "x": 4.897, "y": 5.947, "r": 10}, + {"matrix": [5, 6], "x": 5.883, "y": 6.115, "r": 10}, + + {"matrix": [5, 7], "x": 8.031, "y": 5.51, "r": 0}, + + {"matrix": [5, 8], "x": 10.179, "y": 6.115, "r": -10}, + {"matrix": [5, 9], "x": 11.165, "y": 5.947, "r": -10}, + {"matrix": [5, 10], "x": 12.104, "y": 5.515, "r": -10}, + {"matrix": [5, 11], "x": 13.034, "y": 5.031, "r": -10}, + {"matrix": [5, 12], "x": 14.065, "y": 5.116, "r": -10}, + {"matrix": [5, 13], "x": 15.077, "y": 5.098, "r": -10}, + {"matrix": [5, 14], "x": 16.062, "y": 4.924, "r": -10} ] } } diff --git a/keyboards/cozykeys/bloomer/v2/v2.h b/keyboards/cozykeys/bloomer/v2/v2.h deleted file mode 100644 index c6575cd4e62e..000000000000 --- a/keyboards/cozykeys/bloomer/v2/v2.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 Paul Ewing - -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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \ - k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, \ - k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, \ - k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, \ - k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86 \ -) \ -{ /* c00 c01 c02 c03 c04 c05 c06 c07 c08 c09 c10 c11 c12 c13 c14 */ \ -/* r0 */ { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \ -/* r1 */ { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ -/* r2 */ { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44 }, \ -/* r3 */ { k45, k46, k47, k48, k49, k50, ___, ___, ___, k51, k52, k53, k54, k55, k56 }, \ -/* r4 */ { k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71 }, \ -/* r5 */ { k72, k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86 }, \ -} diff --git a/keyboards/cozykeys/bloomer/v3/info.json b/keyboards/cozykeys/bloomer/v3/info.json index a7ceb820c8f2..3b630f852a3f 100644 --- a/keyboards/cozykeys/bloomer/v3/info.json +++ b/keyboards/cozykeys/bloomer/v3/info.json @@ -12,96 +12,111 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0.868, "y": 0, "r": 10 }, - { "label": "k01", "x": 1.853, "y": 0.174, "r": 10 }, - { "label": "k02", "x": 2.856, "y": 0.244, "r": 10 }, - { "label": "k03", "x": 3.896, "y": 0.107, "r": 10 }, - { "label": "k04", "x": 4.826, "y": 0.591, "r": 10 }, - { "label": "k05", "x": 5.765, "y": 1.023, "r": 10 }, - { "label": "k06", "x": 10.507, "y": 1.023, "r": -10 }, - { "label": "k07", "x": 11.446, "y": 0.591, "r": -10 }, - { "label": "k08", "x": 12.376, "y": 0.107, "r": -10 }, - { "label": "k09", "x": 13.406, "y": 0.192, "r": -10 }, - { "label": "k10", "x": 14.418, "y": 0.174, "r": -10 }, - { "label": "k11", "x": 15.403, "y": 0, "r": -10 }, - { "label": "k12", "x": 0.695, "y": 0.985, "r": 10 }, - { "label": "k13", "x": 1.679, "y": 1.158, "r": 10 }, - { "label": "k14", "x": 2.682, "y": 1.229, "r": 10 }, - { "label": "k15", "x": 3.722, "y": 1.092, "r": 10 }, - { "label": "k16", "x": 4.652, "y": 1.576, "r": 10 }, - { "label": "k17", "x": 5.591, "y": 2.008, "r": 10 }, - { "label": "k18", "x": 10.68, "y": 2.008, "r": -10 }, - { "label": "k19", "x": 11.619, "y": 1.576, "r": -10 }, - { "label": "k20", "x": 12.55, "y": 1.092, "r": -10 }, - { "label": "k21", "x": 13.58, "y": 1.177, "r": -10 }, - { "label": "k22", "x": 14.592, "y": 1.158, "r": -10 }, - { "label": "k23", "x": 15.577, "y": 0.985, "r": -10 }, - { "label": "k24", "x": 0.521, "y": 1.97, "r": 10 }, - { "label": "k25", "x": 1.506, "y": 2.143, "r": 10 }, - { "label": "k26", "x": 2.509, "y": 2.214, "r": 10 }, - { "label": "k27", "x": 3.548, "y": 2.077, "r": 10 }, - { "label": "k28", "x": 4.478, "y": 2.561, "r": 10 }, - { "label": "k29", "x": 5.418, "y": 2.993, "r": 10 }, - { "label": "k30", "x": 6.402, "y": 3.167, "r": 10 }, - { "label": "k31", "x": 7.636, "y": 3.217, "r": 0 }, - { "label": "k32", "x": 8.636, "y": 3.217, "r": 0 }, - { "label": "k33", "x": 9.869, "y": 3.167, "r": -10 }, - { "label": "k34", "x": 10.854, "y": 2.993, "r": -10 }, - { "label": "k35", "x": 11.793, "y": 2.561, "r": -10 }, - { "label": "k36", "x": 12.723, "y": 2.077, "r": -10 }, - { "label": "k37", "x": 13.754, "y": 2.162, "r": -10 }, - { "label": "k38", "x": 14.766, "y": 2.143, "r": -10 }, - { "label": "k39", "x": 15.75, "y": 1.97, "r": -10 }, - { "label": "k40", "x": 0.347, "y": 2.954, "r": 10 }, - { "label": "k41", "x": 1.332, "y": 3.128, "r": 10 }, - { "label": "k42", "x": 2.335, "y": 3.198, "r": 10 }, - { "label": "k43", "x": 3.375, "y": 3.062, "r": 10 }, - { "label": "k44", "x": 4.305, "y": 3.546, "r": 10 }, - { "label": "k45", "x": 5.244, "y": 3.978, "r": 10 }, - { "label": "k46", "x": 6.229, "y": 4.151, "r": 10 }, - { "label": "k47", "x": 7.636, "y": 4.217, "r": 0 }, - { "label": "k48", "x": 8.636, "y": 4.217, "r": 0 }, - { "label": "k49", "x": 10.043, "y": 4.151, "r": -10 }, - { "label": "k50", "x": 11.027, "y": 3.978, "r": -10 }, - { "label": "k51", "x": 11.967, "y": 3.546, "r": -10 }, - { "label": "k52", "x": 12.897, "y": 3.062, "r": -10 }, - { "label": "k53", "x": 13.927, "y": 3.147, "r": -10 }, - { "label": "k54", "x": 14.939, "y": 3.128, "r": -10 }, - { "label": "k55", "x": 15.924, "y": 2.954, "r": -10 }, - { "label": "k56", "x": 0.174, "y": 3.939, "r": 10 }, - { "label": "k57", "x": 1.158, "y": 4.113, "r": 10 }, - { "label": "k58", "x": 2.161, "y": 4.183, "r": 10 }, - { "label": "k59", "x": 3.201, "y": 4.047, "r": 10 }, - { "label": "k60", "x": 4.131, "y": 4.53, "r": 10 }, - { "label": "k61", "x": 5.07, "y": 4.963, "r": 10 }, - { "label": "k62", "x": 6.055, "y": 5.136, "r": 10 }, - { "label": "k63", "x": 7.136, "y": 5.217, "r": 0 }, - { "label": "k64", "x": 8.136, "y": 5.217, "r": 0 }, - { "label": "k65", "x": 9.136, "y": 5.217, "r": 0 }, - { "label": "k66", "x": 10.216, "y": 5.136, "r": -10 }, - { "label": "k67", "x": 11.201, "y": 4.963, "r": -10 }, - { "label": "k68", "x": 12.14, "y": 4.53, "r": -10 }, - { "label": "k69", "x": 13.07, "y": 4.047, "r": -10 }, - { "label": "k70", "x": 14.101, "y": 4.131, "r": -10 }, - { "label": "k71", "x": 15.113, "y": 4.113, "r": -10 }, - { "label": "k72", "x": 16.098, "y": 3.939, "r": -10 }, - { "label": "k73", "x": 0, "y": 4.924, "r": 10 }, - { "label": "k74", "x": 0.985, "y": 5.098, "r": 10 }, - { "label": "k75", "x": 1.988, "y": 5.168, "r": 10 }, - { "label": "k76", "x": 3.027, "y": 5.031, "r": 10 }, - { "label": "k77", "x": 3.957, "y": 5.515, "r": 10 }, - { "label": "k78", "x": 4.897, "y": 5.947, "r": 10 }, - { "label": "k79", "x": 5.881, "y": 6.121, "r": 10 }, - { "label": "k80", "x": 7.136, "y": 6.217, "r": 0 }, - { "label": "k81", "x": 8.136, "y": 6.217, "r": 0 }, - { "label": "k82", "x": 9.136, "y": 6.217, "r": 0 }, - { "label": "k83", "x": 10.39, "y": 6.121, "r": -10 }, - { "label": "k84", "x": 11.375, "y": 5.947, "r": -10 }, - { "label": "k85", "x": 12.314, "y": 5.515, "r": -10 }, - { "label": "k86", "x": 13.244, "y": 5.031, "r": -10 }, - { "label": "k87", "x": 14.274, "y": 5.116, "r": -10 }, - { "label": "k88", "x": 15.287, "y": 5.098, "r": -10 }, - { "label": "k89", "x": 16.271, "y": 4.924, "r": -10 } + {"matrix": [0, 0], "x": 0.868, "y": 0, "r": 10}, + {"matrix": [0, 1], "x": 1.853, "y": 0.174, "r": 10}, + {"matrix": [0, 2], "x": 2.856, "y": 0.244, "r": 10}, + {"matrix": [0, 3], "x": 3.896, "y": 0.107, "r": 10}, + {"matrix": [0, 4], "x": 4.826, "y": 0.591, "r": 10}, + {"matrix": [0, 5], "x": 5.765, "y": 1.023, "r": 10}, + + {"matrix": [0, 9], "x": 10.507, "y": 1.023, "r": -10}, + {"matrix": [0, 10], "x": 11.446, "y": 0.591, "r": -10}, + {"matrix": [0, 11], "x": 12.376, "y": 0.107, "r": -10}, + {"matrix": [0, 12], "x": 13.406, "y": 0.192, "r": -10}, + {"matrix": [0, 13], "x": 14.418, "y": 0.174, "r": -10}, + {"matrix": [0, 14], "x": 15.403, "y": 0, "r": -10}, + + {"matrix": [1, 0], "x": 0.695, "y": 0.985, "r": 10}, + {"matrix": [1, 1], "x": 1.679, "y": 1.158, "r": 10}, + {"matrix": [1, 2], "x": 2.682, "y": 1.229, "r": 10}, + {"matrix": [1, 3], "x": 3.722, "y": 1.092, "r": 10}, + {"matrix": [1, 4], "x": 4.652, "y": 1.576, "r": 10}, + {"matrix": [1, 5], "x": 5.591, "y": 2.008, "r": 10}, + + {"matrix": [1, 9], "x": 10.68, "y": 2.008, "r": -10}, + {"matrix": [1, 10], "x": 11.619, "y": 1.576, "r": -10}, + {"matrix": [1, 11], "x": 12.55, "y": 1.092, "r": -10}, + {"matrix": [1, 12], "x": 13.58, "y": 1.177, "r": -10}, + {"matrix": [1, 13], "x": 14.592, "y": 1.158, "r": -10}, + {"matrix": [1, 14], "x": 15.577, "y": 0.985, "r": -10}, + + {"matrix": [2, 0], "x": 0.521, "y": 1.97, "r": 10}, + {"matrix": [2, 1], "x": 1.506, "y": 2.143, "r": 10}, + {"matrix": [2, 2], "x": 2.509, "y": 2.214, "r": 10}, + {"matrix": [2, 3], "x": 3.548, "y": 2.077, "r": 10}, + {"matrix": [2, 4], "x": 4.478, "y": 2.561, "r": 10}, + {"matrix": [2, 5], "x": 5.418, "y": 2.993, "r": 10}, + {"matrix": [2, 6], "x": 6.402, "y": 3.167, "r": 10}, + + {"matrix": [0, 6], "x": 7.636, "y": 3.217, "r": 0}, + {"matrix": [0, 8], "x": 8.636, "y": 3.217, "r": 0}, + + {"matrix": [2, 8], "x": 9.869, "y": 3.167, "r": -10}, + {"matrix": [2, 9], "x": 10.854, "y": 2.993, "r": -10}, + {"matrix": [2, 10], "x": 11.793, "y": 2.561, "r": -10}, + {"matrix": [2, 11], "x": 12.723, "y": 2.077, "r": -10}, + {"matrix": [2, 12], "x": 13.754, "y": 2.162, "r": -10}, + {"matrix": [2, 13], "x": 14.766, "y": 2.143, "r": -10}, + {"matrix": [2, 14], "x": 15.75, "y": 1.97, "r": -10}, + + {"matrix": [3, 0], "x": 0.347, "y": 2.954, "r": 10}, + {"matrix": [3, 1], "x": 1.332, "y": 3.128, "r": 10}, + {"matrix": [3, 2], "x": 2.335, "y": 3.198, "r": 10}, + {"matrix": [3, 3], "x": 3.375, "y": 3.062, "r": 10}, + {"matrix": [3, 4], "x": 4.305, "y": 3.546, "r": 10}, + {"matrix": [3, 5], "x": 5.244, "y": 3.978, "r": 10}, + {"matrix": [3, 6], "x": 6.229, "y": 4.151, "r": 10}, + + {"matrix": [1, 6], "x": 7.636, "y": 4.217, "r": 0}, + {"matrix": [1, 8], "x": 8.636, "y": 4.217, "r": 0}, + + {"matrix": [3, 8], "x": 10.043, "y": 4.151, "r": -10}, + {"matrix": [3, 9], "x": 11.027, "y": 3.978, "r": -10}, + {"matrix": [3, 10], "x": 11.967, "y": 3.546, "r": -10}, + {"matrix": [3, 11], "x": 12.897, "y": 3.062, "r": -10}, + {"matrix": [3, 12], "x": 13.927, "y": 3.147, "r": -10}, + {"matrix": [3, 13], "x": 14.939, "y": 3.128, "r": -10}, + {"matrix": [3, 14], "x": 15.924, "y": 2.954, "r": -10}, + + {"matrix": [4, 0], "x": 0.174, "y": 3.939, "r": 10}, + {"matrix": [4, 1], "x": 1.158, "y": 4.113, "r": 10}, + {"matrix": [4, 2], "x": 2.161, "y": 4.183, "r": 10}, + {"matrix": [4, 3], "x": 3.201, "y": 4.047, "r": 10}, + {"matrix": [4, 4], "x": 4.131, "y": 4.53, "r": 10}, + {"matrix": [4, 5], "x": 5.07, "y": 4.963, "r": 10}, + {"matrix": [4, 6], "x": 6.055, "y": 5.136, "r": 10}, + + {"matrix": [0, 7], "x": 7.136, "y": 5.217, "r": 0}, + {"matrix": [2, 7], "x": 8.136, "y": 5.217, "r": 0}, + {"matrix": [4, 7], "x": 9.136, "y": 5.217, "r": 0}, + + {"matrix": [4, 8], "x": 10.216, "y": 5.136, "r": -10}, + {"matrix": [4, 9], "x": 11.201, "y": 4.963, "r": -10}, + {"matrix": [4, 10], "x": 12.14, "y": 4.53, "r": -10}, + {"matrix": [4, 11], "x": 13.07, "y": 4.047, "r": -10}, + {"matrix": [4, 12], "x": 14.101, "y": 4.131, "r": -10}, + {"matrix": [4, 13], "x": 15.113, "y": 4.113, "r": -10}, + {"matrix": [4, 14], "x": 16.098, "y": 3.939, "r": -10}, + + {"matrix": [5, 0], "x": 0, "y": 4.924, "r": 10}, + {"matrix": [5, 1], "x": 0.985, "y": 5.098, "r": 10}, + {"matrix": [5, 2], "x": 1.988, "y": 5.168, "r": 10}, + {"matrix": [5, 3], "x": 3.027, "y": 5.031, "r": 10}, + {"matrix": [5, 4], "x": 3.957, "y": 5.515, "r": 10}, + {"matrix": [5, 5], "x": 4.897, "y": 5.947, "r": 10}, + {"matrix": [5, 6], "x": 5.881, "y": 6.121, "r": 10}, + + {"matrix": [1, 7], "x": 7.136, "y": 6.217, "r": 0}, + {"matrix": [3, 7], "x": 8.136, "y": 6.217, "r": 0}, + {"matrix": [5, 7], "x": 9.136, "y": 6.217, "r": 0}, + + {"matrix": [5, 8], "x": 10.39, "y": 6.121, "r": -10}, + {"matrix": [5, 9], "x": 11.375, "y": 5.947, "r": -10}, + {"matrix": [5, 10], "x": 12.314, "y": 5.515, "r": -10}, + {"matrix": [5, 11], "x": 13.244, "y": 5.031, "r": -10}, + {"matrix": [5, 12], "x": 14.274, "y": 5.116, "r": -10}, + {"matrix": [5, 13], "x": 15.287, "y": 5.098, "r": -10}, + {"matrix": [5, 14], "x": 16.271, "y": 4.924, "r": -10} ] } } diff --git a/keyboards/cozykeys/bloomer/v3/v3.h b/keyboards/cozykeys/bloomer/v3/v3.h deleted file mode 100644 index 3515ef84ce52..000000000000 --- a/keyboards/cozykeys/bloomer/v3/v3.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2021 Paul Ewing - -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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ - k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ - k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, \ - k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k70, k71, k72, \ - k73, k74, k75, k76, k77, k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 \ -) \ -{ /* c00 c01 c02 c03 c04 c05 c06 c07 c08 c09 c10 c11 c12 c13 c14 */ \ -/* r0 */ { k00, k01, k02, k03, k04, k05, k31, k63, k32, k06, k07, k08, k09, k10, k11 }, \ -/* r1 */ { k12, k13, k14, k15, k16, k17, k47, k80, k48, k18, k19, k20, k21, k22, k23 }, \ -/* r2 */ { k24, k25, k26, k27, k28, k29, k30, k64, k33, k34, k35, k36, k37, k38, k39 }, \ -/* r3 */ { k40, k41, k42, k43, k44, k45, k46, k81, k49, k50, k51, k52, k53, k54, k55 }, \ -/* r4 */ { k56, k57, k58, k59, k60, k61, k62, k65, k66, k67, k68, k69, k70, k71, k72 }, \ -/* r5 */ { k73, k74, k75, k76, k77, k78, k79, k82, k83, k84, k85, k86, k87, k88, k89 } \ -} diff --git a/keyboards/cozykeys/speedo/v2/info.json b/keyboards/cozykeys/speedo/v2/info.json index ddeec4884455..9e70d28b41c4 100644 --- a/keyboards/cozykeys/speedo/v2/info.json +++ b/keyboards/cozykeys/speedo/v2/info.json @@ -18,72 +18,86 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k01", "x": 0.693, "y": 0, "r": 10 }, - { "label": "k02", "x": 1.675, "y": 0.173, "r": 10 }, - { "label": "k03", "x": 2.685, "y": 0.191, "r": 10 }, - { "label": "k04", "x": 3.712, "y": 0.106, "r": 10 }, - { "label": "k05", "x": 4.64, "y": 0.589, "r": 10 }, - { "label": "k06", "x": 5.577, "y": 1.021, "r": 10 }, - { "label": "k07", "x": 7.571, "y": 1.021, "r": -10 }, - { "label": "k08", "x": 8.507, "y": 0.589, "r": -10 }, - { "label": "k09", "x": 9.435, "y": 0.106, "r": -10 }, - { "label": "k10", "x": 10.463, "y": 0.191, "r": -10 }, - { "label": "k11", "x": 11.472, "y": 0.173, "r": -10 }, - { "label": "k12", "x": 12.454, "y": 0, "r": -10 }, - { "label": "k13", "x": 0.52, "y": 0.982, "r": 10 }, - { "label": "k14", "x": 1.502, "y": 1.155, "r": 10 }, - { "label": "k15", "x": 2.511, "y": 1.174, "r": 10 }, - { "label": "k16", "x": 3.539, "y": 1.088, "r": 10 }, - { "label": "k17", "x": 4.467, "y": 1.572, "r": 10 }, - { "label": "k18", "x": 5.403, "y": 2.003, "r": 10 }, - { "label": "k19", "x": 6.574, "y": 2.559, "r": 0 }, - { "label": "k20", "x": 7.744, "y": 2.003, "r": -10 }, - { "label": "k21", "x": 8.681, "y": 1.572, "r": -10 }, - { "label": "k22", "x": 9.608, "y": 1.088, "r": -10 }, - { "label": "k23", "x": 10.636, "y": 1.174, "r": -10 }, - { "label": "k24", "x": 11.645, "y": 1.155, "r": -10 }, - { "label": "k25", "x": 12.628, "y": 0.982, "r": -10 }, - { "label": "k26", "x": 0.346, "y": 1.964, "r": 10 }, - { "label": "k27", "x": 1.329, "y": 2.138, "r": 10 }, - { "label": "k28", "x": 2.338, "y": 2.156, "r": 10 }, - { "label": "k29", "x": 3.366, "y": 2.07, "r": 10 }, - { "label": "k30", "x": 4.294, "y": 2.554, "r": 10 }, - { "label": "k31", "x": 5.23, "y": 2.986, "r": 10 }, - { "label": "k32", "x": 6.574, "y": 3.557, "r": 0 }, - { "label": "k33", "x": 7.917, "y": 2.986, "r": -10 }, - { "label": "k34", "x": 8.854, "y": 2.554, "r": -10 }, - { "label": "k35", "x": 9.781, "y": 2.07, "r": -10 }, - { "label": "k36", "x": 10.809, "y": 2.156, "r": -10 }, - { "label": "k37", "x": 11.819, "y": 2.138, "r": -10 }, - { "label": "k38", "x": 12.801, "y": 1.964, "r": -10 }, - { "label": "k39", "x": 0.173, "y": 2.947, "r": 10 }, - { "label": "k40", "x": 1.155, "y": 3.12, "r": 10 }, - { "label": "k41", "x": 2.165, "y": 3.138, "r": 10 }, - { "label": "k42", "x": 3.193, "y": 3.053, "r": 10 }, - { "label": "k43", "x": 4.12, "y": 3.536, "r": 10 }, - { "label": "k44", "x": 5.057, "y": 3.968, "r": 10 }, - { "label": "k45", "x": 6.075, "y": 4.554, "r": 0 }, - { "label": "k46", "x": 7.072, "y": 4.554, "r": 0 }, - { "label": "k47", "x": 8.09, "y": 3.968, "r": -10 }, - { "label": "k48", "x": 9.027, "y": 3.536, "r": -10 }, - { "label": "k49", "x": 9.954, "y": 3.053, "r": -10 }, - { "label": "k50", "x": 10.982, "y": 3.138, "r": -10 }, - { "label": "k51", "x": 11.992, "y": 3.12, "r": -10 }, - { "label": "k52", "x": 12.974, "y": 2.947, "r": -10 }, - { "label": "k53", "x": 0, "y": 3.929, "r": 10 }, - { "label": "k54", "x": 0.982, "y": 4.102, "r": 10 }, - { "label": "k55", "x": 1.992, "y": 4.12, "r": 10 }, - { "label": "k56", "x": 3.02, "y": 4.035, "r": 10 }, - { "label": "k57", "x": 3.947, "y": 4.518, "r": 10 }, - { "label": "k58", "x": 4.994, "y": 5.235, "r": 40 }, - { "label": "k59", "x": 5.753, "y": 6.064, "r": 55 }, - { "label": "k60", "x": 7.395, "y": 6.064, "r": -55 }, - { "label": "k61", "x": 8.154, "y": 5.235, "r": 40 }, - { "label": "k62", "x": 9.2, "y": 4.518, "r": -10 }, - { "label": "k63", "x": 10.128, "y": 4.035, "r": -10 }, - { "label": "k64", "x": 11.155, "y": 4.12, "r": -10 }, - { "label": "k65", "x": 12.165, "y": 4.102, "r": -10 }, - { "label": "k66", "x": 13.147, "y": 3.929, "r": -10 } + {"matrix": [0, 0], "x": 0.693, "y": 0, "r": 10}, + {"matrix": [0, 1], "x": 1.675, "y": 0.173, "r": 10}, + {"matrix": [0, 2], "x": 2.685, "y": 0.191, "r": 10}, + {"matrix": [0, 3], "x": 3.712, "y": 0.106, "r": 10}, + {"matrix": [0, 4], "x": 4.64, "y": 0.589, "r": 10}, + {"matrix": [0, 5], "x": 5.577, "y": 1.021, "r": 10}, + + {"matrix": [0, 8], "x": 7.571, "y": 1.021, "r": -10}, + {"matrix": [0, 9], "x": 8.507, "y": 0.589, "r": -10}, + {"matrix": [0, 10], "x": 9.435, "y": 0.106, "r": -10}, + {"matrix": [0, 11], "x": 10.463, "y": 0.191, "r": -10}, + {"matrix": [0, 12], "x": 11.472, "y": 0.173, "r": -10}, + {"matrix": [0, 13], "x": 12.454, "y": 0, "r": -10}, + + {"matrix": [1, 0], "x": 0.52, "y": 0.982, "r": 10}, + {"matrix": [1, 1], "x": 1.502, "y": 1.155, "r": 10}, + {"matrix": [1, 2], "x": 2.511, "y": 1.174, "r": 10}, + {"matrix": [1, 3], "x": 3.539, "y": 1.088, "r": 10}, + {"matrix": [1, 4], "x": 4.467, "y": 1.572, "r": 10}, + {"matrix": [1, 5], "x": 5.403, "y": 2.003, "r": 10}, + + {"matrix": [1, 6], "x": 6.574, "y": 2.559, "r": 0}, + + {"matrix": [1, 8], "x": 7.744, "y": 2.003, "r": -10}, + {"matrix": [1, 9], "x": 8.681, "y": 1.572, "r": -10}, + {"matrix": [1, 10], "x": 9.608, "y": 1.088, "r": -10}, + {"matrix": [1, 11], "x": 10.636, "y": 1.174, "r": -10}, + {"matrix": [1, 12], "x": 11.645, "y": 1.155, "r": -10}, + {"matrix": [1, 13], "x": 12.628, "y": 0.982, "r": -10}, + + {"matrix": [2, 0], "x": 0.346, "y": 1.964, "r": 10}, + {"matrix": [2, 1], "x": 1.329, "y": 2.138, "r": 10}, + {"matrix": [2, 2], "x": 2.338, "y": 2.156, "r": 10}, + {"matrix": [2, 3], "x": 3.366, "y": 2.07, "r": 10}, + {"matrix": [2, 4], "x": 4.294, "y": 2.554, "r": 10}, + {"matrix": [2, 5], "x": 5.23, "y": 2.986, "r": 10}, + + {"matrix": [2, 7], "x": 6.574, "y": 3.557, "r": 0}, + + {"matrix": [2, 8], "x": 7.917, "y": 2.986, "r": -10}, + {"matrix": [2, 9], "x": 8.854, "y": 2.554, "r": -10}, + {"matrix": [2, 10], "x": 9.781, "y": 2.07, "r": -10}, + {"matrix": [2, 11], "x": 10.809, "y": 2.156, "r": -10}, + {"matrix": [2, 12], "x": 11.819, "y": 2.138, "r": -10}, + {"matrix": [2, 13], "x": 12.801, "y": 1.964, "r": -10}, + + {"matrix": [3, 0], "x": 0.173, "y": 2.947, "r": 10}, + {"matrix": [3, 1], "x": 1.155, "y": 3.12, "r": 10}, + {"matrix": [3, 2], "x": 2.165, "y": 3.138, "r": 10}, + {"matrix": [3, 3], "x": 3.193, "y": 3.053, "r": 10}, + {"matrix": [3, 4], "x": 4.12, "y": 3.536, "r": 10}, + {"matrix": [3, 5], "x": 5.057, "y": 3.968, "r": 10}, + + {"matrix": [3, 6], "x": 6.075, "y": 4.554, "r": 0}, + {"matrix": [3, 7], "x": 7.072, "y": 4.554, "r": 0}, + + {"matrix": [3, 8], "x": 8.09, "y": 3.968, "r": -10}, + {"matrix": [3, 9], "x": 9.027, "y": 3.536, "r": -10}, + {"matrix": [3, 10], "x": 9.954, "y": 3.053, "r": -10}, + {"matrix": [3, 11], "x": 10.982, "y": 3.138, "r": -10}, + {"matrix": [3, 12], "x": 11.992, "y": 3.12, "r": -10}, + {"matrix": [3, 13], "x": 12.974, "y": 2.947, "r": -10}, + + {"matrix": [4, 0], "x": 0, "y": 3.929, "r": 10}, + {"matrix": [4, 1], "x": 0.982, "y": 4.102, "r": 10}, + {"matrix": [4, 2], "x": 1.992, "y": 4.12, "r": 10}, + {"matrix": [4, 3], "x": 3.02, "y": 4.035, "r": 10}, + {"matrix": [4, 4], "x": 3.947, "y": 4.518, "r": 10}, + + {"matrix": [4, 5], "x": 4.994, "y": 5.235, "r": 40}, + {"matrix": [4, 6], "x": 5.753, "y": 6.064, "r": 55}, + + {"matrix": [4, 7], "x": 7.395, "y": 6.064, "r": -55}, + {"matrix": [4, 8], "x": 8.154, "y": 5.235, "r": 40}, + + {"matrix": [4, 9], "x": 9.2, "y": 4.518, "r": -10}, + {"matrix": [4, 10], "x": 10.128, "y": 4.035, "r": -10}, + {"matrix": [4, 11], "x": 11.155, "y": 4.12, "r": -10}, + {"matrix": [4, 12], "x": 12.165, "y": 4.102, "r": -10}, + {"matrix": [4, 13], "x": 13.147, "y": 3.929, "r": -10} ] } } diff --git a/keyboards/cozykeys/speedo/v2/v2.h b/keyboards/cozykeys/speedo/v2/v2.h deleted file mode 100644 index ad1bdd2f269a..000000000000 --- a/keyboards/cozykeys/speedo/v2/v2.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Paul Ewing - -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( \ - k00, k01, k02, k03, k04, k05, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \ -) { \ - { k00, k01, k02, k03, k04, k05, ___, ___, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, ___, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, ___, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \ -} diff --git a/keyboards/cozykeys/speedo/v3/info.json b/keyboards/cozykeys/speedo/v3/info.json index 0632dfd52df9..d368fd25fc89 100644 --- a/keyboards/cozykeys/speedo/v3/info.json +++ b/keyboards/cozykeys/speedo/v3/info.json @@ -21,72 +21,84 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k01", "x": 0.695, "y": 0, "r": 10 }, - { "label": "k02", "x": 1.679, "y": 0.174, "r": 10 }, - { "label": "k03", "x": 2.692, "y": 0.192, "r": 10 }, - { "label": "k04", "x": 3.722, "y": 0.107, "r": 10 }, - { "label": "k05", "x": 4.652, "y": 0.591, "r": 10 }, - { "label": "k06", "x": 5.591, "y": 1.023, "r": 10 }, - { "label": "k07", "x": 9.457, "y": 1.023, "r": -10 }, - { "label": "k08", "x": 10.396, "y": 0.591, "r": -10 }, - { "label": "k09", "x": 11.326, "y": 0.107, "r": -10 }, - { "label": "k10", "x": 12.356, "y": 0.192, "r": -10 }, - { "label": "k11", "x": 13.369, "y": 0.174, "r": -10 }, - { "label": "k12", "x": 14.353, "y": 0, "r": -10 }, - { "label": "k13", "x": 0.521, "y": 0.985, "r": 10 }, - { "label": "k14", "x": 1.506, "y": 1.158, "r": 10 }, - { "label": "k15", "x": 2.518, "y": 1.177, "r": 10 }, - { "label": "k16", "x": 3.548, "y": 1.092, "r": 10 }, - { "label": "k17", "x": 4.478, "y": 1.576, "r": 10 }, - { "label": "k18", "x": 5.418, "y": 2.008, "r": 10 }, - { "label": "k19", "x": 7.524, "y": 3.305, "r": 0 }, - { "label": "k20", "x": 9.63, "y": 2.008, "r": -10 }, - { "label": "k21", "x": 10.57, "y": 1.576, "r": -10 }, - { "label": "k22", "x": 11.5, "y": 1.092, "r": -10 }, - { "label": "k23", "x": 12.53, "y": 1.177, "r": -10 }, - { "label": "k24", "x": 13.542, "y": 1.158, "r": -10 }, - { "label": "k25", "x": 14.527, "y": 0.985, "r": -10 }, - { "label": "k26", "x": 0.347, "y": 1.97, "r": 10 }, - { "label": "k27", "x": 1.332, "y": 2.143, "r": 10 }, - { "label": "k28", "x": 2.344, "y": 2.162, "r": 10 }, - { "label": "k29", "x": 3.375, "y": 2.077, "r": 10 }, - { "label": "k30", "x": 4.305, "y": 2.561, "r": 10 }, - { "label": "k31", "x": 5.244, "y": 2.993, "r": 10 }, - { "label": "k32", "x": 6.524, "y": 3.805, "r": 0 }, - { "label": "k33", "x": 8.524, "y": 3.805, "r": 0 }, - { "label": "k34", "x": 9.804, "y": 2.993, "r": -10 }, - { "label": "k35", "x": 10.743, "y": 2.561, "r": -10 }, - { "label": "k36", "x": 11.673, "y": 2.077, "r": -10 }, - { "label": "k37", "x": 12.704, "y": 2.162, "r": -10 }, - { "label": "k38", "x": 13.716, "y": 2.143, "r": -10 }, - { "label": "k39", "x": 14.701, "y": 1.97, "r": -10 }, - { "label": "k40", "x": 0.174, "y": 2.954, "r": 10 }, - { "label": "k41", "x": 1.158, "y": 3.128, "r": 10 }, - { "label": "k42", "x": 2.171, "y": 3.147, "r": 10 }, - { "label": "k43", "x": 3.201, "y": 3.062, "r": 10 }, - { "label": "k44", "x": 4.131, "y": 3.546, "r": 10 }, - { "label": "k45", "x": 5.07, "y": 3.978, "r": 10 }, - { "label": "k46", "x": 7.524, "y": 4.305, "r": 0 }, - { "label": "k47", "x": 9.978, "y": 3.978, "r": -10 }, - { "label": "k48", "x": 10.917, "y": 3.546, "r": -10 }, - { "label": "k49", "x": 11.847, "y": 3.062, "r": -10 }, - { "label": "k50", "x": 12.877, "y": 3.147, "r": -10 }, - { "label": "k51", "x": 13.89, "y": 3.128, "r": -10 }, - { "label": "k52", "x": 14.874, "y": 2.954, "r": -10 }, - { "label": "k53", "x": 0, "y": 3.939, "r": 10 }, - { "label": "k54", "x": 0.985, "y": 4.113, "r": 10 }, - { "label": "k55", "x": 1.997, "y": 4.131, "r": 10 }, - { "label": "k56", "x": 3.027, "y": 4.047, "r": 10 }, - { "label": "k57", "x": 3.957, "y": 4.53, "r": 10 }, - { "label": "k58", "x": 4.897, "y": 4.963, "r": 10 }, - { "label": "k59", "x": 5.881, "y": 5.136, "r": 10 }, - { "label": "k60", "x": 9.166, "y": 5.136, "r": -10 }, - { "label": "k61", "x": 10.151, "y": 4.963, "r": -10 }, - { "label": "k62", "x": 11.09, "y": 4.53, "r": -10 }, - { "label": "k63", "x": 12.021, "y": 4.047, "r": -10 }, - { "label": "k64", "x": 13.051, "y": 4.131, "r": -10 }, - { "label": "k65", "x": 14.063, "y": 4.113, "r": -10 }, - { "label": "k66", "x": 15.048, "y": 3.939, "r": -10 } + {"matrix": [0, 0], "x": 0.695, "y": 0, "r": 10}, + {"matrix": [0, 1], "x": 1.679, "y": 0.174, "r": 10}, + {"matrix": [0, 2], "x": 2.692, "y": 0.192, "r": 10}, + {"matrix": [0, 3], "x": 3.722, "y": 0.107, "r": 10}, + {"matrix": [0, 4], "x": 4.652, "y": 0.591, "r": 10}, + {"matrix": [0, 5], "x": 5.591, "y": 1.023, "r": 10}, + + {"matrix": [0, 8], "x": 9.457, "y": 1.023, "r": -10}, + {"matrix": [0, 9], "x": 10.396, "y": 0.591, "r": -10}, + {"matrix": [0, 10], "x": 11.326, "y": 0.107, "r": -10}, + {"matrix": [0, 11], "x": 12.356, "y": 0.192, "r": -10}, + {"matrix": [0, 12], "x": 13.369, "y": 0.174, "r": -10}, + {"matrix": [0, 13], "x": 14.353, "y": 0, "r": -10}, + + {"matrix": [1, 0], "x": 0.521, "y": 0.985, "r": 10}, + {"matrix": [1, 1], "x": 1.506, "y": 1.158, "r": 10}, + {"matrix": [1, 2], "x": 2.518, "y": 1.177, "r": 10}, + {"matrix": [1, 3], "x": 3.548, "y": 1.092, "r": 10}, + {"matrix": [1, 4], "x": 4.478, "y": 1.576, "r": 10}, + {"matrix": [1, 5], "x": 5.418, "y": 2.008, "r": 10}, + + {"matrix": [2, 7], "x": 7.524, "y": 3.305, "r": 0}, + + {"matrix": [1, 8], "x": 9.63, "y": 2.008, "r": -10}, + {"matrix": [1, 9], "x": 10.57, "y": 1.576, "r": -10}, + {"matrix": [1, 10], "x": 11.5, "y": 1.092, "r": -10}, + {"matrix": [1, 11], "x": 12.53, "y": 1.177, "r": -10}, + {"matrix": [1, 12], "x": 13.542, "y": 1.158, "r": -10}, + {"matrix": [1, 13], "x": 14.527, "y": 0.985, "r": -10}, + + {"matrix": [2, 0], "x": 0.347, "y": 1.97, "r": 10}, + {"matrix": [2, 1], "x": 1.332, "y": 2.143, "r": 10}, + {"matrix": [2, 2], "x": 2.344, "y": 2.162, "r": 10}, + {"matrix": [2, 3], "x": 3.375, "y": 2.077, "r": 10}, + {"matrix": [2, 4], "x": 4.305, "y": 2.561, "r": 10}, + {"matrix": [2, 5], "x": 5.244, "y": 2.993, "r": 10}, + + {"matrix": [2, 6], "x": 6.524, "y": 3.805, "r": 0}, + {"matrix": [3, 7], "x": 8.524, "y": 3.805, "r": 0}, + + {"matrix": [2, 8], "x": 9.804, "y": 2.993, "r": -10}, + {"matrix": [2, 9], "x": 10.743, "y": 2.561, "r": -10}, + {"matrix": [2, 10], "x": 11.673, "y": 2.077, "r": -10}, + {"matrix": [2, 11], "x": 12.704, "y": 2.162, "r": -10}, + {"matrix": [2, 12], "x": 13.716, "y": 2.143, "r": -10}, + {"matrix": [2, 13], "x": 14.701, "y": 1.97, "r": -10}, + + {"matrix": [3, 0], "x": 0.174, "y": 2.954, "r": 10}, + {"matrix": [3, 1], "x": 1.158, "y": 3.128, "r": 10}, + {"matrix": [3, 2], "x": 2.171, "y": 3.147, "r": 10}, + {"matrix": [3, 3], "x": 3.201, "y": 3.062, "r": 10}, + {"matrix": [3, 4], "x": 4.131, "y": 3.546, "r": 10}, + {"matrix": [3, 5], "x": 5.07, "y": 3.978, "r": 10}, + + {"matrix": [3, 6], "x": 7.524, "y": 4.305, "r": 0}, + + {"matrix": [3, 8], "x": 9.978, "y": 3.978, "r": -10}, + {"matrix": [3, 9], "x": 10.917, "y": 3.546, "r": -10}, + {"matrix": [3, 10], "x": 11.847, "y": 3.062, "r": -10}, + {"matrix": [3, 11], "x": 12.877, "y": 3.147, "r": -10}, + {"matrix": [3, 12], "x": 13.89, "y": 3.128, "r": -10}, + {"matrix": [3, 13], "x": 14.874, "y": 2.954, "r": -10}, + + {"matrix": [4, 0], "x": 0, "y": 3.939, "r": 10}, + {"matrix": [4, 1], "x": 0.985, "y": 4.113, "r": 10}, + {"matrix": [4, 2], "x": 1.997, "y": 4.131, "r": 10}, + {"matrix": [4, 3], "x": 3.027, "y": 4.047, "r": 10}, + {"matrix": [4, 4], "x": 3.957, "y": 4.53, "r": 10}, + {"matrix": [4, 5], "x": 4.897, "y": 4.963, "r": 10}, + {"matrix": [4, 6], "x": 5.881, "y": 5.136, "r": 10}, + + {"matrix": [4, 7], "x": 9.166, "y": 5.136, "r": -10}, + {"matrix": [4, 8], "x": 10.151, "y": 4.963, "r": -10}, + {"matrix": [4, 9], "x": 11.09, "y": 4.53, "r": -10}, + {"matrix": [4, 10], "x": 12.021, "y": 4.047, "r": -10}, + {"matrix": [4, 11], "x": 13.051, "y": 4.131, "r": -10}, + {"matrix": [4, 12], "x": 14.063, "y": 4.113, "r": -10}, + {"matrix": [4, 13], "x": 15.048, "y": 3.939, "r": -10} ] } } diff --git a/keyboards/cozykeys/speedo/v3/v3.h b/keyboards/cozykeys/speedo/v3/v3.h deleted file mode 100644 index a8623c0f9594..000000000000 --- a/keyboards/cozykeys/speedo/v3/v3.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2020 Paul Ewing - -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( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \ - k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \ - k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \ - k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \ -) \ -{ \ - { k01, k02, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \ - { k13, k14, k15, k16, k17, k18, ___, ___, k20, k21, k22, k23, k24, k25 }, \ - { k26, k27, k28, k29, k30, k31, k32, k19, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k33, k47, k48, k49, k50, k51, k52 }, \ - { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \ -} diff --git a/keyboards/custommk/evo70/evo70.c b/keyboards/custommk/evo70/evo70.c index 23ec0ec8f177..f2874c4e8a24 100644 --- a/keyboards/custommk/evo70/evo70.c +++ b/keyboards/custommk/evo70/evo70.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "evo70.h" +#include "quantum.h" #include #include "matrix.h" #include OLED_FONT_H diff --git a/keyboards/custommk/evo70/evo70.h b/keyboards/custommk/evo70/evo70.h deleted file mode 100644 index 2766da19c99c..000000000000 --- a/keyboards/custommk/evo70/evo70.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 customMK - * - * 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( \ - K11, K61, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K62, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K66, K31, K63, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K57, K55, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K52, K54, K65, K51, K53, K56, K67, E00A, K59, K5A, E00B, K5C, K5D, K5E \ -) { \ - { K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K51, K52, K53, K54, K55, K56, K57, E00A, K59, K5A, E00B, K5C, K5D, K5E }, \ - { K61, K62, K63, KC_NO, K65, K66, K67, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/custommk/evo70/info.json b/keyboards/custommk/evo70/info.json index ee032bd5ee68..867423ba6452 100644 --- a/keyboards/custommk/evo70/info.json +++ b/keyboards/custommk/evo70/info.json @@ -52,82 +52,95 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"KC_ESC", "x":2.5, "y":1.1}, - {"label":"KC_1", "x":3.5, "y":1.1}, - {"label":"KC_2", "x":4.5, "y":1.1}, - {"label":"KC_3", "x":5.5, "y":1.1}, - {"label":"KC_4", "x":6.5, "y":1.1}, - {"label":"KC_5", "x":7.5, "y":1.1}, - {"label":"KC_6", "x":8.5, "y":1.1}, - {"label":"KC_7", "x":9.5, "y":1.1}, - {"label":"KC_8", "x":10.5, "y":1.1}, - {"label":"KC_9", "x":11.5, "y":1.1}, - {"label":"KC_0", "x":12.5, "y":1.1}, - {"label":"KC_MINS", "x":13.5, "y":1.1}, - {"label":"KC_EQL", "x":14.5, "y":1.1}, - {"label":"KC_BSPC", "x":15.5, "y":1.1, "w":2}, - {"label":"KC_DEL", "x":17.5, "y":1.1}, - {"label":"KC_TAB", "x":2.5, "y":2.1, "w":1.5}, - {"label":"KC_Q", "x":4, "y":2.1}, - {"label":"KC_W", "x":5, "y":2.1}, - {"label":"KC_E", "x":6, "y":2.1}, - {"label":"KC_R", "x":7, "y":2.1}, - {"label":"KC_T", "x":8, "y":2.1}, - {"label":"KC_Y", "x":9, "y":2.1}, - {"label":"KC_U", "x":10, "y":2.1}, - {"label":"KC_I", "x":11, "y":2.1}, - {"label":"KC_O", "x":12, "y":2.1}, - {"label":"KC_P", "x":13, "y":2.1}, - {"label":"KC_LBRC", "x":14, "y":2.1}, - {"label":"KC_RBRC", "x":15, "y":2.1}, - {"label":"KC_BSLS", "x":16, "y":2.1, "w":1.5}, - {"label":"KC_PGUP", "x":17.5, "y":2.1}, - {"label":"KC_F1", "x":0, "y":3.1}, - {"label":"KC_F2", "x":1, "y":3.1}, - {"label":"KC_CAPS", "x":2.5, "y":3.1, "w":1.75}, - {"label":"KC_A", "x":4.25, "y":3.1}, - {"label":"KC_S", "x":5.25, "y":3.1}, - {"label":"KC_D", "x":6.25, "y":3.1}, - {"label":"KC_F", "x":7.25, "y":3.1}, - {"label":"KC_G", "x":8.25, "y":3.1}, - {"label":"KC_H", "x":9.25, "y":3.1}, - {"label":"KC_J", "x":10.25, "y":3.1}, - {"label":"KC_K", "x":11.25, "y":3.1}, - {"label":"KC_L", "x":12.25, "y":3.1}, - {"label":"KC_SCLN", "x":13.25, "y":3.1}, - {"label":"KC_QUOT", "x":14.25, "y":3.1}, - {"label":"KC_ENT", "x":15.25, "y":3.1, "w":2.25}, - {"label":"KC_PGDN", "x":17.5, "y":3.1}, - {"label":"KC_F3", "x":0, "y":4.1}, - {"label":"KC_F4", "x":1, "y":4.1}, - {"label":"KC_LSFT", "x":2.5, "y":4.1, "w":2.25}, - {"label":"KC_Z", "x":4.75, "y":4.1}, - {"label":"KC_X", "x":5.75, "y":4.1}, - {"label":"KC_C", "x":6.75, "y":4.1}, - {"label":"KC_V", "x":7.75, "y":4.1}, - {"label":"KC_B", "x":8.75, "y":4.1}, - {"label":"KC_N", "x":9.75, "y":4.1}, - {"label":"KC_M", "x":10.75, "y":4.1}, - {"label":"KC_COMM", "x":11.75, "y":4.1}, - {"label":"KC_DOT", "x":12.75, "y":4.1}, - {"label":"KC_SLSH", "x":13.75, "y":4.1}, - {"label":"KC_RSFT", "x":14.75, "y":4.1, "w":1.75}, - {"label":"KC_UP", "x":16.5, "y":4.1}, - {"label":"KC_END", "x":17.5, "y":4.1}, - {"label":"KC_F5", "x":0, "y":5.1}, - {"label":"KC_F6", "x":1, "y":5.1}, - {"label":"KC_LCTL", "x":2.5, "y":5.1, "w":1.25}, - {"label":"KC_LGUI", "x":3.75, "y":5.1, "w":1.25}, - {"label":"KC_LALT", "x":5, "y":5.1, "w":1.25}, - {"label":"KC_SPC", "x":6.25, "y":5.1, "w":6.25}, - {"label":"KC_TRNS", "x":0.5, "y":1.1}, - {"label":"KC_VOLD", "x":0, "y":0}, - {"label":"KC_RALT", "x":12.5, "y":5.1, "w":1.25}, - {"label":"KC_RCTL", "x":13.75, "y":5.1, "w":1.25}, - {"label":"KC_VOLU", "x":1, "y":0}, - {"label":"KC_LEFT", "x":15.5, "y":5.1}, - {"label":"KC_DOWN", "x":16.5, "y":5.1}, - {"label":"KC_RGHT", "x":17.5, "y":5.1}] + {"matrix": [0, 0], "x": 2.5, "y": 1.1}, + {"matrix": [5, 0], "x": 3.5, "y": 1.1}, + {"matrix": [0, 1], "x": 4.5, "y": 1.1}, + {"matrix": [0, 2], "x": 5.5, "y": 1.1}, + {"matrix": [0, 3], "x": 6.5, "y": 1.1}, + {"matrix": [0, 4], "x": 7.5, "y": 1.1}, + {"matrix": [0, 5], "x": 8.5, "y": 1.1}, + {"matrix": [0, 6], "x": 9.5, "y": 1.1}, + {"matrix": [0, 7], "x": 10.5, "y": 1.1}, + {"matrix": [0, 8], "x": 11.5, "y": 1.1}, + {"matrix": [0, 9], "x": 12.5, "y": 1.1}, + {"matrix": [0, 10], "x": 13.5, "y": 1.1}, + {"matrix": [0, 11], "x": 14.5, "y": 1.1}, + {"matrix": [0, 12], "x": 15.5, "y": 1.1, "w": 2}, + {"matrix": [0, 13], "x": 17.5, "y": 1.1}, + + {"matrix": [5, 1], "x": 2.5, "y": 2.1, "w": 1.5}, + {"matrix": [1, 0], "x": 4, "y": 2.1}, + {"matrix": [1, 1], "x": 5, "y": 2.1}, + {"matrix": [1, 2], "x": 6, "y": 2.1}, + {"matrix": [1, 3], "x": 7, "y": 2.1}, + {"matrix": [1, 4], "x": 8, "y": 2.1}, + {"matrix": [1, 5], "x": 9, "y": 2.1}, + {"matrix": [1, 6], "x": 10, "y": 2.1}, + {"matrix": [1, 7], "x": 11, "y": 2.1}, + {"matrix": [1, 8], "x": 12, "y": 2.1}, + {"matrix": [1, 9], "x": 13, "y": 2.1}, + {"matrix": [1, 10], "x": 14, "y": 2.1}, + {"matrix": [1, 11], "x": 15, "y": 2.1}, + {"matrix": [1, 12], "x": 16, "y": 2.1, "w": 1.5}, + {"matrix": [1, 13], "x": 17.5, "y": 2.1}, + + {"matrix": [5, 5], "x": 0, "y": 3.1}, + {"matrix": [2, 0], "x": 1, "y": 3.1}, + + {"matrix": [5, 2], "x": 2.5, "y": 3.1, "w": 1.75}, + {"matrix": [2, 1], "x": 4.25, "y": 3.1}, + {"matrix": [2, 2], "x": 5.25, "y": 3.1}, + {"matrix": [2, 3], "x": 6.25, "y": 3.1}, + {"matrix": [2, 4], "x": 7.25, "y": 3.1}, + {"matrix": [2, 5], "x": 8.25, "y": 3.1}, + {"matrix": [2, 6], "x": 9.25, "y": 3.1}, + {"matrix": [2, 7], "x": 10.25, "y": 3.1}, + {"matrix": [2, 8], "x": 11.25, "y": 3.1}, + {"matrix": [2, 9], "x": 12.25, "y": 3.1}, + {"matrix": [2, 10], "x": 13.25, "y": 3.1}, + {"matrix": [2, 11], "x": 14.25, "y": 3.1}, + {"matrix": [2, 12], "x": 15.25, "y": 3.1, "w": 2.25}, + {"matrix": [2, 13], "x": 17.5, "y": 3.1}, + + {"matrix": [4, 6], "x": 0, "y": 4.1}, + {"matrix": [4, 4], "x": 1, "y": 4.1}, + + {"matrix": [3, 0], "x": 2.5, "y": 4.1, "w": 2.25}, + {"matrix": [3, 1], "x": 4.75, "y": 4.1}, + {"matrix": [3, 2], "x": 5.75, "y": 4.1}, + {"matrix": [3, 3], "x": 6.75, "y": 4.1}, + {"matrix": [3, 4], "x": 7.75, "y": 4.1}, + {"matrix": [3, 5], "x": 8.75, "y": 4.1}, + {"matrix": [3, 6], "x": 9.75, "y": 4.1}, + {"matrix": [3, 7], "x": 10.75, "y": 4.1}, + {"matrix": [3, 8], "x": 11.75, "y": 4.1}, + {"matrix": [3, 9], "x": 12.75, "y": 4.1}, + {"matrix": [3, 10], "x": 13.75, "y": 4.1}, + {"matrix": [3, 11], "x": 14.75, "y": 4.1, "w": 1.75}, + {"matrix": [3, 12], "x": 16.5, "y": 4.1}, + {"matrix": [3, 13], "x": 17.5, "y": 4.1}, + + {"matrix": [4, 1], "x": 0, "y": 5.1}, + {"matrix": [4, 3], "x": 1, "y": 5.1}, + + {"matrix": [5, 4], "x": 2.5, "y": 5.1, "w": 1.25}, + {"matrix": [4, 0], "x": 3.75, "y": 5.1, "w": 1.25}, + {"matrix": [4, 2], "x": 5, "y": 5.1, "w": 1.25}, + {"matrix": [4, 5], "x": 6.25, "y": 5.1, "w": 6.25}, + + {"matrix": [5, 6], "x": 0.5, "y": 1.1}, + + {"matrix": [4, 7], "x": 0, "y": 0}, + + {"matrix": [4, 8], "x": 12.5, "y": 5.1, "w": 1.25}, + {"matrix": [4, 9], "x": 13.75, "y": 5.1, "w": 1.25}, + + {"matrix": [4, 10], "x": 1, "y": 0}, + + {"matrix": [4, 11], "x": 15.5, "y": 5.1}, + {"matrix": [4, 12], "x": 16.5, "y": 5.1}, + {"matrix": [4, 13], "x": 17.5, "y": 5.1} + ] } } } diff --git a/keyboards/dailycraft/bat43/info.json b/keyboards/dailycraft/bat43/info.json index 93d7ca1423ff..2850b273d278 100644 --- a/keyboards/dailycraft/bat43/info.json +++ b/keyboards/dailycraft/bat43/info.json @@ -14,69 +14,5 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"k00", "x":0, "y":1.43}, - {"label":"k01", "x":1, "y":1.11}, - {"label":"k02", "x":2, "y":0.38}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0.05}, - {"label":"k05", "x":5, "y":0.16}, - - {"label":"k40", "x":9, "y":0.16}, - {"label":"k41", "x":10, "y":0.05}, - {"label":"k42", "x":11, "y":0}, - {"label":"k43", "x":12, "y":0.38}, - {"label":"k44", "x":13, "y":1.11}, - {"label":"k45", "x":14, "y":1.43}, - - {"label":"k10", "x":0, "y":2.43}, - {"label":"k11", "x":1, "y":2.11}, - {"label":"k12", "x":2, "y":1.38}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1.05}, - {"label":"k15", "x":5, "y":1.16}, - - {"label":"k30", "x":7, "y":1.16}, - - {"label":"k50", "x":9, "y":1.16}, - {"label":"k51", "x":10, "y":1.05}, - {"label":"k52", "x":11, "y":1}, - {"label":"k53", "x":12, "y":1.38}, - {"label":"k54", "x":13, "y":2.11}, - {"label":"k55", "x":14, "y":2.43}, - - {"label":"k20", "x":0, "y":3.43}, - {"label":"k21", "x":1, "y":3.11}, - {"label":"k22", "x":2, "y":2.38}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2.05}, - {"label":"k25", "x":5, "y":2.16}, - - {"label":"k60", "x":9, "y":2.16}, - {"label":"k61", "x":10, "y":2.05}, - {"label":"k62", "x":11, "y":2}, - {"label":"k63", "x":12, "y":2.38}, - {"label":"k64", "x":13, "y":3.11}, - {"label":"k65", "x":14, "y":3.43}, - - {"label":"k33", "x":4, "y":3.3}, - {"label":"k34", "x":5, "y":3.3}, - {"label":"k35", "x":6, "y":3.3}, - - {"label":"k70", "x":8, "y":3.3}, - {"label":"k71", "x":9, "y":3.3}, - {"label":"k72", "x":10, "y":3.3}, - - {"label":"k75", "x":5.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k74", "x":6.1, "y":4.3, "w":0.8, "h":0.8}, - - {"label":"k73", "x":8.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k31", "x":9.1, "y":4.3, "w":0.8, "h":0.8}, - {"label":"k32", "x":10.1, "y":4.3, "w":0.8, "h":0.8} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/dailycraft/bat43/rev1/info.json b/keyboards/dailycraft/bat43/rev1/info.json new file mode 100644 index 000000000000..c3540002fb7f --- /dev/null +++ b/keyboards/dailycraft/bat43/rev1/info.json @@ -0,0 +1,56 @@ +{ + "layouts": { + "LAYOUT": { + "layout": [ + {"label": "k00", "matrix": [0, 0], "x": 0, "y": 1.43}, + {"label": "k01", "matrix": [0, 1], "x": 1, "y": 1.11}, + {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0.38}, + {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0.05}, + {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0.16}, + {"label": "k40", "matrix": [4, 0], "x": 9, "y": 0.16}, + {"label": "k41", "matrix": [4, 1], "x": 10, "y": 0.05}, + {"label": "k42", "matrix": [4, 2], "x": 11, "y": 0}, + {"label": "k43", "matrix": [4, 3], "x": 12, "y": 0.38}, + {"label": "k44", "matrix": [4, 4], "x": 13, "y": 1.11}, + {"label": "k45", "matrix": [4, 5], "x": 14, "y": 1.43}, + {"label": "k10", "matrix": [1, 0], "x": 0, "y": 2.43}, + {"label": "k11", "matrix": [1, 1], "x": 1, "y": 2.11}, + {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1.38}, + {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1.05}, + {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1.16}, + {"label": "k30", "matrix": [3, 0], "x": 7, "y": 1.16}, + {"label": "k50", "matrix": [5, 0], "x": 9, "y": 1.16}, + {"label": "k51", "matrix": [5, 1], "x": 10, "y": 1.05}, + {"label": "k52", "matrix": [5, 2], "x": 11, "y": 1}, + {"label": "k53", "matrix": [5, 3], "x": 12, "y": 1.38}, + {"label": "k54", "matrix": [5, 4], "x": 13, "y": 2.11}, + {"label": "k55", "matrix": [5, 5], "x": 14, "y": 2.43}, + {"label": "k20", "matrix": [2, 0], "x": 0, "y": 3.43}, + {"label": "k21", "matrix": [2, 1], "x": 1, "y": 3.11}, + {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2.38}, + {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2.05}, + {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2.16}, + {"label": "k60", "matrix": [6, 0], "x": 9, "y": 2.16}, + {"label": "k61", "matrix": [6, 1], "x": 10, "y": 2.05}, + {"label": "k62", "matrix": [6, 2], "x": 11, "y": 2}, + {"label": "k63", "matrix": [6, 3], "x": 12, "y": 2.38}, + {"label": "k64", "matrix": [6, 4], "x": 13, "y": 3.11}, + {"label": "k65", "matrix": [6, 5], "x": 14, "y": 3.43}, + {"label": "k33", "matrix": [3, 3], "x": 4, "y": 3.3}, + {"label": "k34", "matrix": [3, 4], "x": 5, "y": 3.3}, + {"label": "k35", "matrix": [3, 5], "x": 6, "y": 3.3}, + {"label": "k70", "matrix": [7, 0], "x": 8, "y": 3.3}, + {"label": "k71", "matrix": [7, 1], "x": 9, "y": 3.3}, + {"label": "k72", "matrix": [7, 2], "x": 10, "y": 3.3}, + {"label": "k75", "matrix": [7, 4], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k74", "matrix": [7, 5], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k73", "matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k31", "matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"label": "k32", "matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8} + ] + } + } +} diff --git a/keyboards/dailycraft/bat43/rev1/rev1.h b/keyboards/dailycraft/bat43/rev1/rev1.h deleted file mode 100644 index cf21486a9e54..000000000000 --- a/keyboards/dailycraft/bat43/rev1/rev1.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k33, k34, k35, k70, k71, k72, \ - k74, k75, k73, k31, k32 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ -} diff --git a/keyboards/dailycraft/bat43/rev2/info.json b/keyboards/dailycraft/bat43/rev2/info.json new file mode 100644 index 000000000000..d60e5b8ae622 --- /dev/null +++ b/keyboards/dailycraft/bat43/rev2/info.json @@ -0,0 +1,66 @@ +{ + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 1.43}, + {"matrix": [0, 1], "x": 1, "y": 1.11}, + {"matrix": [0, 2], "x": 2, "y": 0.38}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.05}, + {"matrix": [0, 5], "x": 5, "y": 0.16}, + + {"matrix": [4, 0], "x": 9, "y": 0.16}, + {"matrix": [4, 1], "x": 10, "y": 0.05}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0.38}, + {"matrix": [4, 4], "x": 13, "y": 1.11}, + {"matrix": [4, 5], "x": 14, "y": 1.43}, + + {"matrix": [1, 0], "x": 0, "y": 2.43}, + {"matrix": [1, 1], "x": 1, "y": 2.11}, + {"matrix": [1, 2], "x": 2, "y": 1.38}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.05}, + {"matrix": [1, 5], "x": 5, "y": 1.16}, + + {"matrix": [3, 0], "x": 7, "y": 1.16}, + + {"matrix": [5, 0], "x": 9, "y": 1.16}, + {"matrix": [5, 1], "x": 10, "y": 1.05}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1.38}, + {"matrix": [5, 4], "x": 13, "y": 2.11}, + {"matrix": [5, 5], "x": 14, "y": 2.43}, + + {"matrix": [2, 0], "x": 0, "y": 3.43}, + {"matrix": [2, 1], "x": 1, "y": 3.11}, + {"matrix": [2, 2], "x": 2, "y": 2.38}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.05}, + {"matrix": [2, 5], "x": 5, "y": 2.16}, + + {"matrix": [6, 0], "x": 9, "y": 2.16}, + {"matrix": [6, 1], "x": 10, "y": 2.05}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2.38}, + {"matrix": [6, 4], "x": 13, "y": 3.11}, + {"matrix": [6, 5], "x": 14, "y": 3.43}, + + {"matrix": [3, 3], "x": 4, "y": 3.3}, + {"matrix": [3, 4], "x": 5, "y": 3.3}, + {"matrix": [3, 5], "x": 6, "y": 3.3}, + + {"matrix": [7, 0], "x": 8, "y": 3.3}, + {"matrix": [7, 1], "x": 9, "y": 3.3}, + {"matrix": [7, 2], "x": 10, "y": 3.3}, + + {"matrix": [7, 5], "x": 5.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"matrix": [7, 4], "x": 6.1, "y": 4.3, "w": 0.8, "h": 0.8}, + + {"matrix": [7, 3], "x": 8.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"matrix": [3, 1], "x": 9.1, "y": 4.3, "w": 0.8, "h": 0.8}, + {"matrix": [3, 2], "x": 10.1, "y": 4.3, "w": 0.8, "h": 0.8} + ] + } + } +} diff --git a/keyboards/dailycraft/bat43/rev2/rev2.h b/keyboards/dailycraft/bat43/rev2/rev2.h deleted file mode 100644 index f84cdbaa4d42..000000000000 --- a/keyboards/dailycraft/bat43/rev2/rev2.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 yfuku - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k30, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k33, k34, k35, k70, k71, k72, \ - k75, k74, k73, k31, k32 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ -} diff --git a/keyboards/dailycraft/claw44/rev1/info.json b/keyboards/dailycraft/claw44/rev1/info.json index 9173f12edce7..622e534864b0 100644 --- a/keyboards/dailycraft/claw44/rev1/info.json +++ b/keyboards/dailycraft/claw44/rev1/info.json @@ -21,50 +21,58 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":1.18}, - {"label":"L01", "x":1, "y":1.03}, - {"label":"L02", "x":2, "y":0.35}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.05}, - {"label":"L05", "x":5, "y":0.1}, - {"label":"R00", "x":11.5, "y":0.1}, - {"label":"R01", "x":12.5, "y":0.05}, - {"label":"R02", "x":13.5, "y":0}, - {"label":"R03", "x":14.5, "y":0.35}, - {"label":"R04", "x":15.5, "y":1.08}, - {"label":"R05", "x":16.5, "y":1.18}, - {"label":"L10", "x":0, "y":2.18}, - {"label":"L11", "x":1, "y":2.03}, - {"label":"L12", "x":2, "y":1.35}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.05}, - {"label":"L15", "x":5, "y":1.1}, - {"label":"R10", "x":11.5, "y":1.1}, - {"label":"R11", "x":12.5, "y":1.05}, - {"label":"R12", "x":13.5, "y":1}, - {"label":"R13", "x":14.5, "y":1.35}, - {"label":"R14", "x":15.5, "y":2.03}, - {"label":"R15", "x":16.5, "y":2.18}, - {"label":"L20", "x":0, "y":3.18}, - {"label":"L21", "x":1, "y":3.03}, - {"label":"L22", "x":2, "y":2.35}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.05}, - {"label":"L25", "x":5, "y":2.1}, - {"label":"R20", "x":11.5, "y":2.1}, - {"label":"R21", "x":12.5, "y":2.05}, - {"label":"R22", "x":13.5, "y":2}, - {"label":"R23", "x":14.5, "y":2.35}, - {"label":"R24", "x":15.5, "y":3.03}, - {"label":"R25", "x":16.5, "y":3.18}, - {"label":"L30", "x":4, "y":3.05}, - {"label":"L31", "x":5, "y":3.1}, - {"label":"L32", "x":6, "y":3.2, "w":1.25}, - {"label":"L33", "x":7.25, "y":3.5}, - {"label":"R30", "x":9.25, "y":3.5}, - {"label":"R31", "x":10.25, "y":3.2, "w":1.25}, - {"label":"R32", "x":11.5, "y":3.1}, - {"label":"R33", "x":12.5, "y":3.05} + {"matrix": [0, 0], "x": 0, "y": 1.18}, + {"matrix": [0, 1], "x": 1, "y": 1.03}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.05}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + + {"matrix": [4, 5], "x": 11.5, "y": 0.1}, + {"matrix": [4, 4], "x": 12.5, "y": 0.05}, + {"matrix": [4, 3], "x": 13.5, "y": 0}, + {"matrix": [4, 2], "x": 14.5, "y": 0.35}, + {"matrix": [4, 1], "x": 15.5, "y": 1.08}, + {"matrix": [4, 0], "x": 16.5, "y": 1.18}, + + {"matrix": [1, 0], "x": 0, "y": 2.18}, + {"matrix": [1, 1], "x": 1, "y": 2.03}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.05}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + + {"matrix": [5, 5], "x": 11.5, "y": 1.1}, + {"matrix": [5, 4], "x": 12.5, "y": 1.05}, + {"matrix": [5, 3], "x": 13.5, "y": 1}, + {"matrix": [5, 2], "x": 14.5, "y": 1.35}, + {"matrix": [5, 1], "x": 15.5, "y": 2.03}, + {"matrix": [5, 0], "x": 16.5, "y": 2.18}, + + {"matrix": [2, 0], "x": 0, "y": 3.18}, + {"matrix": [2, 1], "x": 1, "y": 3.03}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.05}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + + {"matrix": [6, 5], "x": 11.5, "y": 2.1}, + {"matrix": [6, 4], "x": 12.5, "y": 2.05}, + {"matrix": [6, 3], "x": 13.5, "y": 2}, + {"matrix": [6, 2], "x": 14.5, "y": 2.35}, + {"matrix": [6, 1], "x": 15.5, "y": 3.03}, + {"matrix": [6, 0], "x": 16.5, "y": 3.18}, + + {"matrix": [3, 2], "x": 4, "y": 3.05}, + {"matrix": [3, 3], "x": 5, "y": 3.1}, + {"matrix": [3, 4], "x": 6, "y": 3.2, "w": 1.25}, + + {"matrix": [3, 5], "x": 7.25, "y": 3.5}, + + {"matrix": [7, 5], "x": 9.25, "y": 3.5}, + {"matrix": [7, 4], "x": 10.25, "y": 3.2, "w": 1.25}, + {"matrix": [7, 3], "x": 11.5, "y": 3.1}, + {"matrix": [7, 2], "x": 12.5, "y": 3.05} ] } } diff --git a/keyboards/dailycraft/claw44/rev1/rev1.h b/keyboards/dailycraft/claw44/rev1/rev1.h deleted file mode 100644 index 9a05977153fb..000000000000 --- a/keyboards/dailycraft/claw44/rev1/rev1.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, R30, R31, R32, R33 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ - } diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/info.json b/keyboards/dailycraft/wings42/rev1_extkeys/info.json index 164e77017205..53db2db4ca6e 100644 --- a/keyboards/dailycraft/wings42/rev1_extkeys/info.json +++ b/keyboards/dailycraft/wings42/rev1_extkeys/info.json @@ -18,58 +18,62 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0.875}, - {"label":"L01", "x":1, "y":0.625}, - {"label":"L02", "x":2, "y":0.375}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0.125}, - {"label":"R00", "x":9, "y":0.125}, - {"label":"R01", "x":10, "y":0}, - {"label":"R02", "x":11, "y":0}, - {"label":"R03", "x":12, "y":0.375}, - {"label":"R04", "x":13, "y":0.625}, - {"label":"R05", "x":14, "y":0.875}, + {"matrix": [0, 0], "x": 0, "y": 0.875}, + {"matrix": [0, 1], "x": 1, "y": 0.625}, + {"matrix": [0, 2], "x": 2, "y": 0.375}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.125}, - {"label":"L10", "x":0, "y":1.875}, - {"label":"L11", "x":1, "y":1.625}, - {"label":"L12", "x":2, "y":1.375}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1.125}, - {"label":"E01", "x":6, "y":1.625}, - {"label":"E03", "x":8, "y":1.625}, - {"label":"R10", "x":9, "y":1.125}, - {"label":"R11", "x":10, "y":1}, - {"label":"R12", "x":11, "y":1}, - {"label":"R13", "x":12, "y":1.375}, - {"label":"R14", "x":13, "y":1.625}, - {"label":"R15", "x":14, "y":1.875}, + {"matrix": [6, 5], "x": 9, "y": 0.125}, + {"matrix": [6, 4], "x": 10, "y": 0}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0.375}, + {"matrix": [6, 1], "x": 13, "y": 0.625}, + {"matrix": [6, 0], "x": 14, "y": 0.875}, - {"label":"L20", "x":0, "y":2.875}, - {"label":"L21", "x":1, "y":2.625}, - {"label":"L22", "x":2, "y":2.375}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2.125}, - {"label":"E02", "x":6, "y":2.625}, - {"label":"E04", "x":8, "y":2.625}, - {"label":"R20", "x":9, "y":2.125}, - {"label":"R21", "x":10, "y":2}, - {"label":"R22", "x":11, "y":2}, - {"label":"R23", "x":12, "y":2.375}, - {"label":"R24", "x":13, "y":2.625}, - {"label":"R25", "x":14, "y":2.875}, + {"matrix": [1, 0], "x": 0, "y": 1.875}, + {"matrix": [1, 1], "x": 1, "y": 1.625}, + {"matrix": [1, 2], "x": 2, "y": 1.375}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.125}, + {"matrix": [5, 7], "x": 6, "y": 1.625}, - {"label":"L30", "x":4, "y":3}, - {"label":"L31", "x":5, "y":3.125}, - {"label":"L32", "x":6, "y":3.375}, - {"label":"R30", "x":8, "y":3.375}, - {"label":"R31", "x":9, "y":3.125}, - {"label":"R32", "x":10, "y":3} + {"matrix": [11, 7], "x": 8, "y": 1.625}, + {"matrix": [7, 5], "x": 9, "y": 1.125}, + {"matrix": [7, 4], "x": 10, "y": 1}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1.375}, + {"matrix": [7, 1], "x": 13, "y": 1.625}, + {"matrix": [7, 0], "x": 14, "y": 1.875}, + + {"matrix": [2, 0], "x": 0, "y": 2.875}, + {"matrix": [2, 1], "x": 1, "y": 2.625}, + {"matrix": [2, 2], "x": 2, "y": 2.375}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.125}, + {"matrix": [4, 6], "x": 6, "y": 2.625}, + + {"matrix": [10, 6], "x": 8, "y": 2.625}, + {"matrix": [8, 5], "x": 9, "y": 2.125}, + {"matrix": [8, 4], "x": 10, "y": 2}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2.375}, + {"matrix": [8, 1], "x": 13, "y": 2.625}, + {"matrix": [8, 0], "x": 14, "y": 2.875}, + + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.125}, + {"matrix": [3, 5], "x": 6, "y": 3.375}, + + {"matrix": [9, 5], "x": 8, "y": 3.375}, + {"matrix": [9, 4], "x": 9, "y": 3.125}, + {"matrix": [9, 3], "x": 10, "y": 3} ] } } diff --git a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h b/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h deleted file mode 100644 index 2ad58047f14d..000000000000 --- a/keyboards/dailycraft/wings42/rev1_extkeys/rev1_extkeys.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2021 yfuku - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, E01, E03, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, E02, E04, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, L30, L31, L32, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E02, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E01 }, \ - { R05, R04, R03, R02, R01, R00, KC_NO, KC_NO }, \ - { R15, R14, R13, R12, R11, R10, KC_NO, KC_NO }, \ - { R25, R24, R23, R22, R21, R20, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, R32, R31, R30, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E04, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, E03} \ - } diff --git a/keyboards/db/db63/db63.h b/keyboards/db/db63/db63.h deleted file mode 100644 index d9a4d1e6d24f..000000000000 --- a/keyboards/db/db63/db63.h +++ /dev/null @@ -1,49 +0,0 @@ -/* -Copyright 2020 Hung DO - -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 _x_ KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - * MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5 } - * MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2 } - * - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10 , k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20 , k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30 , k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40 , k41 , k42 , k43 , k44, k45, k46, k47 , k48 \ -) { \ - { k00, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_, _x_ }, \ - { _x_, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k46 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3c, k3a, k47, _x_ }, \ - { k40, k41, k42, k43, k45, _x_, _x_, k44, _x_, _x_, _x_, k3b, _x_, k48 } \ -} - diff --git a/keyboards/db/db63/info.json b/keyboards/db/db63/info.json index c32eca3baf12..c8004a2bae17 100644 --- a/keyboards/db/db63/info.json +++ b/keyboards/db/db63/info.json @@ -24,11 +24,73 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "~", "x": 0, "y": 0 }, { "label": "!", "x": 1, "y": 0 }, { "label": "@", "x": 2, "y": 0 }, { "label": "#", "x": 3, "y": 0 }, { "label": "$", "x": 4, "y": 0 }, { "label": "%", "x": 5, "y": 0 }, { "label": "^", "x": 6, "y": 0 }, { "label": "&", "x": 7, "y": 0 }, { "label": "*", "x": 8, "y": 0 }, { "label": "(", "x": 9, "y": 0 }, { "label": ")", "x": 10, "y": 0 }, { "label": "_", "x": 11, "y": 0 }, { "label": "+", "x": 12, "y": 0 }, { "label": "Backspace", "x": 13, "y": 0, "w": 2 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, { "label": "Q", "x": 1.5, "y": 1 }, { "label": "W", "x": 2.5, "y": 1 }, { "label": "E", "x": 3.5, "y": 1 }, { "label": "R", "x": 4.5, "y": 1 }, { "label": "T", "x": 5.5, "y": 1 }, { "label": "Y", "x": 6.5, "y": 1 }, { "label": "U", "x": 7.5, "y": 1 }, { "label": "I", "x": 8.5, "y": 1 }, { "label": "O", "x": 9.5, "y": 1 }, { "label": "P", "x": 10.5, "y": 1 }, { "label": "{", "x": 11.5, "y": 1 }, { "label": "}", "x": 12.5, "y": 1 }, { "label": "|", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Fn3", "x": 0, "y": 2, "w": 1.75 }, { "label": "A", "x": 1.75, "y": 2 }, { "label": "S", "x": 2.75, "y": 2 }, { "label": "D", "x": 3.75, "y": 2 }, { "label": "F", "x": 4.75, "y": 2 }, { "label": "G", "x": 5.75, "y": 2 }, { "label": "H", "x": 6.75, "y": 2 }, { "label": "J", "x": 7.75, "y": 2 }, { "label": "K", "x": 8.75, "y": 2 }, { "label": "L", "x": 9.75, "y": 2 }, { "label": ":", "x": 10.75, "y": 2 }, { "label": "\"", "x": 11.75, "y": 2 }, { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, { "label": "Z", "x": 2.25, "y": 3 }, { "label": "X", "x": 3.25, "y": 3 }, { "label": "C", "x": 4.25, "y": 3 }, { "label": "V", "x": 5.25, "y": 3 }, { "label": "B", "x": 6.25, "y": 3 }, { "label": "N", "x": 7.25, "y": 3 }, { "label": "M", "x": 8.25, "y": 3 }, { "label": "<", "x": 9.25, "y": 3 }, { "label": ">", "x": 10.25, "y": 3 }, { "label": "Shift", "x": 11.25, "y": 3, "w": 1.75 }, { "label": "Up", "x": 13, "y": 3 }, { "label": "Fn2", "x": 14, "y": 3 }, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 }, { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 }, { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 }, { "label": "?", "x": 10, "y": 4 }, { "label": "Fn1", "x": 11, "y": 4 }, { "label": "Left", "x": 12, "y": 4 }, { "label": "Down", "x": 13, "y": 4 }, { "label": "Right", "x": 14, "y": 4 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 1], "x": 1, "y": 0}, + {"matrix": [1, 2], "x": 2, "y": 0}, + {"matrix": [1, 3], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [1, 5], "x": 5, "y": 0}, + {"matrix": [1, 6], "x": 6, "y": 0}, + {"matrix": [1, 7], "x": 7, "y": 0}, + {"matrix": [1, 8], "x": 8, "y": 0}, + {"matrix": [1, 9], "x": 9, "y": 0}, + {"matrix": [1, 10], "x": 10, "y": 0}, + {"matrix": [1, 11], "x": 11, "y": 0}, + {"matrix": [1, 12], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0, "w": 2}, + + {"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": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [2, 9], "x": 9.5, "y": 1}, + {"matrix": [2, 10], "x": 10.5, "y": 1}, + {"matrix": [2, 11], "x": 11.5, "y": 1}, + {"matrix": [2, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [3, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 3], "x": 3.75, "y": 2}, + {"matrix": [3, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 2}, + {"matrix": [3, 6], "x": 6.75, "y": 2}, + {"matrix": [3, 7], "x": 7.75, "y": 2}, + {"matrix": [3, 8], "x": 8.75, "y": 2}, + {"matrix": [3, 9], "x": 9.75, "y": 2}, + {"matrix": [3, 10], "x": 10.75, "y": 2}, + {"matrix": [3, 11], "x": 11.75, "y": 2}, + {"matrix": [3, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 3}, + {"matrix": [4, 2], "x": 3.25, "y": 3}, + {"matrix": [4, 3], "x": 4.25, "y": 3}, + {"matrix": [4, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [4, 6], "x": 7.25, "y": 3}, + {"matrix": [4, 7], "x": 8.25, "y": 3}, + {"matrix": [4, 8], "x": 9.25, "y": 3}, + {"matrix": [4, 9], "x": 10.25, "y": 3}, + {"matrix": [4, 11], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [5, 11], "x": 13, "y": 3}, + {"matrix": [4, 10], "x": 14, "y": 3}, + + {"matrix": [5, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [5, 7], "x": 10, "y": 4}, + {"matrix": [5, 4], "x": 11, "y": 4}, + {"matrix": [3, 13], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [5, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/delikeeb/vanana/info.json b/keyboards/delikeeb/vanana/info.json index 3f650277467f..520cd92b09cf 100644 --- a/keyboards/delikeeb/vanana/info.json +++ b/keyboards/delikeeb/vanana/info.json @@ -7,10 +7,5 @@ "pid": "0x0013" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":7, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":7, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4, "w":1.25}, {"x":5.25, "y":4, "w":1.5}, {"x":8.25, "y":4, "w":1.5}, {"x":9.75, "y":4, "w":1.25}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}] - } - } + "bootloader": "atmel-dfu" } diff --git a/keyboards/delikeeb/vanana/rev1/info.json b/keyboards/delikeeb/vanana/rev1/info.json index f62481333d89..4a7d4c77180d 100644 --- a/keyboards/delikeeb/vanana/rev1/info.json +++ b/keyboards/delikeeb/vanana/rev1/info.json @@ -16,5 +16,82 @@ {"pin_a": "C7", "pin_b": "D5"}, {"pin_a": "F1", "pin_b": "F0"} ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"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": 9, "y": 0}, + {"matrix": [0, 7], "x": 10, "y": 0}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0}, + {"matrix": [0, 10], "x": 13, "y": 0}, + {"matrix": [0, 11], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 6], "x": 9, "y": 1}, + {"matrix": [1, 7], "x": 10, "y": 1}, + {"matrix": [1, 8], "x": 11, "y": 1}, + {"matrix": [1, 9], "x": 12, "y": 1}, + {"matrix": [1, 10], "x": 13, "y": 1}, + {"matrix": [1, 11], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [4, 0], "x": 7, "y": 2}, + + {"matrix": [2, 6], "x": 9, "y": 2}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2}, + {"matrix": [2, 10], "x": 13, "y": 2}, + {"matrix": [2, 11], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [4, 11], "x": 7, "y": 3}, + + {"matrix": [3, 6], "x": 9, "y": 3}, + {"matrix": [3, 7], "x": 10, "y": 3}, + {"matrix": [3, 8], "x": 11, "y": 3}, + {"matrix": [3, 9], "x": 12, "y": 3}, + {"matrix": [3, 10], "x": 13, "y": 3}, + {"matrix": [3, 11], "x": 14, "y": 3}, + + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 11, "y": 4}, + {"matrix": [4, 9], "x": 12, "y": 4}, + {"matrix": [4, 10], "x": 13, "y": 4} + ] + } } } diff --git a/keyboards/delikeeb/vanana/rev1/rev1.h b/keyboards/delikeeb/vanana/rev1/rev1.h deleted file mode 100644 index 3b125b3ca8b4..000000000000 --- a/keyboards/delikeeb/vanana/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 noclew - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \ - k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, \ - k25, k26, k27, k28, k29, k30, k49, k31, k32, k33, k34, k35, k36, \ - k37, k38, k39, k40, k41, k42, k60, k43, k44, k45, k46, k47, k48, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 }, \ - { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24 }, \ - { k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36 }, \ - { k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 } \ -} diff --git a/keyboards/delikeeb/vanana/rev2/info.json b/keyboards/delikeeb/vanana/rev2/info.json index fb2cc4a52c68..e8ff47d85529 100644 --- a/keyboards/delikeeb/vanana/rev2/info.json +++ b/keyboards/delikeeb/vanana/rev2/info.json @@ -16,5 +16,82 @@ {"pin_a": "B6", "pin_b": "B2"}, {"pin_a": "F0", "pin_b": "F1"} ] + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [5, 4], "x": 5, "y": 0}, + + {"matrix": [5, 9], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [0, 6], "x": 11, "y": 0}, + {"matrix": [0, 7], "x": 12, "y": 0}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [5, 3], "x": 5, "y": 1}, + + {"matrix": [5, 8], "x": 9, "y": 1}, + {"matrix": [1, 5], "x": 10, "y": 1}, + {"matrix": [1, 6], "x": 11, "y": 1}, + {"matrix": [1, 7], "x": 12, "y": 1}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [5, 2], "x": 5, "y": 2}, + + {"matrix": [5, 5], "x": 7, "y": 2}, + + {"matrix": [5, 7], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [2, 7], "x": 12, "y": 2}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [5, 1], "x": 5, "y": 3}, + + {"matrix": [5, 0], "x": 7, "y": 3}, + + {"matrix": [5, 6], "x": 9, "y": 3}, + {"matrix": [3, 5], "x": 10, "y": 3}, + {"matrix": [3, 6], "x": 11, "y": 3}, + {"matrix": [3, 7], "x": 12, "y": 3}, + {"matrix": [3, 8], "x": 13, "y": 3}, + {"matrix": [3, 9], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 1, "y": 4}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 11, "y": 4}, + {"matrix": [4, 8], "x": 12, "y": 4}, + {"matrix": [4, 9], "x": 13, "y": 4} + ] + } } } diff --git a/keyboards/delikeeb/vanana/rev2/rev2.h b/keyboards/delikeeb/vanana/rev2/rev2.h deleted file mode 100644 index 7f8d16b57f49..000000000000 --- a/keyboards/delikeeb/vanana/rev2/rev2.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 noclew - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k55, k60, k06, k07, k08, k09, k10, \ - k11, k12, k13, k14, k15, k54, k59, k16, k17, k18, k19, k20, \ - k21, k22, k23, k24, k25, k53, k56, k58, k26, k27, k28, k29, k30, \ - k31, k32, k33, k34, k35, k52, k51, k57, k36, k37, k38, k39, k40, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 }, \ - { k41, k42, k43, k44, k45, k46, k47, k48, k49, k50 }, \ - { k51, k52, k53, k54, k55, k56, k57, k58, k59, k60 } \ -} diff --git a/keyboards/deng/djam/djam.c b/keyboards/deng/djam/djam.c index c7b986cf9efe..3514ff050ce9 100644 --- a/keyboards/deng/djam/djam.c +++ b/keyboards/deng/djam/djam.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "djam.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/deng/djam/djam.h b/keyboards/deng/djam/djam.h deleted file mode 100644 index bf740f736a3a..000000000000 --- a/keyboards/deng/djam/djam.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2022 Leo Deng (@myst729) - * - * 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( \ - K000, K001, K002, K005, K006, K007, \ - K100, K101, K102, K103, K104, K105, K106, K107, \ - K200, K201, K202, K203, K204, K205, K206 \ -) { \ - { K000, K001, K002, KC_NO, KC_NO, K005, K006, K007 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107 }, \ - { K200, K201, K202, K203, K204, K205, K206, KC_NO } \ -} diff --git a/keyboards/deng/djam/info.json b/keyboards/deng/djam/info.json index 4a5cd78f1942..7257ebabb871 100644 --- a/keyboards/deng/djam/info.json +++ b/keyboards/deng/djam/info.json @@ -28,28 +28,35 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 7, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 0, "y": 0.5, "h": 2 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 0.5, "h": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 3, "y": 3, "w": 2 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3, "w": 2 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 } + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 0.5, "h": 2}, + + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [1, 5], "x": 8, "y": 1}, + {"matrix": [1, 6], "x": 9, "y": 1}, + + {"matrix": [1, 7], "x": 10, "y": 0.5, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 3, "y": 3, "w": 2}, + {"matrix": [2, 3], "x": 5, "y": 3}, + {"matrix": [2, 4], "x": 6, "y": 3, "w": 2}, + {"matrix": [2, 5], "x": 9, "y": 3}, + {"matrix": [2, 6], "x": 10, "y": 3} ] } } + } diff --git a/keyboards/dichotomy/dichotomy.h b/keyboards/dichotomy/dichotomy.h index 37372d6496f6..f62ed49aa076 100755 --- a/keyboards/dichotomy/dichotomy.h +++ b/keyboards/dichotomy/dichotomy.h @@ -23,22 +23,3 @@ #define set_led_magenta() red_led_on(); grn_led_off(); blu_led_on() #define set_led_cyan() red_led_off(); grn_led_on(); blu_led_on() #define set_led_white() red_led_on(); grn_led_on(); blu_led_on() - -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - 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, \ - k33, k34, k35, k36, k37, k38, \ - k42, k43, k44, k45, k46, k47, k48, k49 \ -) { \ - { 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 }, \ - { XXX, XXX, XXX, k33, k34, k35, k36, k37, k38, XXX, XXX, XXX }, \ - { XXX, XXX, k42, k43, k44, k45, k46, k47, k48, k49, XXX, XXX } \ -} diff --git a/keyboards/dichotomy/info.json b/keyboards/dichotomy/info.json index bd37a0a2c71b..1b2d9a29c9b7 100644 --- a/keyboards/dichotomy/info.json +++ b/keyboards/dichotomy/info.json @@ -12,7 +12,67 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0.5}, {"label":"k01", "x":1, "y":0.5}, {"label":"k02", "x":2, "y":0.25}, {"label":"k03", "x":3, "y":0}, {"label":"k04", "x":4, "y":0.5}, {"label":"k05", "x":5, "y":0.5}, {"label":"k06", "x":7, "y":0.5}, {"label":"k07", "x":8, "y":0.5}, {"label":"k08", "x":9, "y":0}, {"label":"k09", "x":10, "y":0.25}, {"label":"k0A", "x":11, "y":0.5}, {"label":"k0B", "x":12, "y":0.5}, {"label":"k10", "x":0, "y":1.5}, {"label":"k11", "x":1, "y":1.5}, {"label":"k12", "x":2, "y":1.25}, {"label":"k13", "x":3, "y":1}, {"label":"k14", "x":4, "y":1.5}, {"label":"k15", "x":5, "y":1.5}, {"label":"k16", "x":7, "y":1.5}, {"label":"k17", "x":8, "y":1.5}, {"label":"k18", "x":9, "y":1}, {"label":"k19", "x":10, "y":1.25}, {"label":"k1A", "x":11, "y":1.5}, {"label":"k1B", "x":12, "y":1.5}, {"label":"k20", "x":0, "y":2.5}, {"label":"k21", "x":1, "y":2.5}, {"label":"k22", "x":2, "y":2.25}, {"label":"k23", "x":3, "y":2}, {"label":"k24", "x":4, "y":2.5}, {"label":"k25", "x":5, "y":2.5}, {"label":"k26", "x":7, "y":2.5}, {"label":"k27", "x":8, "y":2.5}, {"label":"k28", "x":9, "y":2}, {"label":"k29", "x":10, "y":2.25}, {"label":"k2A", "x":11, "y":2.5}, {"label":"k2B", "x":12, "y":2.5}, {"label":"k33", "x":3, "y":4}, {"label":"k34", "x":4, "y":4}, {"label":"k35", "x":5, "y":4}, {"label":"k36", "x":7, "y":4}, {"label":"k37", "x":8, "y":4}, {"label":"k38", "x":9, "y":4}, {"label":"k42", "x":2, "y":5}, {"label":"k43", "x":3, "y":5}, {"label":"k44", "x":4, "y":5}, {"label":"k45", "x":5, "y":5}, {"label":"k46", "x":7, "y":5}, {"label":"k47", "x":8, "y":5}, {"label":"k48", "x":9, "y":5}, {"label":"k49", "x":10, "y":5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + + {"matrix": [0, 6], "x": 7, "y": 0.5}, + {"matrix": [0, 7], "x": 8, "y": 0.5}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0.25}, + {"matrix": [0, 10], "x": 11, "y": 0.5}, + {"matrix": [0, 11], "x": 12, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + + {"matrix": [1, 6], "x": 7, "y": 1.5}, + {"matrix": [1, 7], "x": 8, "y": 1.5}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 1.5}, + {"matrix": [1, 11], "x": 12, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [2, 6], "x": 7, "y": 2.5}, + {"matrix": [2, 7], "x": 8, "y": 2.5}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2.25}, + {"matrix": [2, 10], "x": 11, "y": 2.5}, + {"matrix": [2, 11], "x": 12, "y": 2.5}, + + {"matrix": [3, 3], "x": 3, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4}, + + {"matrix": [3, 6], "x": 7, "y": 4}, + {"matrix": [3, 7], "x": 8, "y": 4}, + {"matrix": [3, 8], "x": 9, "y": 4}, + + {"matrix": [4, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, + + {"matrix": [4, 6], "x": 7, "y": 5}, + {"matrix": [4, 7], "x": 8, "y": 5}, + {"matrix": [4, 8], "x": 9, "y": 5}, + {"matrix": [4, 9], "x": 10, "y": 5} + ] } } } diff --git a/keyboards/dk60/dk60.h b/keyboards/dk60/dk60.h index 36ac690ab3a3..05e790d52533 100644 --- a/keyboards/dk60/dk60.h +++ b/keyboards/dk60/dk60.h @@ -34,19 +34,3 @@ inline void dk60_led_all_off(void) { dk60_caps_led_off(); dk60_esc_led_off(); } - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4B, K4A, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K4C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K41, K42, K45, K48, K49 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \ - { XXX, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, K4C } \ -} diff --git a/keyboards/dk60/info.json b/keyboards/dk60/info.json index c16fb1ad5842..5af417c2b703 100644 --- a/keyboards/dk60/info.json +++ b/keyboards/dk60/info.json @@ -18,70 +18,70 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [4, 11], "x": 13, "y": 0}, + {"matrix": [4, 10], "x": 14, "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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [4, 12], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - {"x": 0, "y": 3, "w": 2.25}, - {"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}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, - {"x": 1.5, "y": 4}, - {"x": 2.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 7}, - {"x": 10.75, "y": 4, "w": 1.25}, - {"x": 12, "y": 4} + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 7}, + {"matrix": [4, 8], "x": 10.75, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 12, "y": 4} ] } } diff --git a/keyboards/dm9records/ergoinu/ergoinu.h b/keyboards/dm9records/ergoinu/ergoinu.h deleted file mode 100644 index c275d3fa27a8..000000000000 --- a/keyboards/dm9records/ergoinu/ergoinu.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2018 Takuya Urakawa - -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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L07, L08, L09, L10, L11, L12, L13, R07, R08, R09, R10, R11, R12, R13, \ - L14, L15, L16, L17, L18, L19, R14, R15, R16, R17, R18, R19, R20, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, R27,\ - L26, L27, L28, L29, L30, R28, R29, R30, R31, R32 \ - ) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L07, L08, L09, L10, L11, L12, L13 }, \ - { L14, KC_NO, L15, L16, L17, L18, L19 }, \ - { L20, KC_NO, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L26, L27, L28, L29, L30}, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R13, R12, R11, R10, R09, R08, R07 }, \ - { R20, R19, R18, R17, R16, R15, R14 }, \ - { R27, R26, R25, R24, R23, R22, R21 }, \ - { KC_NO, KC_NO, R32, R31, R30, R29, R28 } \ - } diff --git a/keyboards/dm9records/ergoinu/info.json b/keyboards/dm9records/ergoinu/info.json index f6896046f91c..1813baa24103 100644 --- a/keyboards/dm9records/ergoinu/info.json +++ b/keyboards/dm9records/ergoinu/info.json @@ -24,79 +24,79 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0.6, "label": "ESC" }, - { "x": 1, "y": 0.4, "label": "1" }, - { "x": 2, "y": 0.4, "label": "2" }, - { "x": 3, "y": 0.25, "label": "3" }, - { "x": 4, "y": 0, "label": "4" }, - { "x": 5, "y": 0.25, "label": "5" }, - { "x": 6, "y": 0.4, "label": "6" }, + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.4}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.4}, - { "x": 11, "y": 0.4, "label": "7" }, - { "x": 12, "y": 0.25, "label": "8" }, - { "x": 13, "y": 0, "label": "9" }, - { "x": 14, "y": 0.25, "label": "0" }, - { "x": 15, "y": 0.4, "label": "MINUS" }, - { "x": 16, "y": 0.4, "label": "EQUAL" }, - { "x": 17, "y": 0.6, "label": "BACKSLASH" }, + {"matrix": [5, 6], "x": 11, "y": 0.4}, + {"matrix": [5, 5], "x": 12, "y": 0.25}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "y": 0.25}, + {"matrix": [5, 2], "x": 15, "y": 0.4}, + {"matrix": [5, 1], "x": 16, "y": 0.4}, + {"matrix": [5, 0], "x": 17, "y": 0.6}, - { "x": 0, "y": 1.6, "label": "DELETE" }, - { "x": 1, "y": 1.4, "label": "TAB" }, - { "x": 2, "y": 1.4, "label": "Q" }, - { "x": 3, "y": 1.25, "label": "W" }, - { "x": 4, "y": 1, "label": "E" }, - { "x": 5, "y": 1.25, "label": "R" }, - { "x": 6, "y": 1.4, "label": "T" }, + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.4}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.4}, - { "x": 11, "y": 1.4, "label": "Y" }, - { "x": 12, "y": 1.25, "label": "U" }, - { "x": 13, "y": 1, "label": "I" }, - { "x": 14, "y": 1.25, "label": "O" }, - { "x": 15, "y": 1.4, "label": "P" }, - { "x": 16, "y": 1.4, "label": "LBRACKET" }, - { "x": 17, "y": 1.6, "label": "RBRACKET" }, + {"matrix": [6, 6], "x": 11, "y": 1.4}, + {"matrix": [6, 5], "x": 12, "y": 1.25}, + {"matrix": [6, 4], "x": 13, "y": 1}, + {"matrix": [6, 3], "x": 14, "y": 1.25}, + {"matrix": [6, 2], "x": 15, "y": 1.4}, + {"matrix": [6, 1], "x": 16, "y": 1.4}, + {"matrix": [6, 0], "x": 17, "y": 1.6}, - { "x": 0.25, "y": 2.6, "w": 1.75, "label": "LCTRL" }, - { "x": 2, "y": 2.4, "label": "A" }, - { "x": 3, "y": 2.25, "label": "S" }, - { "x": 4, "y": 2, "label": "D" }, - { "x": 5, "y": 2.25, "label": "F" }, - { "x": 6, "y": 2.4, "label": "G" }, + {"matrix": [2, 0], "x": 0.25, "y": 2.6, "w": 1.75}, + {"matrix": [2, 2], "x": 2, "y": 2.4}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.4}, - { "x": 11, "y": 2.4, "label": "H" }, - { "x": 12, "y": 2.25, "label": "J" }, - { "x": 13, "y": 2, "label": "K" }, - { "x": 14, "y": 2.25, "label": "L" }, - { "x": 15, "y": 2.4, "label": "SEMICOLON" }, - { "x": 16, "y": 2.4, "label": "QUOTE" }, - { "x": 17, "y": 2.6, "label": "GRAVE" }, + {"matrix": [7, 6], "x": 11, "y": 2.4}, + {"matrix": [7, 5], "x": 12, "y": 2.25}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 3], "x": 14, "y": 2.25}, + {"matrix": [7, 2], "x": 15, "y": 2.4}, + {"matrix": [7, 1], "x": 16, "y": 2.4}, + {"matrix": [7, 0], "x": 17, "y": 2.6}, - { "x": 0.25, "y": 3.6, "w": 1.75, "label": "LSHIFT" }, - { "x": 2, "y": 3.4, "label": "Z" }, - { "x": 3, "y": 3.25, "label": "X" }, - { "x": 4, "y": 3, "label": "C" }, - { "x": 5, "y": 3.25, "label": "V" }, - { "x": 6, "y": 3.4, "label": "B" }, + {"matrix": [3, 0], "x": 0.25, "y": 3.6, "w": 1.75}, + {"matrix": [3, 2], "x": 2, "y": 3.4}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.4}, - { "x": 11, "y": 3.4, "label": "N" }, - { "x": 12, "y": 3.25, "label": "M" }, - { "x": 13, "y": 3, "label": "COMMA" }, - { "x": 14, "y": 3.25, "label": "DOT" }, - { "x": 15, "y": 3.4, "label": "SLASH" }, - { "x": 16, "y": 3.4, "label": "RSHIFT" }, - { "x": 17, "y": 3.6, "label": "RSHIFT" }, + {"matrix": [8, 6], "x": 11, "y": 3.4}, + {"matrix": [8, 5], "x": 12, "y": 3.25}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3.25}, + {"matrix": [8, 2], "x": 15, "y": 3.4}, + {"matrix": [8, 1], "x": 16, "y": 3.4}, + {"matrix": [8, 0], "x": 17, "y": 3.6}, - { "x": 3, "y": 4.25, "label": "MO(META)" }, - { "x": 4, "y": 4, "label": "LALT" }, - { "x": 5, "y": 4.25, "label": "LGUI" }, - { "x": 6, "y": 4.4, "label": "ENT" }, - { "x": 7, "y": 4.4, "w": 1.5, "label": "SPACE" }, + {"matrix": [4, 2], "x": 3, "y": 4.25}, + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4.25}, + {"matrix": [4, 5], "x": 6, "y": 4.4}, + {"matrix": [4, 6], "x": 7, "y": 4.4, "w": 1.5}, - { "x": 9.5, "y": 4.4, "w": 1.5, "label": "ENTER" }, - { "x": 11, "y": 4.4, "label": "BACKSPACE" }, - { "x": 12, "y": 4.25, "label": "RGUI" }, - { "x": 13, "y": 4, "label": "RALT" }, - { "x": 14, "y": 4.25, "label": "MO(META)" } + {"matrix": [9, 6], "x": 9.5, "y": 4.4, "w": 1.5}, + {"matrix": [9, 5], "x": 11, "y": 4.4}, + {"matrix": [9, 4], "x": 12, "y": 4.25}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4.25} ] } } diff --git a/keyboards/dm9records/lain/info.json b/keyboards/dm9records/lain/info.json index ce4499442d6e..8ae8a33b4445 100644 --- a/keyboards/dm9records/lain/info.json +++ b/keyboards/dm9records/lain/info.json @@ -18,55 +18,62 @@ "layouts": { "LAYOUT": { "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": 8.5, "y": 0 }, - { "x": 9.5, "y": 0 }, - { "x": 10.5, "y": 0 }, - { "x": 11.5, "y": 0 }, - { "x": 12.5, "y": 0 }, - { "x": 13.5, "y": 0, "w": 1.5 }, - { "x": 0.25, "y": 1 }, - { "x": 1.25, "y": 1 }, - { "x": 2.25, "y": 1 }, - { "x": 3.25, "y": 1 }, - { "x": 4.25, "y": 1 }, - { "x": 5.25, "y": 1 }, - { "x": 6.25, "y": 1 }, - { "x": 8.75, "y": 1 }, - { "x": 9.75, "y": 1 }, - { "x": 10.75, "y": 1 }, - { "x": 11.75, "y": 1 }, - { "x": 12.75, "y": 1 }, - { "x": 13.75, "y": 1 }, - { "x": 0.5, "y": 2, "w": 1.25 }, - { "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": 8.25, "y": 2 }, - { "x": 9.25, "y": 2 }, - { "x": 10.25, "y": 2 }, - { "x": 11.25, "y": 2 }, - { "x": 12.25, "y": 2 }, - { "x": 13.25, "y": 2, "w": 1.25 }, - { "x": 1, "y": 3, "w": 1.75 }, - { "x": 2.75, "y": 3, "w": 1.25 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3, "w": 1.25 }, - { "x": 6.25, "y": 3 }, - { "x": 7.75, "y": 3 }, - { "x": 8.75, "y": 3, "w": 1.25 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 13, "y": 3, "w": 1.25 } + {"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": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1}, + {"matrix": [1, 12], "x": 13.75, "y": 1}, + + {"matrix": [2, 0], "x": 0.5, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/dm9records/lain/lain.h b/keyboards/dm9records/lain/lain.h index e449416e50a9..ae0671a94330 100644 --- a/keyboards/dm9records/lain/lain.h +++ b/keyboards/dm9records/lain/lain.h @@ -17,25 +17,3 @@ extern keyboard_config_t lain_config; void lain_set_led(uint8_t no, bool flag); void lain_enable_leds(bool flag); void lain_enable_leds_toggle(void); - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -// clang-format off -#define LAYOUT( \ - k01,k02,k03,k04,k05,k06,k07, k08,k09,k10,k11,k12,k13, \ - k14,k15,k16,k17,k18,k19,k20, k21,k22,k23,k24,k25,k26, \ - k27,k28,k29,k30,k31,k32, k33,k34,k35,k36,k37,k38, \ - k39,k40,k41,k42,k43, k44,k45,k46,k47,k48,k49) \ - { \ - {k01, k02, k03,k04,k05,k06,k07, k08,k09,k10,k11,k12,k13}, \ - {k14, k15, k16,k17,k18,k19,k20, k21,k22,k23,k24,k25,k26}, \ - {k27, k28, k29,k30,k31,k32,KC_NO, k33,k34,k35,k36,k37,k38}, \ - {KC_NO,k39, k40,k41,k42,k43,KC_NO, k44,k45,k46,k47,k48,k49} \ - } -// clang-format on diff --git a/keyboards/doppelganger/doppelganger.c b/keyboards/doppelganger/doppelganger.c index 304d764028a1..9a9fc0679f2c 100644 --- a/keyboards/doppelganger/doppelganger.c +++ b/keyboards/doppelganger/doppelganger.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "doppelganger.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(C6); diff --git a/keyboards/doppelganger/doppelganger.h b/keyboards/doppelganger/doppelganger.h deleted file mode 100644 index c065c28c46fd..000000000000 --- a/keyboards/doppelganger/doppelganger.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2019 Yiancar-Designs - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, L07, L08, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, R28, \ - L30, L31, L32, L33, L34, L35, L36, L37, L38, R31, R32, R33, R34, R35, R36, R37, R38, \ - L40, L41, L42, L43, L44, L45, L46, R42, R43, R44, R45, R46, R47, R48 \ -) \ -{ \ - { KC_NO, L01, L02, L03, L04, L05, L06, L07, L08 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38 }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \ - { KC_NO, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { KC_NO, KC_NO, R42, R43, R44, R45, R46, R47, R48 }, \ -} diff --git a/keyboards/doppelganger/info.json b/keyboards/doppelganger/info.json index 831922f9452d..a13225c1ca89 100644 --- a/keyboards/doppelganger/info.json +++ b/keyboards/doppelganger/info.json @@ -32,7 +32,108 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"1", "x":3.5, "y":0}, {"label":"2", "x":4.5, "y":0}, {"label":"3", "x":5.5, "y":0}, {"label":"4", "x":6.5, "y":0}, {"label":"5", "x":7.5, "y":0}, {"label":"6", "x":8.5, "y":0}, {"label":"7", "x":10.5, "y":0}, {"label":"8", "x":11.5, "y":0}, {"label":"9", "x":12.5, "y":0}, {"label":"0", "x":13.5, "y":0}, {"label":"_", "x":14.5, "y":0}, {"label":"+", "x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":17.5, "y":0}, {"label":"F2", "x":0, "y":1}, {"label":"F3", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":10, "y":1}, {"label":"U", "x":11, "y":1}, {"label":"I", "x":12, "y":1}, {"label":"O", "x":13, "y":1}, {"label":"P", "x":14, "y":1}, {"label":"{", "x":15, "y":1}, {"label":"}", "x":16, "y":1}, {"label":"|", "x":17, "y":1, "w":1.5}, {"label":"Pg Up", "x":19, "y":1}, {"label":"F4", "x":0, "y":2}, {"label":"F5", "x":1, "y":2}, {"label":"Caps Lock", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":10.25, "y":2}, {"label":"J", "x":11.25, "y":2}, {"label":"K", "x":12.25, "y":2}, {"label":"L", "x":13.25, "y":2}, {"label":":", "x":14.25, "y":2}, {"label":"\"", "x":15.25, "y":2}, {"label":"~", "x":16.25, "y":2}, {"label":"Enter", "x":17.25, "y":2, "w":1.25}, {"label":"Pg Dn", "x":19, "y":2}, {"label":"F6", "x":0, "y":3}, {"label":"F7", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":1.25}, {"label":"|", "x":3.75, "y":3}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":10.75, "y":3}, {"label":"M", "x":11.75, "y":3}, {"label":"<", "x":12.75, "y":3}, {"label":">", "x":13.75, "y":3}, {"label":"?", "x":14.75, "y":3}, {"label":"Shift", "x":15.75, "y":3, "w":1.75}, {"label":"Up", "x":17.75, "y":3.25}, {"label":"Fn", "x":19, "y":3}, {"label":"F8", "x":0, "y":4}, {"label":"F9", "x":1, "y":4}, {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, {"label":"Win", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":2.25}, {"x":8.25, "y":4}, {"x":10.25, "y":4, "w":2.75}, {"label":"Alt", "x":13, "y":4, "w":1.25}, {"x":14.25, "y":4}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Left", "x":16.75, "y":4.25}, {"label":"Down", "x":17.75, "y":4.25}, {"label":"Right", "x":18.75, "y":4.25}] + "layout": [ + {"matrix": [0, 1], "x": 1, "y": 0}, + + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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": [5, 0], "x": 10.5, "y": 0}, + {"matrix": [5, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 2], "x": 12.5, "y": 0}, + {"matrix": [5, 3], "x": 13.5, "y": 0}, + {"matrix": [5, 4], "x": 14.5, "y": 0}, + {"matrix": [5, 5], "x": 15.5, "y": 0}, + {"matrix": [5, 6], "x": 16.5, "y": 0}, + {"matrix": [5, 7], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + + {"matrix": [6, 0], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 4], "x": 14, "y": 1}, + {"matrix": [6, 5], "x": 15, "y": 1}, + {"matrix": [6, 6], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1, "w": 1.5}, + + {"matrix": [6, 8], "x": 19, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15.25, "y": 2}, + {"matrix": [7, 6], "x": 16.25, "y": 2}, + {"matrix": [7, 7], "x": 17.25, "y": 2, "w": 1.25}, + + {"matrix": [7, 8], "x": 19, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + + {"matrix": [8, 1], "x": 10.75, "y": 3}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 4], "x": 13.75, "y": 3}, + {"matrix": [8, 5], "x": 14.75, "y": 3}, + {"matrix": [8, 6], "x": 15.75, "y": 3, "w": 1.75}, + + {"matrix": [8, 7], "x": 17.75, "y": 3.25}, + + {"matrix": [8, 8], "x": 19, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + + {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 2.75}, + {"matrix": [9, 3], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 14.25, "y": 4}, + {"matrix": [9, 5], "x": 15.25, "y": 4, "w": 1.25}, + + {"matrix": [9, 6], "x": 16.75, "y": 4.25}, + {"matrix": [9, 7], "x": 17.75, "y": 4.25}, + {"matrix": [9, 8], "x": 18.75, "y": 4.25} + ] } } } diff --git a/keyboards/draculad/draculad.h b/keyboards/draculad/draculad.h deleted file mode 100644 index b98bb0d2c46d..000000000000 --- a/keyboards/draculad/draculad.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 @mangoiv - -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 XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, R33, \ - L31, L32, L33, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, L30, L31, L32, L33 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { XXX, R33, R32, R31, R30 } \ - } diff --git a/keyboards/draculad/info.json b/keyboards/draculad/info.json index 0dfd4c1393ec..57250d57efed 100644 --- a/keyboards/draculad/info.json +++ b/keyboards/draculad/info.json @@ -38,52 +38,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":1}, - {"label":"L01", "x":1, "y":0.35}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0.35}, - {"label":"L04", "x":4, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.35}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.35}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, - {"label":"R00", "x":8, "y":0.5}, - {"label":"R01", "x":9, "y":0.35}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0.35}, - {"label":"R04", "x":12, "y":1}, + {"matrix": [4, 4], "x": 8, "y": 0.5}, + {"matrix": [4, 3], "x": 9, "y": 0.35}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0.35}, + {"matrix": [4, 0], "x": 12, "y": 1}, - {"label":"L10", "x":0, "y":2}, - {"label":"L11", "x":1, "y":1.35}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1.35}, - {"label":"L14", "x":4, "y":1.5}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.35}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.35}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"label":"R10", "x":8, "y":1.5}, - {"label":"R11", "x":9, "y":1.35}, - {"label":"R12", "x":10, "y":1}, - {"label":"R13", "x":11, "y":1.35}, - {"label":"R14", "x":12, "y":2}, + {"matrix": [5, 4], "x": 8, "y": 1.5}, + {"matrix": [5, 3], "x": 9, "y": 1.35}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1.35}, + {"matrix": [5, 0], "x": 12, "y": 2}, - {"label":"L20", "x":0, "y":3}, - {"label":"L21", "x":1, "y":2.35}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2.35}, - {"label":"L24", "x":4, "y":2.5}, + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.35}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.35}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, - {"label":"R20", "x":8, "y":2.5}, - {"label":"R21", "x":9, "y":2.35}, - {"label":"R22", "x":10, "y":2}, - {"label":"R23", "x":11, "y":2.35}, - {"label":"R24", "x":12, "y":3}, + {"matrix": [6, 4], "x": 8, "y": 2.5}, + {"matrix": [6, 3], "x": 9, "y": 2.35}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2.35}, + {"matrix": [6, 0], "x": 12, "y": 3}, - {"label":"L30", "x":4.25, "y":3.5}, - {"label":"R33", "x":7.75, "y":3.5}, + {"matrix": [3, 1], "x": 4.25, "y": 3.5}, - {"label":"L31", "x":3, "y":4.5}, - {"label":"L32", "x":4, "y":4.5}, - {"label":"L33", "x":5, "y":4.5}, + {"matrix": [7, 1], "x": 7.75, "y": 3.5}, - {"label":"R30", "x":7, "y":4.5}, - {"label":"R31", "x":8, "y":4.5}, - {"label":"R32", "x":9, "y":4.5} + {"matrix": [3, 2], "x": 3, "y": 4.5}, + {"matrix": [3, 3], "x": 4, "y": 4.5}, + {"matrix": [3, 4], "x": 5, "y": 4.5}, + + {"matrix": [7, 4], "x": 7, "y": 4.5}, + {"matrix": [7, 3], "x": 8, "y": 4.5}, + {"matrix": [7, 2], "x": 9, "y": 4.5} ] } } diff --git a/keyboards/drhigsby/dubba175/dubba175.h b/keyboards/drhigsby/dubba175/dubba175.h deleted file mode 100644 index 0413b158d2e8..000000000000 --- a/keyboards/drhigsby/dubba175/dubba175.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 drhigsby - * - * 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( \ - 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, \ - k302, k303, k304, k305, k306, k307 \ -) { \ - { 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 }, \ - { KC_NO, KC_NO, k302, k303, k304, k305, k306, k307, KC_NO, KC_NO } \ -} diff --git a/keyboards/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json index 6e24721cf954..001fa7c6e2f7 100644 --- a/keyboards/drhigsby/dubba175/info.json +++ b/keyboards/drhigsby/dubba175/info.json @@ -15,9 +15,49 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [{"label":"", "x":0, "y":0}, {"label":"", "x":1, "y":0}, {"label":"", "x":2, "y":0}, {"label":"", "x":3, "y":0}, {"label":"", "x":4, "y":0}, {"label":"", "x":5, "y":0}, {"label":"", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":0, "y":1}, {"label":"", "x":1, "y":1}, {"label":"", "x":2, "y":1}, {"label":"", "x":3, "y":1}, {"label":"", "x":4, "y":1}, {"label":"", "x":5, "y":1}, {"label":"", "x":6, "y":1}, {"label":"", "x":7, "y":1}, {"label":"", "x":8, "y":1}, {"label":"", "x":9, "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":1.25, "y":3}, {"label":"", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":1.75}, {"x":5, "y":3, "w":1.75}, {"label":"", "x":6.75, "y":3}, {"label":"", "x":7.75, "y":3}] + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 2], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 1.75}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3} + ] } } } diff --git a/keyboards/dtisaac/cg108/cg108.h b/keyboards/dtisaac/cg108/cg108.h deleted file mode 100644 index 35321933928a..000000000000 --- a/keyboards/dtisaac/cg108/cg108.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 DTIsaac - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -// default keymap: all 117 keys with ANSI Enter -#define LAYOUT( \ - K000, K001, K002, K003, K300, K301, K302, K303, K306, K307, K308, K309, K310, K004, K005, K006, K007, K008, K009, K010, \ - K100, K101, K102, K103, K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K500, K501, K502, K503, K505, K506, K507, K508, K509, K510, K204, K205, K206, K207, K208, K209, K210, \ - K800, K801, K802, K803, K600, K601, K602, K603, K606, K607, K608, K609, K610, K807, K808, K809, K810, \ - K900, K901, K902, K903, K700, K701, K702, K703, K705, K706, K707, K708, K709, K710, K906, K907, K908, K909, K910, \ - KA00, KA01, KA02, KA03, K804, K805, K806, K604, K605, K904, K905, KA04, KA05, KA06, KA07, KA08, KA09, KA10 \ -) { \ - { 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, KC_NO, KC_NO, K306, K307, K308, K309, K310 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410 }, \ - { K500, K501, K502, K503, KC_NO, K505, K506, K507, K508, K509, K510 }, \ - { K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610 }, \ - { K700, K701, K702, K703, KC_NO, 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, K910 }, \ - { KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10 } \ -} diff --git a/keyboards/dtisaac/cg108/info.json b/keyboards/dtisaac/cg108/info.json index 4da08a7a7436..c657c029eb5b 100644 --- a/keyboards/dtisaac/cg108/info.json +++ b/keyboards/dtisaac/cg108/info.json @@ -21,127 +21,146 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"K000", "x":0, "y":0}, - {"label":"K001", "x":2, "y":0}, - {"label":"K002", "x":3, "y":0}, - {"label":"K003", "x":4, "y":0}, - {"label":"K300", "x":5, "y":0}, - {"label":"K301", "x":6.5, "y":0}, - {"label":"K302", "x":7.5, "y":0}, - {"label":"K303", "x":8.5, "y":0}, - {"label":"K306", "x":9.5, "y":0}, - {"label":"K307", "x":11, "y":0}, - {"label":"K308", "x":12, "y":0}, - {"label":"K309", "x":13, "y":0}, - {"label":"K310", "x":14, "y":0}, - {"label":"K004", "x":15.25, "y":0}, - {"label":"K005", "x":16.25, "y":0}, - {"label":"K006", "x":17.25, "y":0}, - {"label":"K007", "x":18.5, "y":0}, - {"label":"K008", "x":19.5, "y":0}, - {"label":"K009", "x":20.5, "y":0}, - {"label":"K010", "x":21.5, "y":0}, - {"label":"K100", "x":0, "y":1.5}, - {"label":"K101", "x":1, "y":1.5}, - {"label":"K102", "x":2, "y":1.5}, - {"label":"K103", "x":3, "y":1.5}, - {"label":"K400", "x":4, "y":1.5}, - {"label":"K401", "x":5, "y":1.5}, - {"label":"K402", "x":6, "y":1.5}, - {"label":"K403", "x":7, "y":1.5}, - {"label":"K404", "x":8, "y":1.5}, - {"label":"K405", "x":9, "y":1.5}, - {"label":"K406", "x":10, "y":1.5}, - {"label":"K407", "x":11, "y":1.5}, - {"label":"K408", "x":12, "y":1.5}, - {"label":"K409", "x":13, "y":1.5}, - {"label":"K410", "x":14, "y":1.5}, - {"label":"K104", "x":15.25, "y":1.5}, - {"label":"K105", "x":16.25, "y":1.5}, - {"label":"K106", "x":17.25, "y":1.5}, - {"label":"K107", "x":18.5, "y":1.5}, - {"label":"K108", "x":19.5, "y":1.5}, - {"label":"K109", "x":20.5, "y":1.5}, - {"label":"K110", "x":21.5, "y":1.5}, - {"label":"K200", "x":0, "y":2.5, "w":1.5}, - {"label":"K201", "x":1.5, "y":2.5}, - {"label":"K202", "x":2.5, "y":2.5}, - {"label":"K203", "x":3.5, "y":2.5}, - {"label":"K500", "x":4.5, "y":2.5}, - {"label":"K501", "x":5.5, "y":2.5}, - {"label":"K502", "x":6.5, "y":2.5}, - {"label":"K503", "x":7.5, "y":2.5}, - {"label":"K505", "x":8.5, "y":2.5}, - {"label":"K506", "x":9.5, "y":2.5}, - {"label":"K507", "x":10.5, "y":2.5}, - {"label":"K508", "x":11.5, "y":2.5}, - {"label":"K509", "x":12.5, "y":2.5}, - {"label":"K510", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K204", "x":15.25, "y":2.5}, - {"label":"K205", "x":16.25, "y":2.5}, - {"label":"K206", "x":17.25, "y":2.5}, - {"label":"K207", "x":18.5, "y":2.5}, - {"label":"K208", "x":19.5, "y":2.5}, - {"label":"K209", "x":20.5, "y":2.5}, - {"label":"K210", "x":21.5, "y":2.5}, - {"label":"K800", "x":0, "y":3.5, "w":1.75}, - {"label":"K801", "x":1.75, "y":3.5}, - {"label":"K802", "x":2.75, "y":3.5}, - {"label":"K803", "x":3.75, "y":3.5}, - {"label":"K600", "x":4.75, "y":3.5}, - {"label":"K601", "x":5.75, "y":3.5}, - {"label":"K602", "x":6.75, "y":3.5}, - {"label":"K603", "x":7.75, "y":3.5}, - {"label":"K606", "x":8.75, "y":3.5}, - {"label":"K607", "x":9.75, "y":3.5}, - {"label":"K608", "x":10.75, "y":3.5}, - {"label":"K609", "x":11.75, "y":3.5}, - {"label":"K610", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K807", "x":18.5, "y":3.5}, - {"label":"K808", "x":19.5, "y":3.5}, - {"label":"K809", "x":20.5, "y":3.5}, - {"label":"K810", "x":21.5, "y":3.5}, - {"label":"K900", "x":0, "y":4.5, "w":1.25}, - {"label":"K901", "x":1.25, "y":4.5}, - {"label":"K902", "x":2.25, "y":4.5}, - {"label":"K903", "x":3.25, "y":4.5}, - {"label":"K700", "x":4.25, "y":4.5}, - {"label":"K701", "x":5.25, "y":4.5}, - {"label":"K702", "x":6.25, "y":4.5}, - {"label":"K703", "x":7.25, "y":4.5}, - {"label":"K705", "x":8.25, "y":4.5}, - {"label":"K706", "x":9.25, "y":4.5}, - {"label":"K707", "x":10.25, "y":4.5}, - {"label":"K708", "x":11.25, "y":4.5}, - {"label":"K709", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K710", "x":14, "y":4.5}, - {"label":"K906", "x":16.25, "y":4.5}, - {"label":"K907", "x":18.5, "y":4.5}, - {"label":"K908", "x":19.5, "y":4.5}, - {"label":"K909", "x":20.5, "y":4.5}, - {"label":"K910", "x":21.5, "y":4.5}, - {"label":"KA00", "x":0, "y":5.5, "w":1.5}, - {"label":"KA01", "x":1.5, "y":5.5}, - {"label":"KA02", "x":2.5, "y":5.5, "w":1.5}, - {"label":"KA03", "x":4, "y":5.5}, - {"label":"K804", "x":5, "y":5.5, "w":2}, - {"label":"K805", "x":7, "y":5.5}, - {"label":"K806", "x":8, "y":5.5, "w":2}, - {"label":"K604", "x":10, "y":5.5}, - {"label":"K605", "x":11, "y":5.5, "w":1.5}, - {"label":"K904", "x":12.5, "y":5.5}, - {"label":"K905", "x":13.5, "y":5.5, "w":1.5}, - {"label":"KA04", "x":15.25, "y":5.5}, - {"label":"KA05", "x":16.25, "y":5.5}, - {"label":"KA06", "x":17.25, "y":5.5}, - {"label":"KA07", "x":18.5, "y":5.5}, - {"label":"KA08", "x":19.5, "y":5.5}, - {"label":"KA09", "x":20.5, "y":5.5}, - {"label":"KA10", "x":21.5, "y":5.5} - ] + {"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": [3, 0], "x": 5, "y": 0}, + + {"matrix": [3, 1], "x": 6.5, "y": 0}, + {"matrix": [3, 2], "x": 7.5, "y": 0}, + {"matrix": [3, 3], "x": 8.5, "y": 0}, + {"matrix": [3, 6], "x": 9.5, "y": 0}, + + {"matrix": [3, 7], "x": 11, "y": 0}, + {"matrix": [3, 8], "x": 12, "y": 0}, + {"matrix": [3, 9], "x": 13, "y": 0}, + {"matrix": [3, 10], "x": 14, "y": 0}, + + {"matrix": [0, 4], "x": 15.25, "y": 0}, + {"matrix": [0, 5], "x": 16.25, "y": 0}, + {"matrix": [0, 6], "x": 17.25, "y": 0}, + + {"matrix": [0, 7], "x": 18.5, "y": 0}, + {"matrix": [0, 8], "x": 19.5, "y": 0}, + {"matrix": [0, 9], "x": 20.5, "y": 0}, + {"matrix": [0, 10], "x": 21.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [4, 0], "x": 4, "y": 1.5}, + {"matrix": [4, 1], "x": 5, "y": 1.5}, + {"matrix": [4, 2], "x": 6, "y": 1.5}, + {"matrix": [4, 3], "x": 7, "y": 1.5}, + {"matrix": [4, 4], "x": 8, "y": 1.5}, + {"matrix": [4, 5], "x": 9, "y": 1.5}, + {"matrix": [4, 6], "x": 10, "y": 1.5}, + {"matrix": [4, 7], "x": 11, "y": 1.5}, + {"matrix": [4, 8], "x": 12, "y": 1.5}, + {"matrix": [4, 9], "x": 13, "y": 1.5}, + {"matrix": [4, 10], "x": 14, "y": 1.5}, + + {"matrix": [1, 4], "x": 15.25, "y": 1.5}, + {"matrix": [1, 5], "x": 16.25, "y": 1.5}, + {"matrix": [1, 6], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 7], "x": 18.5, "y": 1.5}, + {"matrix": [1, 8], "x": 19.5, "y": 1.5}, + {"matrix": [1, 9], "x": 20.5, "y": 1.5}, + {"matrix": [1, 10], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [5, 0], "x": 4.5, "y": 2.5}, + {"matrix": [5, 1], "x": 5.5, "y": 2.5}, + {"matrix": [5, 2], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [5, 5], "x": 8.5, "y": 2.5}, + {"matrix": [5, 6], "x": 9.5, "y": 2.5}, + {"matrix": [5, 7], "x": 10.5, "y": 2.5}, + {"matrix": [5, 8], "x": 11.5, "y": 2.5}, + {"matrix": [5, 9], "x": 12.5, "y": 2.5}, + {"matrix": [5, 10], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 4], "x": 15.25, "y": 2.5}, + {"matrix": [2, 5], "x": 16.25, "y": 2.5}, + {"matrix": [2, 6], "x": 17.25, "y": 2.5}, + + {"matrix": [2, 7], "x": 18.5, "y": 2.5}, + {"matrix": [2, 8], "x": 19.5, "y": 2.5}, + {"matrix": [2, 9], "x": 20.5, "y": 2.5}, + {"matrix": [2, 10], "x": 21.5, "y": 2.5}, + + {"matrix": [8, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [8, 1], "x": 1.75, "y": 3.5}, + {"matrix": [8, 2], "x": 2.75, "y": 3.5}, + {"matrix": [8, 3], "x": 3.75, "y": 3.5}, + {"matrix": [6, 0], "x": 4.75, "y": 3.5}, + {"matrix": [6, 1], "x": 5.75, "y": 3.5}, + {"matrix": [6, 2], "x": 6.75, "y": 3.5}, + {"matrix": [6, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 6], "x": 8.75, "y": 3.5}, + {"matrix": [6, 7], "x": 9.75, "y": 3.5}, + {"matrix": [6, 8], "x": 10.75, "y": 3.5}, + {"matrix": [6, 9], "x": 11.75, "y": 3.5}, + {"matrix": [6, 10], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 7], "x": 18.5, "y": 3.5}, + {"matrix": [8, 8], "x": 19.5, "y": 3.5}, + {"matrix": [8, 9], "x": 20.5, "y": 3.5}, + {"matrix": [8, 10], "x": 21.5, "y": 3.5}, + + {"matrix": [9, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [9, 1], "x": 1.25, "y": 4.5}, + {"matrix": [9, 2], "x": 2.25, "y": 4.5}, + {"matrix": [9, 3], "x": 3.25, "y": 4.5}, + {"matrix": [7, 0], "x": 4.25, "y": 4.5}, + {"matrix": [7, 1], "x": 5.25, "y": 4.5}, + {"matrix": [7, 2], "x": 6.25, "y": 4.5}, + {"matrix": [7, 3], "x": 7.25, "y": 4.5}, + {"matrix": [7, 5], "x": 8.25, "y": 4.5}, + {"matrix": [7, 6], "x": 9.25, "y": 4.5}, + {"matrix": [7, 7], "x": 10.25, "y": 4.5}, + {"matrix": [7, 8], "x": 11.25, "y": 4.5}, + {"matrix": [7, 9], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [7, 10], "x": 14, "y": 4.5}, + + {"matrix": [9, 6], "x": 16.25, "y": 4.5}, + + {"matrix": [9, 7], "x": 18.5, "y": 4.5}, + {"matrix": [9, 8], "x": 19.5, "y": 4.5}, + {"matrix": [9, 9], "x": 20.5, "y": 4.5}, + {"matrix": [9, 10], "x": 21.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [10, 1], "x": 1.5, "y": 5.5}, + {"matrix": [10, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [10, 3], "x": 4, "y": 5.5}, + {"matrix": [8, 4], "x": 5, "y": 5.5, "w": 2}, + {"matrix": [8, 5], "x": 7, "y": 5.5}, + {"matrix": [8, 6], "x": 8, "y": 5.5, "w": 2}, + {"matrix": [6, 4], "x": 10, "y": 5.5}, + {"matrix": [6, 5], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [9, 4], "x": 12.5, "y": 5.5}, + {"matrix": [9, 5], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [10, 4], "x": 15.25, "y": 5.5}, + {"matrix": [10, 5], "x": 16.25, "y": 5.5}, + {"matrix": [10, 6], "x": 17.25, "y": 5.5}, + + {"matrix": [10, 7], "x": 18.5, "y": 5.5}, + {"matrix": [10, 8], "x": 19.5, "y": 5.5}, + {"matrix": [10, 9], "x": 20.5, "y": 5.5}, + {"matrix": [10, 10], "x": 21.5, "y": 5.5} + ] } } } diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c index c46bfc291d96..35ae8eb01810 100644 --- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.c +++ b/keyboards/dtisaac/dosa40rgb/dosa40rgb.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "dosa40rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h b/keyboards/dtisaac/dosa40rgb/dosa40rgb.h deleted file mode 100644 index 659e42f8f2cd..000000000000 --- a/keyboards/dtisaac/dosa40rgb/dosa40rgb.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 DTIsaac - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k41, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, \ - k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, \ - k33, k34, k35, k36, k37, k38, k39, k40 \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10}, \ - {k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, k21}, \ - {k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32}, \ - {k33, k34, k35, KC_NO,k36, KC_NO, k37, k38, k39, k40, k41}, \ -} diff --git a/keyboards/dtisaac/dosa40rgb/info.json b/keyboards/dtisaac/dosa40rgb/info.json index b9f02c34700d..63243c494d2f 100644 --- a/keyboards/dtisaac/dosa40rgb/info.json +++ b/keyboards/dtisaac/dosa40rgb/info.json @@ -24,48 +24,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"Caps Lock", "x":0, "y":1, "w":1.5}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"Enter", "x":10.5, "y":1, "w":1.5}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":",", "x":8.75, "y":2}, - {"label":".", "x":9.75, "y":2}, - {"label":"Shift", "x":10.75, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3}, - {"label":"Alt", "x":2.25, "y":3, "w":1.25}, - {"label":"Space", "x":3.5, "y":3, "w":2.25}, - {"label":"Space", "x":5.75, "y":3, "w":2.75}, - {"label":"App", "x":8.5, "y":3, "w":1.25}, - {"label":"Fn", "x":9.75, "y":3}, - {"label":"Ctrl", "x":10.75, "y":3, "w":1.25} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 10], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 2.75}, + {"matrix": [3, 7], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/dtisaac/dtisaac01/dtisaac01.h b/keyboards/dtisaac/dtisaac01/dtisaac01.h deleted file mode 100644 index e017c6570055..000000000000 --- a/keyboards/dtisaac/dtisaac01/dtisaac01.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 DTIsaac - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K058, K061, K062, K063, K064, K065, K066, \ - K010, K011, K012, K013, K014, K015, K016, K017, K018, K068, K060, K071, K072, K073, K074, K075, K076, \ - K020, K021, K022, K023, K024, K025, K026, K027, K028, K078, K070, K081, K082, K083, K084, K085, K086, \ - K030, K031, K032, K033, K034, K035, K036, K037, K038, K088, K080, K091, K093, \ - K040, K042, K043, K044, K045, K046, K047, K048, K098, K090, K101, K103, K105, \ - K050, K051, K052, K056, K100, K111, K112, K113, K114, K115, K116 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ - { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ - { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \ - { K040, KC_NO, K042, K043, K044, K045, K046, K047, K048 }, \ - { K050, K051, K052, KC_NO, KC_NO, KC_NO, K056, KC_NO, K058 }, \ - { K060, K061, K062, K063, K064, K065, K066, KC_NO, K068 }, \ - { K070, K071, K072, K073, K074, K075, K076, KC_NO, K078 }, \ - { K080, K081, K082, K083, K084, K085, K086, KC_NO, K088 }, \ - { K090, K091, KC_NO, K093, KC_NO, KC_NO, KC_NO, KC_NO, K098 }, \ - { K100, K101, KC_NO, K103, KC_NO, K105, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K111, K112, K113, K114, K115, K116, KC_NO, KC_NO } \ -} diff --git a/keyboards/dtisaac/dtisaac01/info.json b/keyboards/dtisaac/dtisaac01/info.json index 1d762fd1dbfe..8894e261be6a 100644 --- a/keyboards/dtisaac/dtisaac01/info.json +++ b/keyboards/dtisaac/dtisaac01/info.json @@ -27,93 +27,106 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K000", "x":0, "y":0}, - {"label":"K001", "x":2, "y":0}, - {"label":"K002", "x":3, "y":0}, - {"label":"K003", "x":4, "y":0}, - {"label":"K004", "x":5, "y":0}, - {"label":"K005", "x":6.5, "y":0}, - {"label":"K006", "x":7.5, "y":0}, - {"label":"K007", "x":8.5, "y":0}, - {"label":"K008", "x":9.5, "y":0}, - {"label":"K058", "x":11, "y":0}, - {"label":"K061", "x":12, "y":0}, - {"label":"K062", "x":13, "y":0}, - {"label":"K063", "x":14, "y":0}, - {"label":"K064", "x":15.25, "y":0}, - {"label":"K065", "x":16.25, "y":0}, - {"label":"K066", "x":17.25, "y":0}, - {"label":"K010", "x":0, "y":1.5}, - {"label":"K011", "x":1, "y":1.5}, - {"label":"K012", "x":2, "y":1.5}, - {"label":"K013", "x":3, "y":1.5}, - {"label":"K014", "x":4, "y":1.5}, - {"label":"K015", "x":5, "y":1.5}, - {"label":"K016", "x":6, "y":1.5}, - {"label":"K017", "x":7, "y":1.5}, - {"label":"K018", "x":8, "y":1.5}, - {"label":"K068", "x":9, "y":1.5}, - {"label":"K060", "x":10, "y":1.5}, - {"label":"K071", "x":11, "y":1.5}, - {"label":"K072", "x":12, "y":1.5}, - {"label":"K073", "x":13, "y":1.5, "w":2}, - {"label":"K074", "x":15.25, "y":1.5}, - {"label":"K075", "x":16.25, "y":1.5}, - {"label":"K076", "x":17.25, "y":1.5}, - {"label":"K020", "x":0, "y":2.5, "w":1.5}, - {"label":"K021", "x":1.5, "y":2.5}, - {"label":"K022", "x":2.5, "y":2.5}, - {"label":"K023", "x":3.5, "y":2.5}, - {"label":"K024", "x":4.5, "y":2.5}, - {"label":"K025", "x":5.5, "y":2.5}, - {"label":"K026", "x":6.5, "y":2.5}, - {"label":"K027", "x":7.5, "y":2.5}, - {"label":"K028", "x":8.5, "y":2.5}, - {"label":"K078", "x":9.5, "y":2.5}, - {"label":"K070", "x":10.5, "y":2.5}, - {"label":"K081", "x":11.5, "y":2.5}, - {"label":"K082", "x":12.5, "y":2.5}, - {"label":"K083", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K084", "x":15.25, "y":2.5}, - {"label":"K085", "x":16.25, "y":2.5}, - {"label":"K086", "x":17.25, "y":2.5}, - {"label":"K030", "x":0, "y":3.5, "w":1.75}, - {"label":"K031", "x":1.75, "y":3.5}, - {"label":"K032", "x":2.75, "y":3.5}, - {"label":"K033", "x":3.75, "y":3.5}, - {"label":"K034", "x":4.75, "y":3.5}, - {"label":"K035", "x":5.75, "y":3.5}, - {"label":"K036", "x":6.75, "y":3.5}, - {"label":"K037", "x":7.75, "y":3.5}, - {"label":"K038", "x":8.75, "y":3.5}, - {"label":"K088", "x":9.75, "y":3.5}, - {"label":"K080", "x":10.75, "y":3.5}, - {"label":"K091", "x":11.75, "y":3.5}, - {"label":"K093", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K040", "x":0, "y":4.5, "w":2.25}, - {"label":"K042", "x":2.25, "y":4.5}, - {"label":"K043", "x":3.25, "y":4.5}, - {"label":"K044", "x":4.25, "y":4.5}, - {"label":"K045", "x":5.25, "y":4.5}, - {"label":"K046", "x":6.25, "y":4.5}, - {"label":"K047", "x":7.25, "y":4.5}, - {"label":"K048", "x":8.25, "y":4.5}, - {"label":"K098", "x":9.25, "y":4.5}, - {"label":"K090", "x":10.25, "y":4.5}, - {"label":"K101", "x":11.25, "y":4.5}, - {"label":"K103", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K105", "x":16.25, "y":4.5}, - {"label":"K050", "x":0, "y":5.5, "w":1.25}, - {"label":"K051", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K052", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K056", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K100", "x":10, "y":5.5, "w":1.25}, - {"label":"K111", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K112", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K113", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K114", "x":15.25, "y":5.5}, - {"label":"K115", "x":16.25, "y":5.5}, - {"label":"K116", "x":17.25, "y":5.5} + {"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": [5, 8], "x": 11, "y": 0}, + {"matrix": [6, 1], "x": 12, "y": 0}, + {"matrix": [6, 2], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + + {"matrix": [6, 4], "x": 15.25, "y": 0}, + {"matrix": [6, 5], "x": 16.25, "y": 0}, + {"matrix": [6, 6], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [6, 8], "x": 9, "y": 1.5}, + {"matrix": [6, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 1], "x": 11, "y": 1.5}, + {"matrix": [7, 2], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 4], "x": 15.25, "y": 1.5}, + {"matrix": [7, 5], "x": 16.25, "y": 1.5}, + {"matrix": [7, 6], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [7, 8], "x": 9.5, "y": 2.5}, + {"matrix": [7, 0], "x": 10.5, "y": 2.5}, + {"matrix": [8, 1], "x": 11.5, "y": 2.5}, + {"matrix": [8, 2], "x": 12.5, "y": 2.5}, + {"matrix": [8, 3], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 4], "x": 15.25, "y": 2.5}, + {"matrix": [8, 5], "x": 16.25, "y": 2.5}, + {"matrix": [8, 6], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [8, 8], "x": 9.75, "y": 3.5}, + {"matrix": [8, 0], "x": 10.75, "y": 3.5}, + {"matrix": [9, 1], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [9, 8], "x": 9.25, "y": 4.5}, + {"matrix": [9, 0], "x": 10.25, "y": 4.5}, + {"matrix": [10, 1], "x": 11.25, "y": 4.5}, + {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [10, 5], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [10, 0], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 1], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [11, 2], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 3], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 4], "x": 15.25, "y": 5.5}, + {"matrix": [11, 5], "x": 16.25, "y": 5.5}, + {"matrix": [11, 6], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/duck/lightsaver/info.json b/keyboards/duck/lightsaver/info.json index 36315c96efdd..296820d7caf2 100644 --- a/keyboards/duck/lightsaver/info.json +++ b/keyboards/duck/lightsaver/info.json @@ -22,7 +22,113 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Num
Lock", "x":14, "y":0}, {"label":"Insert", "x":15, "y":0}, {"label":"Home", "x":16, "y":0}, {"label":"PgUp", "x":17, "y":0}, {"label":"/", "x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Bkspc", "x":13, "y":1, "w":2}, {"label":"Delete", "x":15, "y":1}, {"label":"End", "x":16, "y":1}, {"label":"PgDn", "x":17, "y":1}, {"label":"*", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"-", "x":18, "y":2}, {"label":"CapsLock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"label":"Enter", "x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"label":".", "x":17, "y":5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + {"matrix": [2, 18], "x": 18, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 14], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + {"matrix": [3, 18], "x": 18, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 12], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + {"matrix": [4, 18], "x": 18, "y": 4, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 8], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5} + ] } } } diff --git a/keyboards/duck/lightsaver/lightsaver.c b/keyboards/duck/lightsaver/lightsaver.c index eba1ce25c21c..60d21a1baebe 100644 --- a/keyboards/duck/lightsaver/lightsaver.c +++ b/keyboards/duck/lightsaver/lightsaver.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "lightsaver.h" +#include "quantum.h" #include "indicator_leds.h" enum BACKLIGHT_AREAS { diff --git a/keyboards/duck/lightsaver/lightsaver.h b/keyboards/duck/lightsaver/lightsaver.h deleted file mode 100644 index 1e1185713b17..000000000000 --- a/keyboards/duck/lightsaver/lightsaver.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2017 Rasmus Schults - * - * 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 NO KC_NO - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4O, K4P, K4Q, K4R, K4S, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3O, K3P, K3Q, K3R, K3S, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2O, K2P, K2Q, K2R, K2S, \ - K1A, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1M, K1N, K1O, K1P, K1Q, K1R, K1S, \ - K0A, K0B, K0C, K0I, K0K, K0M, K0N, K0O, K0P, K0Q, K0R \ -) { \ -/* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 */ \ -/* 0 */ { K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, K5Q, K5R, K5S, }, \ -/* 1 */ { K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, NO, K4O, K4P, K4Q, K4R, K4S, }, \ -/* 2 */ { K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, NO, K3O, K3P, K3Q, K3R, K3S, }, \ -/* 3 */ { K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, NO, NO, K2O, K2P, K2Q, K2R, K2S, }, \ -/* 4 */ { K1A, NO, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, NO, K1M, K1N, K1O, K1P, K1Q, K1R, K1S, }, \ -/* 5 */ { K0A, K0B, K0C, NO, NO, NO, NO, NO, K0I, NO, K0K, NO, K0M, K0N, K0O, K0P, K0Q, K0R } \ -} - diff --git a/keyboards/dztech/dz60rgb/dz60rgb.c b/keyboards/dztech/dz60rgb/dz60rgb.c index cfefd2833ddb..811dd0cd9123 100644 --- a/keyboards/dztech/dz60rgb/dz60rgb.c +++ b/keyboards/dztech/dz60rgb/dz60rgb.c @@ -1,4 +1,4 @@ -#include "dz60rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/dztech/dz60rgb/dz60rgb.h b/keyboards/dztech/dz60rgb/dz60rgb.h deleted file mode 100644 index 872be7e1b328..000000000000 --- a/keyboards/dztech/dz60rgb/dz60rgb.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K41, K42, K45, K48, K49, K4A, K4B, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D }, \ - { K40, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, XXX, K4D } \ -} diff --git a/keyboards/dztech/dz60rgb/info.json b/keyboards/dztech/dz60rgb/info.json index d5179aa09f83..17439e344363 100644 --- a/keyboards/dztech/dz60rgb/info.json +++ b/keyboards/dztech/dz60rgb/info.json @@ -9,73 +9,73 @@ "layouts": { "LAYOUT": { "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, "w":2}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2.25}, - {"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, "w":1.75}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 11], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "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}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4}, + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/eason/aeroboard/aeroboard.h b/keyboards/eason/aeroboard/aeroboard.h deleted file mode 100644 index a623670b2d20..000000000000 --- a/keyboards/eason/aeroboard/aeroboard.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 Eason -// SPDX-License-Identifier: GPL-2.0-or-later - - - #pragma once - - #include "quantum.h" - - #define ___ KC_NO -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - 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, K2E,K2F, \ - K30, K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,K3E,K3F, \ - K40, K41, K43, K45, K47, K49, K4B, K4D,K4E,K4F \ -) { \ - { 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, ___,K2E,K2F}, \ - { K30, K31, ___, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,K3E,K3F}, \ - { K40, K41, ___, K43, ___, K45, ___, K47, ___, K49, ___, K4B, ___, K4D,K4E,K4F} \ -} diff --git a/keyboards/eason/aeroboard/info.json b/keyboards/eason/aeroboard/info.json index 5eb135c953bb..83908b1bed10 100644 --- a/keyboards/eason/aeroboard/info.json +++ b/keyboards/eason/aeroboard/info.json @@ -22,79 +22,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1.75, "y": 0}, - {"x": 2.75, "y": 0}, - {"x": 3.75, "y": 0}, - {"x": 4.75, "y": 0}, - {"x": 5.75, "y": 0}, - {"x": 6.75, "y": 0}, - {"x": 7.75, "y": 0}, - {"x": 8.75, "y": 0}, - {"x": 9.75, "y": 0}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0}, - {"x": 13.75, "y": 0}, - {"x": 14.75, "y": 0, "w": 2}, - {"x": 16.75, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1.75, "y": 1, "w": 1.5}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1}, - {"x": 11.25, "y": 1}, - {"x": 12.25, "y": 1}, - {"x": 13.25, "y": 1}, - {"x": 14.25, "y": 1}, - {"x": 15.25, "y": 1, "w": 1.5}, - {"x": 16.75, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1.75, "y": 2, "w": 1.75}, - {"x": 3.5, "y": 2}, - {"x": 4.5, "y": 2}, - {"x": 5.5, "y": 2}, - {"x": 6.5, "y": 2}, - {"x": 7.5, "y": 2}, - {"x": 8.5, "y": 2}, - {"x": 9.5, "y": 2}, - {"x": 10.5, "y": 2}, - {"x": 11.5, "y": 2}, - {"x": 12.5, "y": 2}, - {"x": 13.5, "y": 2}, - {"x": 14.5, "y": 2, "w": 2.25}, - {"x": 16.75, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1.75, "y": 3, "w": 2.25}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 6, "y": 3}, - {"x": 7, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3, "w": 1.75}, - {"x": 15.75, "y": 3}, - {"x": 16.75, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1.75, "y": 4, "w": 1.5}, - {"x": 4, "y": 4, "w": 1.5}, - {"x": 5.5, "y": 4, "w": 3}, - {"x": 8.5, "y": 4}, - {"x": 9.5, "y": 4, "w": 3}, - {"x": 12.5, "y": 4, "w": 1.5}, - {"x": 14.75, "y": 4}, - {"x": 15.75, "y": 4}, - {"x": 16.75, "y": 4} - ] + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 13.75, "y": 0}, + {"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 16.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1}, + {"matrix": [1, 5], "x": 6.25, "y": 1}, + {"matrix": [1, 6], "x": 7.25, "y": 1}, + {"matrix": [1, 7], "x": 8.25, "y": 1}, + {"matrix": [1, 8], "x": 9.25, "y": 1}, + {"matrix": [1, 9], "x": 10.25, "y": 1}, + {"matrix": [1, 10], "x": 11.25, "y": 1}, + {"matrix": [1, 11], "x": 12.25, "y": 1}, + {"matrix": [1, 12], "x": 13.25, "y": 1}, + {"matrix": [1, 13], "x": 14.25, "y": 1}, + {"matrix": [1, 14], "x": 15.25, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 16.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.75, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [2, 7], "x": 8.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2}, + {"matrix": [2, 14], "x": 14.5, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 16.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.75, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15.75, "y": 3}, + {"matrix": [3, 15], "x": 16.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 3}, + {"matrix": [4, 7], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 3}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 13], "x": 14.75, "y": 4}, + {"matrix": [4, 14], "x": 15.75, "y": 4}, + {"matrix": [4, 15], "x": 16.75, "y": 4} + ] } } } diff --git a/keyboards/eco/info.json b/keyboards/eco/info.json index 24c153341cc3..6a1b2adda1bd 100644 --- a/keyboards/eco/info.json +++ b/keyboards/eco/info.json @@ -8,10 +8,5 @@ "pid": "0x6006" }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [{"label":"k01", "x":0, "y":0}, {"label":"k02", "x":1, "y":0}, {"label":"k03", "x":2, "y":0}, {"label":"k04", "x":3, "y":0}, {"label":"k05", "x":4, "y":0}, {"label":"k06", "x":5, "y":0}, {"label":"k07", "x":6, "y":0}, {"label":"k08", "x":7, "y":0}, {"label":"k09", "x":8, "y":0}, {"label":"k010", "x":9, "y":0}, {"label":"k011", "x":10, "y":0}, {"label":"k012", "x":11, "y":0}, {"label":"k013", "x":12, "y":0}, {"label":"k014", "x":13, "y":0}, {"label":"k11", "x":0, "y":1}, {"label":"k12", "x":1, "y":1}, {"label":"k13", "x":2, "y":1}, {"label":"k14", "x":3, "y":1}, {"label":"k15", "x":4, "y":1}, {"label":"k16", "x":5, "y":1}, {"label":"k17", "x":6, "y":1}, {"label":"k18", "x":7, "y":1}, {"label":"k19", "x":8, "y":1}, {"label":"k110", "x":9, "y":1}, {"label":"k111", "x":10, "y":1}, {"label":"k112", "x":11, "y":1}, {"label":"k113", "x":12, "y":1}, {"label":"k114", "x":13, "y":1}, {"label":"k21", "x":0, "y":2}, {"label":"k22", "x":1, "y":2}, {"label":"k23", "x":2, "y":2}, {"label":"k24", "x":3, "y":2}, {"label":"k25", "x":4, "y":2}, {"label":"k26", "x":5, "y":2}, {"label":"k27", "x":6, "y":2}, {"label":"k28", "x":7, "y":2}, {"label":"k29", "x":8, "y":2}, {"label":"k210", "x":9, "y":2}, {"label":"k211", "x":10, "y":2}, {"label":"k212", "x":11, "y":2}, {"label":"k213", "x":12, "y":2}, {"label":"k214", "x":13, "y":2}, {"label":"k31", "x":0, "y":3}, {"label":"k32", "x":1, "y":3}, {"label":"k33", "x":2, "y":3}, {"label":"k34", "x":3, "y":3}, {"label":"k35", "x":4, "y":3}, {"label":"k36", "x":5, "y":3}, {"label":"k37", "x":6, "y":3}, {"label":"k38", "x":7, "y":3}, {"label":"k39", "x":8, "y":3}, {"label":"k310", "x":9, "y":3}, {"label":"k311", "x":10, "y":3}, {"label":"k312", "x":11, "y":3}, {"label":"k313", "x":12, "y":3}, {"label":"k314", "x":13, "y":3}] - } - } + "bootloader": "caterina" } diff --git a/keyboards/eco/rev1/info.json b/keyboards/eco/rev1/info.json index c2c42442ddde..f2a7842ce40e 100644 --- a/keyboards/eco/rev1/info.json +++ b/keyboards/eco/rev1/info.json @@ -6,5 +6,70 @@ "cols": ["F4", "F5", "F6", "F7", "B5", "B4", "E6", "D7", "C6", "D4", "D0", "D1", "D2", "D3"], "rows": ["B1", "B6", "B2", "B3"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} + ] + } + } } diff --git a/keyboards/eco/rev1/rev1.h b/keyboards/eco/rev1/rev1.h deleted file mode 100644 index ea17dc6a5516..000000000000 --- a/keyboards/eco/rev1/rev1.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \ -} diff --git a/keyboards/eco/rev2/info.json b/keyboards/eco/rev2/info.json index 4cc5e0311f28..8148e78f859d 100644 --- a/keyboards/eco/rev2/info.json +++ b/keyboards/eco/rev2/info.json @@ -6,5 +6,70 @@ "cols": ["D1", "D0", "D4", "C6", "B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D2", "D3"], "rows": ["D7", "B5", "B4", "E6"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} + ] + } + } } diff --git a/keyboards/eco/rev2/rev2.h b/keyboards/eco/rev2/rev2.h deleted file mode 100644 index ea17dc6a5516..000000000000 --- a/keyboards/eco/rev2/rev2.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D } \ -} diff --git a/keyboards/edc40/edc40.h b/keyboards/edc40/edc40.h deleted file mode 100644 index 1dca7f4019d7..000000000000 --- a/keyboards/edc40/edc40.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 OJtheTiny - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K19, K0A, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K29, K1A, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K2A, \ - K30, K31, K35, K38, K3A \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A }, \ - { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, KC_NO, K3A }, \ -} - diff --git a/keyboards/edc40/info.json b/keyboards/edc40/info.json index 7b77ddc93497..ccd1b12a0d4b 100644 --- a/keyboards/edc40/info.json +++ b/keyboards/edc40/info.json @@ -21,47 +21,47 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [1, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, - {"x": 0, "y": 1, "w":1.25}, - {"x": 1.25, "y": 1}, - {"x": 2.25, "y": 1}, - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1, "w":1.75}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [2, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, - {"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, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 2.25}, - {"x": 0, "y": 3, "w":1.25}, - {"x": 1.25, "y": 3, "w":1.25}, - {"x": 2.5, "y": 3, "w":7}, - {"x": 9.5, "y": 3, "w":1.25}, - {"x": 10.75, "y": 3, "w":1.25} + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 2.5, "y": 3, "w": 7}, + {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/edinburgh41/edinburgh41.h b/keyboards/edinburgh41/edinburgh41.h deleted file mode 100644 index 64cf9ff9103a..000000000000 --- a/keyboards/edinburgh41/edinburgh41.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2022 schwarzer-geiger - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K30, K31, K32, K33, K34, K35, \ - K10, K11, K12, K13, K14, K15, K40, K41, K42, K43, K44, K45, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K55, \ - K60, K61, K62, K63, K64 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, K55 }, \ - { K60, K61, K62, K63, K64, KC_NO } \ -} diff --git a/keyboards/edinburgh41/info.json b/keyboards/edinburgh41/info.json index 3c75c899fbc5..14e4950c4ab9 100644 --- a/keyboards/edinburgh41/info.json +++ b/keyboards/edinburgh41/info.json @@ -21,53 +21,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0.54}, - {"label":"K01", "x":1, "y":0.36}, - {"label":"K02", "x":2, "y":0.18}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0.18}, - {"label":"K05", "x":5, "y":0.36}, + {"matrix": [0, 0], "x": 0, "y": 0.54}, + {"matrix": [0, 1], "x": 1, "y": 0.36}, + {"matrix": [0, 2], "x": 2, "y": 0.18}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.18}, + {"matrix": [0, 5], "x": 5, "y": 0.36}, - {"label":"K30", "x":7, "y":0.36}, - {"label":"K31", "x":8, "y":0.18}, - {"label":"K32", "x":9, "y":0}, - {"label":"K33", "x":10, "y":0.18}, - {"label":"K34", "x":11, "y":0.36}, - {"label":"K35", "x":12, "y":0.54}, + {"matrix": [3, 0], "x": 7, "y": 0.36}, + {"matrix": [3, 1], "x": 8, "y": 0.18}, + {"matrix": [3, 2], "x": 9, "y": 0}, + {"matrix": [3, 3], "x": 10, "y": 0.18}, + {"matrix": [3, 4], "x": 11, "y": 0.36}, + {"matrix": [3, 5], "x": 12, "y": 0.54}, - {"label":"K10", "x":0, "y":1.54}, - {"label":"K11", "x":1, "y":1.36}, - {"label":"K12", "x":2, "y":1.18}, - {"label":"K13", "x":3, "y":1}, - {"label":"K14", "x":4, "y":1.18}, - {"label":"K15", "x":5, "y":1.36}, + {"matrix": [1, 0], "x": 0, "y": 1.54}, + {"matrix": [1, 1], "x": 1, "y": 1.36}, + {"matrix": [1, 2], "x": 2, "y": 1.18}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.18}, + {"matrix": [1, 5], "x": 5, "y": 1.36}, - {"label":"K40", "x":7, "y":1.36}, - {"label":"K41", "x":8, "y":1.18}, - {"label":"K42", "x":9, "y":1}, - {"label":"K43", "x":10, "y":1.18}, - {"label":"K44", "x":11, "y":1.36}, - {"label":"K45", "x":12, "y":1.54}, + {"matrix": [4, 0], "x": 7, "y": 1.36}, + {"matrix": [4, 1], "x": 8, "y": 1.18}, + {"matrix": [4, 2], "x": 9, "y": 1}, + {"matrix": [4, 3], "x": 10, "y": 1.18}, + {"matrix": [4, 4], "x": 11, "y": 1.36}, + {"matrix": [4, 5], "x": 12, "y": 1.54}, - {"label":"K20", "x":0, "y":2.54}, - {"label":"K21", "x":1, "y":2.36}, - {"label":"K22", "x":2, "y":2.18}, - {"label":"K23", "x":3, "y":2}, - {"label":"K24", "x":4, "y":2.18}, - {"label":"K25", "x":5, "y":2.36}, + {"matrix": [2, 0], "x": 0, "y": 2.54}, + {"matrix": [2, 1], "x": 1, "y": 2.36}, + {"matrix": [2, 2], "x": 2, "y": 2.18}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.18}, + {"matrix": [2, 5], "x": 5, "y": 2.36}, - {"label":"K50", "x":7, "y":2.36}, - {"label":"K51", "x":8, "y":2.18}, - {"label":"K52", "x":9, "y":2}, - {"label":"K53", "x":10, "y":2.18}, - {"label":"K54", "x":11, "y":2.36}, - {"label":"K55", "x":12, "y":2.54}, + {"matrix": [5, 0], "x": 7, "y": 2.36}, + {"matrix": [5, 1], "x": 8, "y": 2.18}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 3], "x": 10, "y": 2.18}, + {"matrix": [5, 4], "x": 11, "y": 2.36}, + {"matrix": [5, 5], "x": 12, "y": 2.54}, - {"label":"K60", "x":2.875, "y":3.54, "w":1.25}, - {"label":"K61", "x":4.125, "y":3.54, "w":1.25}, - {"label":"K62", "x":5.375, "y":3.54, "w":2.25}, - {"label":"K63", "x":7.625, "y":3.54, "w":1.25}, - {"label":"K64", "x":8.875, "y":3.54, "w":1.25} + {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25}, + {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25}, + {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25}, + {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25}, + {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25} ] } } diff --git a/keyboards/ein_60/ein_60.c b/keyboards/ein_60/ein_60.c index d15ad0cd526e..60955eb8a3e2 100644 --- a/keyboards/ein_60/ein_60.c +++ b/keyboards/ein_60/ein_60.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "ein_60.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/ein_60/ein_60.h b/keyboards/ein_60/ein_60.h deleted file mode 100644 index 91bfe3acfd3c..000000000000 --- a/keyboards/ein_60/ein_60.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 klackygears - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, KC_NO, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, KC_NO, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C } \ -} diff --git a/keyboards/ein_60/info.json b/keyboards/ein_60/info.json index 0740a9273ec8..8da88c79874b 100644 --- a/keyboards/ein_60/info.json +++ b/keyboards/ein_60/info.json @@ -30,59 +30,65 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":0.75}, - {"label":"W", "x":2, "y":0.25}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.25}, - {"label":"T", "x":5, "y":0.5}, - {"label":"Mute", "x":6.5, "y":0.5}, - {"label":"Y", "x":8, "y":0.5}, - {"label":"U", "x":9, "y":0.25}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0.25}, - {"label":"P", "x":12, "y":0.75}, - {"label":"Backspace", "x":13, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"label":"Fn", "x":0, "y":2}, - {"label":"A", "x":1, "y":1.75}, - {"label":"S", "x":2, "y":1.25}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.25}, - {"label":"G", "x":5, "y":1.5}, - {"label":"H", "x":8, "y":1.5}, - {"label":"J", "x":9, "y":1.25}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1.25}, - {"label":";:", "x":12, "y":1.75}, - {"label":"Enter", "x":13, "y":2}, + {"matrix": [0, 6], "x": 6.5, "y": 0.5}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":2.75}, - {"label":"X", "x":2, "y":2.25}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.25}, - {"label":"B", "x":5, "y":2.5}, - {"label":"N", "x":8, "y":2.5}, - {"label":"M", "x":9, "y":2.25}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2.25}, - {"label":"/?", "x":12, "y":2.75}, - {"label":"'\"", "x":13, "y":3}, + {"matrix": [0, 7], "x": 8, "y": 0.5}, + {"matrix": [0, 8], "x": 9, "y": 0.25}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0.25}, + {"matrix": [0, 11], "x": 12, "y": 0.75}, + {"matrix": [0, 12], "x": 13, "y": 1}, - {"label":"Ctrl", "x":0, "y":4}, - {"label":"`~", "x":1, "y":3.75}, - {"label":"GUI", "x":2, "y":3.25}, - {"label":"Alt", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3.25}, - {"label":"Space", "x":5, "y":3.5}, - {"label":"Space", "x":6.25, "y":3.5, "w":1.5}, - {"label":"Space", "x":8, "y":3.5}, - {"label":"Raise", "x":9, "y":3.25}, - {"label":"\u2190", "x":10, "y":3}, - {"label":"\u2193", "x":11, "y":3.25}, - {"label":"\u2191", "x":12, "y":3.75}, - {"label":"\u2192", "x":13, "y":4} + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + + {"matrix": [1, 7], "x": 8, "y": 1.5}, + {"matrix": [1, 8], "x": 9, "y": 1.25}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1.25}, + {"matrix": [1, 11], "x": 12, "y": 1.75}, + {"matrix": [1, 12], "x": 13, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [2, 7], "x": 8, "y": 2.5}, + {"matrix": [2, 8], "x": 9, "y": 2.25}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2.25}, + {"matrix": [2, 11], "x": 12, "y": 2.75}, + {"matrix": [2, 12], "x": 13, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + + {"matrix": [3, 6], "x": 6.25, "y": 3.5, "w": 1.5}, + + {"matrix": [3, 7], "x": 8, "y": 3.5}, + {"matrix": [3, 8], "x": 9, "y": 3.25}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3.25}, + {"matrix": [3, 11], "x": 12, "y": 3.75}, + {"matrix": [3, 12], "x": 13, "y": 4} ] } } diff --git a/keyboards/elephant42/elephant42.c b/keyboards/elephant42/elephant42.c index a459442231e8..1ffb5e80839e 100644 --- a/keyboards/elephant42/elephant42.c +++ b/keyboards/elephant42/elephant42.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "elephant42.h" +#include "quantum.h" #if defined(RGB_MATRIX_ENABLE) led_config_t g_led_config = { diff --git a/keyboards/elephant42/elephant42.h b/keyboards/elephant42/elephant42.h deleted file mode 100644 index ad79c1e1fcb2..000000000000 --- a/keyboards/elephant42/elephant42.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 illness072 - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, R30, R31, R32, R33 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { KC_NO, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L30, L31, L32, L33 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { KC_NO, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, R33, R32, R31, R30 } \ -} diff --git a/keyboards/elephant42/info.json b/keyboards/elephant42/info.json index d1218ddb4e25..8bbaf6717975 100644 --- a/keyboards/elephant42/info.json +++ b/keyboards/elephant42/info.json @@ -27,55 +27,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":1.6}, - {"label":"Q", "x":1, "y":1.1}, - {"label":"W", "x":2, "y":0.3}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.6}, - {"label":"T", "x":5, "y":0.8}, + {"matrix": [0, 0], "x": 0, "y": 1.6}, + {"matrix": [0, 1], "x": 1, "y": 1.1}, + {"matrix": [0, 2], "x": 2, "y": 0.3}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.6}, + {"matrix": [0, 5], "x": 5, "y": 0.8}, - {"label":"Y", "x":10.5, "y":0.8}, - {"label":"U", "x":11.5, "y":0.6}, - {"label":"I", "x":12.5, "y":0}, - {"label":"O", "x":13.5, "y":0.3}, - {"label":"P", "x":14.5, "y":1.1}, - {"label":"\\", "x":15.5, "y":1.6}, + {"matrix": [4, 5], "x": 10.5, "y": 0.8}, + {"matrix": [4, 4], "x": 11.5, "y": 0.6}, + {"matrix": [4, 3], "x": 12.5, "y": 0}, + {"matrix": [4, 2], "x": 13.5, "y": 0.3}, + {"matrix": [4, 1], "x": 14.5, "y": 1.1}, + {"matrix": [4, 0], "x": 15.5, "y": 1.6}, - {"label":"Ctrl", "x":0, "y":2.6}, - {"label":"A", "x":1, "y":2.1}, - {"label":"S", "x":2, "y":1.3}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.6}, - {"label":"G", "x":5, "y":1.8}, + {"matrix": [1, 0], "x": 0, "y": 2.6}, + {"matrix": [1, 1], "x": 1, "y": 2.1}, + {"matrix": [1, 2], "x": 2, "y": 1.3}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.6}, + {"matrix": [1, 5], "x": 5, "y": 1.8}, - {"label":"H", "x":10.5, "y":1.8}, - {"label":"J", "x":11.5, "y":1.6}, - {"label":"K", "x":12.5, "y":1}, - {"label":"L", "x":13.5, "y":1.3}, - {"label":":", "x":14.5, "y":2.1}, - {"label":"\"", "x":15.5, "y":2.6}, + {"matrix": [5, 5], "x": 10.5, "y": 1.8}, + {"matrix": [5, 4], "x": 11.5, "y": 1.6}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1.3}, + {"matrix": [5, 1], "x": 14.5, "y": 2.1}, + {"matrix": [5, 0], "x": 15.5, "y": 2.6}, - {"label":"Z", "x":1, "y":3.1}, - {"label":"X", "x":2, "y":2.3}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.6}, - {"label":"B", "x":5, "y":2.8}, + {"matrix": [2, 1], "x": 1, "y": 3.1}, + {"matrix": [2, 2], "x": 2, "y": 2.3}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.6}, + {"matrix": [2, 5], "x": 5, "y": 2.8}, - {"label":"N", "x":10.5, "y":2.8}, - {"label":"M", "x":11.5, "y":2.6}, - {"label":"<", "x":12.5, "y":2}, - {"label":">", "x":13.5, "y":2.3}, - {"label":"?", "x":14.5, "y":3.1}, + {"matrix": [6, 5], "x": 10.5, "y": 2.8}, + {"matrix": [6, 4], "x": 11.5, "y": 2.6}, + {"matrix": [6, 3], "x": 12.5, "y": 2}, + {"matrix": [6, 2], "x": 13.5, "y": 2.3}, + {"matrix": [6, 1], "x": 14.5, "y": 3.1}, - {"label":"Alt", "x":3.5, "y":4}, - {"label":"Cmd", "x":4.5, "y":4}, - {"label":"Lower", "x":5.5, "y":4}, - {"label":"Shift", "x":6.5, "y":4}, - - {"label":"Del", "x":9.25, "y":4}, - {"label":"Raise", "x":10.25, "y":4}, - {"label":"Enter", "x":11.25, "y":4}, - {"label":"Backspace", "x":12.25, "y":4} + {"matrix": [3, 2], "x": 3.5, "y": 4}, + {"matrix": [3, 3], "x": 4.5, "y": 4}, + {"matrix": [3, 4], "x": 5.5, "y": 4}, + {"matrix": [3, 5], "x": 6.5, "y": 4}, + + {"matrix": [7, 5], "x": 9.25, "y": 4}, + {"matrix": [7, 4], "x": 10.25, "y": 4}, + {"matrix": [7, 3], "x": 11.25, "y": 4}, + {"matrix": [7, 2], "x": 12.25, "y": 4} ] } } diff --git a/keyboards/emajesty/eiri/eiri.h b/keyboards/emajesty/eiri/eiri.h deleted file mode 100644 index da06287cf04d..000000000000 --- a/keyboards/emajesty/eiri/eiri.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 EMajesty - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, \ - K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \ - K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \ - K36, K37, K38, K39, K40, K41, K42, K43, K44, K45 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11 }, \ - { K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23 }, \ - { K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35 }, \ - { KC_NO, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, KC_NO } \ -} - diff --git a/keyboards/emajesty/eiri/info.json b/keyboards/emajesty/eiri/info.json index 6deb2b93dd83..3163fb1cf578 100644 --- a/keyboards/emajesty/eiri/info.json +++ b/keyboards/emajesty/eiri/info.json @@ -18,55 +18,59 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75}, - {"x":1, "y":0.5}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.25}, - {"x":5, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.25}, - {"x":11, "y":0}, - {"x":12, "y":0.25}, - {"x":13, "y":0.5}, - {"x":14, "y":0.75}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"x":0, "y":1.75}, - {"x":1, "y":1.5}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.25}, - {"x":5, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.25}, - {"x":11, "y":1}, - {"x":12, "y":1.25}, - {"x":13, "y":1.5}, - {"x":14, "y":1.75}, + {"matrix": [0, 6], "x": 9, "y": 0.5}, + {"matrix": [0, 7], "x": 10, "y": 0.25}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0.25}, + {"matrix": [0, 10], "x": 13, "y": 0.5}, + {"matrix": [0, 11], "x": 14, "y": 0.75}, - {"x":0, "y":2.75}, - {"x":1, "y":2.5}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.25}, - {"x":5, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.25}, - {"x":11, "y":2}, - {"x":12, "y":2.25}, - {"x":13, "y":2.5}, - {"x":14, "y":2.75}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"x":2, "y":3.25}, - {"x":3, "y":3}, - {"x":4, "y":3.25}, - {"x":5, "y":3.5}, - {"x":6, "y":3.5}, - {"x":8, "y":3.5}, - {"x":9, "y":3.5}, - {"x":10, "y":3.25}, - {"x":11, "y":3}, - {"x":12, "y":3.25} + {"matrix": [1, 6], "x": 9, "y": 1.5}, + {"matrix": [1, 7], "x": 10, "y": 1.25}, + {"matrix": [1, 8], "x": 11, "y": 1}, + {"matrix": [1, 9], "x": 12, "y": 1.25}, + {"matrix": [1, 10], "x": 13, "y": 1.5}, + {"matrix": [1, 11], "x": 14, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [2, 6], "x": 9, "y": 2.5}, + {"matrix": [2, 7], "x": 10, "y": 2.25}, + {"matrix": [2, 8], "x": 11, "y": 2}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.5}, + {"matrix": [2, 11], "x": 14, "y": 2.75}, + + {"matrix": [3, 1], "x": 2, "y": 3.25}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3.25}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + + {"matrix": [3, 6], "x": 8, "y": 3.5}, + {"matrix": [3, 7], "x": 9, "y": 3.5}, + {"matrix": [3, 8], "x": 10, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.25} ] } } diff --git a/keyboards/emptystring/nqg/info.json b/keyboards/emptystring/nqg/info.json index 76bdb7fbe1a9..a64d70671900 100644 --- a/keyboards/emptystring/nqg/info.json +++ b/keyboards/emptystring/nqg/info.json @@ -18,43 +18,46 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":"; '", "x":10, "y":1}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":",", "x":8, "y":2}, - {"label":".", "x":9, "y":2}, - {"label":"/ Enter", "x":10, "y":2}, - {"label":"Shift / Tab", "x":0, "y":2}, - {"label":"LT(_LOWER, KC_ESC)", "x":3, "y":3}, - {"label":"Ctrl / Backspace", "x":4, "y":3}, - {"label":"Ctrl / Backspace", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"Space", "x":7, "y":3}, - {"label":"MO(_RAISE)", "x":8, "y":3} + {"matrix": [0, 0], "x": 1, "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, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + + {"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": [3, 0], "x": 0, "y": 2}, + + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3} ] } } diff --git a/keyboards/emptystring/nqg/nqg.h b/keyboards/emptystring/nqg/nqg.h deleted file mode 100644 index 004fbb54562d..000000000000 --- a/keyboards/emptystring/nqg/nqg.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, \ - L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, \ - L30, L32, L33, L34, L35, L36, L37 \ - ) { \ - {L00, L01, L02, L03, L04, L05, L06, L07, L08, L09}, \ - {L10, L11, L12, L13, L14, L15, L16, L17, L18, L19}, \ - {L20, L21, L22, L23, L24, L25, L26, L27, L28, L29}, \ - {L30, KC_NO, L32, L33, L34, L35, L36, L37, KC_NO, KC_NO} \ - } diff --git a/keyboards/ep/40/40.h b/keyboards/ep/40/40.h deleted file mode 100644 index 1ac39a278d74..000000000000 --- a/keyboards/ep/40/40.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 Elliot Powell - * - * 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 XXX KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1B, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, \ - k30, k31, k32, k34, k36, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, XXX, k1B }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, XXX, k34, XXX, k36, XXX, k38, k39, k3A, k3B } \ -} diff --git a/keyboards/ep/40/info.json b/keyboards/ep/40/info.json index e477b31a7899..4581d56b2160 100644 --- a/keyboards/ep/40/info.json +++ b/keyboards/ep/40/info.json @@ -16,7 +16,54 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1, "w":1.75}, {"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, "w":1.25}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":2.25}, {"x":5.25, "y":3, "w":2.75}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 5.25, "y": 3, "w": 2.75}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/ep/96/96.h b/keyboards/ep/96/96.h deleted file mode 100644 index 1117256cdc2f..000000000000 --- a/keyboards/ep/96/96.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2018 Elliot Powell - * - * 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 XXX KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1E, k1F, k1G, k1H, k1I, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, k2G, k2H, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4E, k4F, k4G, k4H, \ - k50, k51, k52, k56, k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F, k1G, k1H, k1I }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F, k2G, k2H, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3I }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, k4E, k4F, k4G, k4H, XXX }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5B, k5C, k5D, k5E, k5F, k5G, k5H, k5I } \ -} diff --git a/keyboards/ep/96/info.json b/keyboards/ep/96/info.json index f4b557f037c7..d554c9297f1d 100644 --- a/keyboards/ep/96/info.json +++ b/keyboards/ep/96/info.json @@ -17,106 +17,111 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"Print Screen", "x":13, "y":0}, - {"label":"Delete", "x":14, "y":0}, - {"label":"Home", "x":15, "y":0}, - {"label":"End", "x":16, "y":0}, - {"label":"Page Up", "x":17, "y":0}, - {"label":"Page Down", "x":18, "y":0}, - {"label":"~", "x":0, "y":1}, - {"label":"!", "x":1, "y":1}, - {"label":"@", "x":2, "y":1}, - {"label":"#", "x":3, "y":1}, - {"label":"$", "x":4, "y":1}, - {"label":"%", "x":5, "y":1}, - {"label":"^", "x":6, "y":1}, - {"label":"&", "x":7, "y":1}, - {"label":"*", "x":8, "y":1}, - {"label":"(", "x":9, "y":1}, - {"label":")", "x":10, "y":1}, - {"label":"_", "x":11, "y":1}, - {"label":"+", "x":12, "y":1}, - {"label":"Backspace", "x":13, "y":1, "w":2}, - {"label":"Num Lock", "x":15, "y":1}, - {"label":"/", "x":16, "y":1}, - {"label":"*", "x":17, "y":1}, - {"label":"-", "x":18, "y":1}, - {"label":"Tab", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"{", "x":11.5, "y":2}, - {"label":"}", "x":12.5, "y":2}, - {"label":"7", "x":15, "y":2}, - {"label":"8", "x":16, "y":2}, - {"label":"9", "x":17, "y":2}, - {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":":", "x":10.75, "y":3}, - {"label":"\"", "x":11.75, "y":3}, - {"label":"~", "x":12.75, "y":3}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, - {"label":"4", "x":15, "y":3}, - {"label":"5", "x":16, "y":3}, - {"label":"6", "x":17, "y":3}, - {"label":"+", "x":18, "y":2, "h":2}, - {"label":"Shift", "x":0, "y":4, "w":1.25}, - {"label":"|", "x":1.25, "y":4}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"<", "x":9.25, "y":4}, - {"label":">", "x":10.25, "y":4}, - {"label":"?", "x":11.25, "y":4}, - {"label":"Shift", "x":12.25, "y":4, "w":1.75}, - {"label":"↑", "x":14, "y":4}, - {"label":"1", "x":15, "y":4}, - {"label":"2", "x":16, "y":4}, - {"label":"3", "x":17, "y":4}, - {"label":"Ctrl", "x":0, "y":5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5, "w":6.25}, - {"label":"Alt", "x":10, "y":5, "w":1.5}, - {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, - {"label":"←", "x":13, "y":5}, - {"label":"↓", "x":14, "y":5}, - {"label":"→", "x":15, "y":5}, - {"label":"0", "x":16, "y":5}, - {"label":".", "x":17, "y":5}, - {"label":"Enter", "x":18, "y":4, "h":2} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3}, + {"matrix": [3, 14], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + {"matrix": [3, 18], "x": 18, "y": 2, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 11], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5}, + {"matrix": [5, 18], "x": 18, "y": 4, "h": 2} ] } } diff --git a/keyboards/ep/comsn/hs68/hs68.h b/keyboards/ep/comsn/hs68/hs68.h deleted file mode 100644 index 394208c55ce4..000000000000 --- a/keyboards/ep/comsn/hs68/hs68.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 Elliot Powell - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define xxx KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, xxx, K1E}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \ - { K40, K41, K42, xxx, xxx, xxx, K46, xxx, xxx, xxx, K4A, K4B, K4C, K4D, K4E } \ - } diff --git a/keyboards/ep/comsn/hs68/info.json b/keyboards/ep/comsn/hs68/info.json index 0bbfb50062a4..28b1044b9170 100644 --- a/keyboards/ep/comsn/hs68/info.json +++ b/keyboards/ep/comsn/hs68/info.json @@ -17,358 +17,79 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "ESC", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "\"", - "x": 2, - "y": 0 - }, - { - "label": "\u00a3", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 7, - "y": 0 - }, - { - "label": "*", - "x": 8, - "y": 0 - }, - { - "label": "(", - "x": 9, - "y": 0 - }, - { - "label": ")", - "x": 10, - "y": 0 - }, - { - "label": "_", - "x": 11, - "y": 0 - }, - { - "label": "+", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "GRAV", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "{", - "x": 11.5, - "y": 1 - }, - { - "label": "}", - "x": 12.5, - "y": 1 - }, - { - "label": "DEL", - "x": 15, - "y": 1 - }, - { - "label": "Caps Lock", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": ":", - "x": 10.75, - "y": 2 - }, - { - "label": "@", - "x": 11.75, - "y": 2 - }, - { - "label": "~", - "x": 12.75, - "y": 2 - }, - { - "label": "Enter", - "x": 13.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "PGUP", - "x": 15, - "y": 2 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 1.25 - }, - { - "label": "|", - "x": 1.25, - "y": 3 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": "<", - "x": 9.25, - "y": 3 - }, - { - "label": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "Shift", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "UP", - "x": 14, - "y": 3 - }, - { - "label": "PGDN", - "x": 15, - "y": 3 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "AltGr", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "LEFT", - "x": 13, - "y": 4 - }, - { - "label": "DOWN", - "x": 14, - "y": 4 - }, - { - "label": "RIGHT", - "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/ep/comsn/mollydooker/info.json b/keyboards/ep/comsn/mollydooker/info.json index a1355ce5a152..c43883e8bdf8 100644 --- a/keyboards/ep/comsn/mollydooker/info.json +++ b/keyboards/ep/comsn/mollydooker/info.json @@ -20,90 +20,94 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "VolDn", "x": 0, "y": 0 }, - { "label": "VolUp", "x": 1, "y": 0 }, - { "label": "Mute", "x": 2, "y": 0 }, - { "label": "~", "x": 3, "y": 0 }, - { "label": "Esc", "x": 4, "y": 0 }, - { "label": "!", "x": 5, "y": 0 }, - { "label": "@", "x": 6, "y": 0 }, - { "label": "#", "x": 7, "y": 0 }, - { "label": "$", "x": 8, "y": 0 }, - { "label": "%", "x": 9, "y": 0 }, - { "label": "^", "x": 10, "y": 0 }, - { "label": "&", "x": 11, "y": 0 }, - { "label": "*", "x": 12, "y": 0 }, - { "label": "(", "x": 13, "y": 0 }, - { "label": ")", "x": 14, "y": 0 }, - { "label": "_", "x": 15, "y": 0 }, - { "label": "+", "x": 16, "y": 0 }, - { "label": "Backspace", "x": 17, "y": 0, "w": 2 }, - { "label": "Del", "x": 19, "y": 0 }, - { "label": "7", "x": 0, "y": 1 }, - { "label": "8", "x": 1, "y": 1 }, - { "label": "9", "x": 2, "y": 1 }, - { "label": "+", "x": 3, "y": 1, "h": 2 }, - { "label": "Tab", "x": 4, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 5.5, "y": 1 }, - { "label": "W", "x": 6.5, "y": 1 }, - { "label": "E", "x": 7.5, "y": 1 }, - { "label": "R", "x": 8.5, "y": 1 }, - { "label": "T", "x": 9.5, "y": 1 }, - { "label": "Y", "x": 10.5, "y": 1 }, - { "label": "U", "x": 11.5, "y": 1 }, - { "label": "I", "x": 12.5, "y": 1 }, - { "label": "O", "x": 13.5, "y": 1 }, - { "label": "P", "x": 14.5, "y": 1 }, - { "label": "{", "x": 15.5, "y": 1 }, - { "label": "}", "x": 16.5, "y": 1 }, - { "label": "|", "x": 17.5, "y": 1, "w": 1.5 }, - { "label": "PgUp", "x": 19, "y": 1 }, - { "label": "4", "x": 0, "y": 2 }, - { "label": "5", "x": 1, "y": 2 }, - { "label": "6", "x": 2, "y": 2 }, - { "label": "Caps Lock", "x": 4, "y": 2, "w": 1.75 }, - { "label": "A", "x": 5.75, "y": 2 }, - { "label": "S", "x": 6.75, "y": 2 }, - { "label": "D", "x": 7.75, "y": 2 }, - { "label": "F", "x": 8.75, "y": 2 }, - { "label": "G", "x": 9.75, "y": 2 }, - { "label": "H", "x": 10.75, "y": 2 }, - { "label": "J", "x": 11.75, "y": 2 }, - { "label": "K", "x": 12.75, "y": 2 }, - { "label": "L", "x": 13.75, "y": 2 }, - { "label": ":", "x": 14.75, "y": 2 }, - { "label": "\"", "x": 15.75, "y": 2 }, - { "label": "Enter", "x": 16.75, "y": 2, "w": 2.25 }, - { "label": "PgDn", "x": 19, "y": 2 }, - { "label": "1", "x": 0, "y": 3 }, - { "label": "2", "x": 1, "y": 3 }, - { "label": "3", "x": 2, "y": 3 }, - { "label": "Enter", "x": 3, "y": 3, "h": 2 }, - { "label": "Shift", "x": 4, "y": 3, "w": 2.25 }, - { "label": "Z", "x": 6.25, "y": 3 }, - { "label": "X", "x": 7.25, "y": 3 }, - { "label": "C", "x": 8.25, "y": 3 }, - { "label": "V", "x": 9.25, "y": 3 }, - { "label": "B", "x": 10.25, "y": 3 }, - { "label": "N", "x": 11.25, "y": 3 }, - { "label": "M", "x": 12.25, "y": 3 }, - { "label": "<", "x": 13.25, "y": 3 }, - { "label": ">", "x": 14.25, "y": 3 }, - { "label": "?", "x": 15.25, "y": 3 }, - { "label": "Shift", "x": 16.25, "y": 3, "w": 1.75 }, - { "label": "Up", "x": 18, "y": 3 }, - { "label": "fn0", "x": 19, "y": 3 }, - { "label": "0", "x": 0, "y": 4, "w": 2 }, - { "label": ".", "x": 2, "y": 4 }, - { "label": "Ctrl", "x": 4, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 5.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "x": 6.5, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 7.75, "y": 4, "w": 6.25 }, - { "label": "Alt", "x": 14, "y": 4, "w": 1.5 }, - { "label": "Ctrl", "x": 15.5, "y": 4, "w": 1.5 }, - { "label": "Left", "x": 17, "y": 4 }, - { "label": "Down", "x": 18, "y": 4 }, - { "label": "Right", "x": 19, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0, "w": 2}, + {"matrix": [0, 18], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1, "h": 2}, + {"matrix": [1, 4], "x": 4, "y": 1, "w": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1}, + {"matrix": [1, 14], "x": 14.5, "y": 1}, + {"matrix": [1, 15], "x": 15.5, "y": 1}, + {"matrix": [1, 16], "x": 16.5, "y": 1}, + {"matrix": [1, 17], "x": 17.5, "y": 1, "w": 1.5}, + {"matrix": [1, 18], "x": 19, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2, "w": 1.75}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2}, + {"matrix": [2, 14], "x": 14.75, "y": 2}, + {"matrix": [2, 15], "x": 15.75, "y": 2}, + {"matrix": [2, 17], "x": 16.75, "y": 2, "w": 2.25}, + {"matrix": [2, 18], "x": 19, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3}, + {"matrix": [3, 12], "x": 13.25, "y": 3}, + {"matrix": [3, 13], "x": 14.25, "y": 3}, + {"matrix": [3, 14], "x": 15.25, "y": 3}, + {"matrix": [3, 16], "x": 16.25, "y": 3, "w": 1.75}, + {"matrix": [3, 17], "x": 18, "y": 3}, + {"matrix": [3, 18], "x": 19, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 7.75, "y": 4, "w": 6.25}, + {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 15.5, "y": 4, "w": 1.5}, + {"matrix": [4, 16], "x": 17, "y": 4}, + {"matrix": [4, 17], "x": 18, "y": 4}, + {"matrix": [4, 18], "x": 19, "y": 4} ] } } diff --git a/keyboards/ep/comsn/mollydooker/mollydooker.h b/keyboards/ep/comsn/mollydooker/mollydooker.h deleted file mode 100644 index 0cdac37a02a9..000000000000 --- a/keyboards/ep/comsn/mollydooker/mollydooker.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Elliot Powell - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define xxxx KC_NO - -#define LAYOUT( \ - K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, k118, \ - K200, k201, K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, k217, k218, \ - K300, k301, K302, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, k317, k318, \ - K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, k414, k416, k417, k418, \ - K500, K502, k504, k505, k506, k509, k513, k514, k516, k517, k518) \ -{ \ - {K100, K101, K102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, k118}, \ - {K200, k201, K202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, k217, k218}, \ - {K300, k301, K302, xxxx, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314, k315, xxxx, k317, k318}, \ - {K400, K401, K402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, k414, xxxx, k416, k417, k418}, \ - {K500, xxxx, K502, xxxx, k504, k505, k506, xxxx, xxxx, k509, xxxx, xxxx, xxxx, k513, k514, xxxx, k516, k517, k518} \ -} diff --git a/keyboards/ep/comsn/tf_longeboye/info.json b/keyboards/ep/comsn/tf_longeboye/info.json index 4e34df59ecfc..0ab6b6d52083 100644 --- a/keyboards/ep/comsn/tf_longeboye/info.json +++ b/keyboards/ep/comsn/tf_longeboye/info.json @@ -17,93 +17,106 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "\"", "x": 2, "y": 0 }, - { "label": "\u00a3", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "Backspace", "x": 13, "y": 0, "w": 2 }, - { "label": "Insert", "x": 15.25, "y": 0 }, - { "label": "PgUp", "x": 16.25, "y": 0 }, - { "label": "Num Lock", "x": 17.5, "y": 0 }, - { "label": "/", "x": 18.5, "y": 0 }, - { "label": "*", "x": 19.5, "y": 0 }, - { "label": "-", "x": 20.5, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "{", "x": 11.5, "y": 1 }, - { "label": "}", "x": 12.5, "y": 1 }, - { "label": "Delete", "x": 15.25, "y": 1 }, - { "label": "PgDn", "x": 16.25, "y": 1 }, - { "label": "7", "x": 17.5, "y": 1 }, - { "label": "8", "x": 18.5, "y": 1 }, - { "label": "9", "x": 19.5, "y": 1 }, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "@", "x": 11.75, "y": 2 }, - { "label": "~", "x": 12.75, "y": 2 }, - { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 }, - { "label": "4", "x": 17.5, "y": 2 }, - { "label": "5", "x": 18.5, "y": 2 }, - { "label": "6", "x": 19.5, "y": 2 }, - { "label": "+", "x": 20.5, "y": 1, "h": 2 }, - { "label": "Shift", "x": 0, "y": 3, "w": 1.25 }, - { "label": "|", "x": 1.25, "y": 3 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "<", "x": 9.25, "y": 3 }, - { "label": ">", "x": 10.25, "y": 3 }, - { "label": "?", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "fn", "x": 14, "y": 3 }, - { "label": "\u2191", "x": 15.25, "y": 3 }, - { "label": "1", "x": 17.5, "y": 3 }, - { "label": "2", "x": 18.5, "y": 3 }, - { "label": "3", "x": 19.5, "y": 3 }, - { "label": "Enter", "x": 20.5, "y": 3, "h": 2 }, - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, - { "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "Alt Gr", "x": 10, "y": 4, "w": 1.25 }, - { "label": "Fn", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "\u2190", "x": 14.25, "y": 4 }, - { "label": "\u2193", "x": 15.25, "y": 4 }, - { "label": "\u2192", "x": 16.25, "y": 4 }, - { "label": "0", "x": 17.5, "y": 4, "w": 2 }, - { "label": ".", "x": 19.5, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [4, 8], "x": 19.5, "y": 0}, + {"matrix": [1, 13], "x": 20.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + + {"matrix": [1, 16], "x": 17.5, "y": 1}, + {"matrix": [1, 17], "x": 18.5, "y": 1}, + {"matrix": [4, 7], "x": 19.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 16], "x": 17.5, "y": 2}, + {"matrix": [2, 17], "x": 18.5, "y": 2}, + {"matrix": [4, 5], "x": 19.5, "y": 2}, + {"matrix": [2, 15], "x": 20.5, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [3, 14], "x": 15.25, "y": 3}, + + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3}, + {"matrix": [4, 4], "x": 19.5, "y": 3}, + {"matrix": [3, 15], "x": 20.5, "y": 3, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 14.25, "y": 4}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + + {"matrix": [4, 16], "x": 17.5, "y": 4, "w": 2}, + {"matrix": [4, 3], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/ep/comsn/tf_longeboye/tf_longeboye.h b/keyboards/ep/comsn/tf_longeboye/tf_longeboye.h deleted file mode 100644 index f673ff66d766..000000000000 --- a/keyboards/ep/comsn/tf_longeboye/tf_longeboye.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 Elliot Powell - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K013, K014, K015, K016, K018, K019, K408, K114, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K113, K115, K116, K118, K119, K407, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, K218, K219, K405, K216, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, K315, K318, K319, K404, K316, \ - K400, K401, K402, K406, K410, K411, K413, K414, K415, K416, K418, K403 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K013, K014, K015, K016, K018, K019, }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K113, K114, K115, K116, K118, K119, }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, KC_NO, K216, K218, K219, }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, K315, K316, K318, K319, }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, KC_NO, K410, K411, K413, K414, K415, K416, K418, KC_NO, } \ -} diff --git a/keyboards/ergotravel/rev1/info.json b/keyboards/ergotravel/rev1/info.json index 7c6ed69ce36e..01fd3265e941 100644 --- a/keyboards/ergotravel/rev1/info.json +++ b/keyboards/ergotravel/rev1/info.json @@ -23,7 +23,69 @@ "processor": "atmega32u4", "layouts": { "LAYOUT": { - "layout": [{"label":"L00", "x":0, "y":0.375}, {"label":"L01", "x":1, "y":0.25}, {"label":"L02", "x":2, "y":0.125}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0.125}, {"label":"L05", "x":5, "y":0.25}, {"label":"L06", "x":6, "y":0.5}, {"label":"R00", "x":9, "y":0.5}, {"label":"R01", "x":10, "y":0.25}, {"label":"R02", "x":11, "y":0.125}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0.125}, {"label":"R05", "x":14, "y":0.25}, {"label":"R06", "x":15, "y":0.375}, {"label":"L10", "x":0, "y":1.375}, {"label":"L11", "x":1, "y":1.25}, {"label":"L12", "x":2, "y":1.125}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1.125}, {"label":"L15", "x":5, "y":1.25}, {"label":"L16", "x":6, "y":1.5}, {"label":"R10", "x":9, "y":1.5}, {"label":"R11", "x":10, "y":1.25}, {"label":"R12", "x":11, "y":1.125}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1.125}, {"label":"R15", "x":14, "y":1.25}, {"label":"R16", "x":15, "y":1.375}, {"label":"L20", "x":0, "y":2.375}, {"label":"L21", "x":1, "y":2.25}, {"label":"L22", "x":2, "y":2.125}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2.125}, {"label":"L25", "x":5, "y":2.25}, {"label":"L26", "x":6.5, "y":3}, {"label":"R20", "x":8.5, "y":3}, {"label":"R21", "x":10, "y":2.25}, {"label":"R22", "x":11, "y":2.125}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2.125}, {"label":"R25", "x":14, "y":2.25}, {"label":"R26", "x":15, "y":2.375}, {"label":"L30", "x":0, "y":3.375}, {"label":"L31", "x":1, "y":3.25}, {"label":"L32", "x":2, "y":3.125}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":5.5, "y":4}, {"label":"L35", "x":6.5, "y":4}, {"label":"R30", "x":8.5, "y":4}, {"label":"R31", "x":9.5, "y":4}, {"label":"R32", "x":12, "y":3}, {"label":"R33", "x":13, "y":3.125}, {"label":"R34", "x":14, "y":3.25}, {"label":"R35", "x":15, "y":3.375}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, + + {"matrix": [4, 6], "x": 9, "y": 0.5}, + {"matrix": [4, 5], "x": 10, "y": 0.25}, + {"matrix": [4, 4], "x": 11, "y": 0.125}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0.125}, + {"matrix": [4, 1], "x": 14, "y": 0.25}, + {"matrix": [4, 0], "x": 15, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + + {"matrix": [5, 6], "x": 9, "y": 1.5}, + {"matrix": [5, 5], "x": 10, "y": 1.25}, + {"matrix": [5, 4], "x": 11, "y": 1.125}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [5, 2], "x": 13, "y": 1.125}, + {"matrix": [5, 1], "x": 14, "y": 1.25}, + {"matrix": [5, 0], "x": 15, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 3}, + + {"matrix": [6, 6], "x": 8.5, "y": 3}, + {"matrix": [6, 5], "x": 10, "y": 2.25}, + {"matrix": [6, 4], "x": 11, "y": 2.125}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 2], "x": 13, "y": 2.125}, + {"matrix": [6, 1], "x": 14, "y": 2.25}, + {"matrix": [6, 0], "x": 15, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 4}, + {"matrix": [3, 5], "x": 6.5, "y": 4}, + + {"matrix": [7, 5], "x": 8.5, "y": 4}, + {"matrix": [7, 4], "x": 9.5, "y": 4}, + {"matrix": [7, 3], "x": 12, "y": 3}, + {"matrix": [7, 2], "x": 13, "y": 3.125}, + {"matrix": [7, 1], "x": 14, "y": 3.25}, + {"matrix": [7, 0], "x": 15, "y": 3.375} + ] } } } diff --git a/keyboards/ergotravel/rev1/rev1.h b/keyboards/ergotravel/rev1/rev1.h deleted file mode 100644 index c241c2d599a6..000000000000 --- a/keyboards/ergotravel/rev1/rev1.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, XXX }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30, XXX } \ -} diff --git a/keyboards/esca/getawayvan/getawayvan.h b/keyboards/esca/getawayvan/getawayvan.h deleted file mode 100644 index 30d67697fafe..000000000000 --- a/keyboards/esca/getawayvan/getawayvan.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Enrique Cabrera - * - * 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 KNO KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, \ - K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \ - K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \ - K36, K37, K38, K39, K40, K41, K42, K43, K45 \ -){ \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11}, \ - {K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23}, \ - {K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35}, \ - {K36, K37, K38, KNO, K39, KNO, K40, KNO, K41, K42, K43, K45} \ -} diff --git a/keyboards/esca/getawayvan/info.json b/keyboards/esca/getawayvan/info.json index 78294f441a47..bfa9da1851cd 100644 --- a/keyboards/esca/getawayvan/info.json +++ b/keyboards/esca/getawayvan/info.json @@ -20,7 +20,57 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25}, + + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} + ] } } } diff --git a/keyboards/esca/getawayvan_f042/getawayvan_f042.h b/keyboards/esca/getawayvan_f042/getawayvan_f042.h deleted file mode 100644 index 2e3a4d2dc1fd..000000000000 --- a/keyboards/esca/getawayvan_f042/getawayvan_f042.h +++ /dev/null @@ -1,33 +0,0 @@ - /* Copyright 2021 Enrique Cabrera - * - * 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 KNO KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, \ - K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \ - K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \ - K36, K37, K38, K39, K40, K41, K42, K43, K45 \ -){ \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11}, \ - {K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23}, \ - {K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35}, \ - {K36, K37, K38, KNO, K39, KNO, K40, KNO, K41, K42, K43, K45} \ -} diff --git a/keyboards/esca/getawayvan_f042/info.json b/keyboards/esca/getawayvan_f042/info.json index 0311159bf0b3..c514b14e5160 100644 --- a/keyboards/esca/getawayvan_f042/info.json +++ b/keyboards/esca/getawayvan_f042/info.json @@ -20,7 +20,57 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"NoNo Key", "x":11, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"\"", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.5}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"x":10.75, "y":2}, {"label":"Shift", "x":11.75, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Win", "x":1, "y":3, "w":1.25}, {"label":"Alt", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":2.75}, {"label":"", "x":6, "y":3, "w":2.25}, {"label":"Alt", "x":8.25, "y":3, "w":1.25}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 4], "x": 3.25, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25}, + + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} + ] } } } diff --git a/keyboards/eternal_keypad/eternal_keypad.h b/keyboards/eternal_keypad/eternal_keypad.h deleted file mode 100644 index 45afff5a014c..000000000000 --- a/keyboards/eternal_keypad/eternal_keypad.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 duckyb - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, \ - k11, k12, k13, k14, k15, k16, k17, \ - k20, k21, k22, k23, k24, k25, k26, k27, \ - k30, k31, k32, k33, k34, k35, k36, k37, \ - k40, k41, k42, k43, k45, k47 \ -) { \ - { KC_NO, k01, k02, k03, k04, k05, k06, k07 }, \ - { KC_NO, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37 }, \ - { k40, k41, k42, k43, KC_NO, k45, KC_NO, k47 } \ -} diff --git a/keyboards/eternal_keypad/info.json b/keyboards/eternal_keypad/info.json index 35a5a543a496..f10b4ab8a4d3 100644 --- a/keyboards/eternal_keypad/info.json +++ b/keyboards/eternal_keypad/info.json @@ -24,42 +24,49 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k01", "x": 1.5, "y": 0, "w": 1.25}, - {"label": "k02", "x": 2.75, "y": 0}, - {"label": "k03", "x": 3.75, "y": 0}, - {"label": "k04", "x": 4.75, "y": 0}, - {"label": "k05", "x": 5.75, "y": 0}, - {"label": "k06", "x": 6.75, "y": 0}, - {"label": "k07", "x": 7.75, "y": 0}, - {"label": "k11", "x": 1.5, "y": 1, "w": 1.25}, - {"label": "k12", "x": 2.75, "y": 1}, - {"label": "k13", "x": 3.75, "y": 1}, - {"label": "k14", "x": 4.75, "y": 1}, - {"label": "k15", "x": 5.75, "y": 1}, - {"label": "k16", "x": 6.75, "y": 1}, - {"label": "k17", "x": 7.75, "y": 1}, - {"label": "k20", "x": 0, "y": 2}, - {"label": "k21", "x": 1.5, "y": 2, "w": 1.25}, - {"label": "k22", "x": 2.75, "y": 2}, - {"label": "k23", "x": 3.75, "y": 2}, - {"label": "k24", "x": 4.75, "y": 2}, - {"label": "k25", "x": 5.75, "y": 2}, - {"label": "k26", "x": 6.75, "y": 2}, - {"label": "k27", "x": 7.75, "y": 2}, - {"label": "k30", "x": 0, "y": 3}, - {"label": "k31", "x": 1.5, "y": 3, "w": 1.25}, - {"label": "k32", "x": 2.75, "y": 3}, - {"label": "k33", "x": 3.75, "y": 3}, - {"label": "k34", "x": 4.75, "y": 3}, - {"label": "k35", "x": 5.75, "y": 3}, - {"label": "k36", "x": 6.75, "y": 3}, - {"label": "k37", "x": 7.75, "y": 3}, - {"label": "k40", "x": 0, "y": 4}, - {"label": "k41", "x": 1.5, "y": 4, "w": 1.25}, - {"label": "k42", "x": 2.75, "y": 4, "w": 1.25}, - {"label": "k43", "x": 4, "y": 4}, - {"label": "k45", "x": 5, "y": 4, "w": 2.75}, - {"label": "k47", "x": 7.75, "y": 4} + {"matrix": [0, 1], "x": 1.5, "y": 0, "w": 1.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + + {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.25}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2.75}, + {"matrix": [4, 7], "x": 7.75, "y": 4} ] } } diff --git a/keyboards/evancookaudio/sleepingdinosaur/info.json b/keyboards/evancookaudio/sleepingdinosaur/info.json index ddae2a187d4a..5c98daa8ae08 100644 --- a/keyboards/evancookaudio/sleepingdinosaur/info.json +++ b/keyboards/evancookaudio/sleepingdinosaur/info.json @@ -18,39 +18,38 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0}, - {"label":"2", "x":1, "y":0}, - {"label":"3", "x":2, "y":0}, - {"label":"4", "x":3, "y":0}, - {"label":"5", "x":4, "y":0}, - {"label":"-", "x":5, "y":0}, + {"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}, - {"label":"6", "x":0, "y":1}, - {"label":"7", "x":1, "y":1}, - {"label":"8", "x":2, "y":1}, - {"label":"9", "x":3, "y":1}, - {"label":"0", "x":4, "y":1}, - {"label":"R", "x":5, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"label":"/", "x":0, "y":2}, - {"label":"Q", "x":1, "y":2}, - {"label":"W", "x":2, "y":2}, - {"label":"E", "x":3, "y":2}, - {"label":"U", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"label":"Enter", "x":0, "y":3, "h":2}, - {"label":"A", "x":1, "y":3}, - {"label":"S", "x":2, "y":3}, - {"label":"D", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3, "h":2}, - {"label":"O", "x":5, "y":3}, - - {"label":"Z", "x":1, "y":4}, - {"label":"X", "x":2, "y":4}, - {"label":"C", "x":3, "y":4}, - {"label":"N", "x":5, "y":4} - + {"matrix": [3, 0], "x": 0, "y": 3, "h": 2}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "h": 2}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4} ] } } diff --git a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h b/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h deleted file mode 100644 index 9672fca28905..000000000000 --- a/keyboards/evancookaudio/sleepingdinosaur/sleepingdinosaur.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2022 evan cook - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT(\ - k00, k01, k02, k03, k04, k05, \ - k06, k07, k08, k09, k10, k11, \ - k12, k13, k14, k15, k16, k17, \ - k18, k19, k20, k21, k22, k23, \ - k24, k25, k26, k27 \ - ) \ - { \ - {k00, k01, k02, k03, k04, k05},\ - {k06, k07, k08, k09, k10, k11},\ - {k12, k13, k14, k15, k16, k17},\ - {k18, k19, k20, k21, k22, k23},\ - {KC_NO, k24, k25, k26, KC_NO, k27},\ - } diff --git a/keyboards/evil80/evil80.h b/keyboards/evil80/evil80.h deleted file mode 100644 index 90d4f6564b80..000000000000 --- a/keyboards/evil80/evil80.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k50, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k51, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ - k52, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ - k53, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4E, \ - k54, k55, k56, k57, 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, XXX, XXX, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E, XXX }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, XXX, k59, k5A, k5B, k5C, k5D, k5E, k5F } \ -} diff --git a/keyboards/evil80/info.json b/keyboards/evil80/info.json index 392ee05e2579..8e843f189520 100644 --- a/keyboards/evil80/info.json +++ b/keyboards/evil80/info.json @@ -23,9 +23,113 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { - "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.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, "w":2}, {"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}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"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":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] + "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": [5, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 0], "x": 1, "y": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1.5}, + {"matrix": [1, 2], "x": 3, "y": 1.5}, + {"matrix": [1, 3], "x": 4, "y": 1.5}, + {"matrix": [1, 4], "x": 5, "y": 1.5}, + {"matrix": [1, 5], "x": 6, "y": 1.5}, + {"matrix": [1, 6], "x": 7, "y": 1.5}, + {"matrix": [1, 7], "x": 8, "y": 1.5}, + {"matrix": [1, 8], "x": 9, "y": 1.5}, + {"matrix": [1, 9], "x": 10, "y": 1.5}, + {"matrix": [1, 10], "x": 11, "y": 1.5}, + {"matrix": [1, 11], "x": 12, "y": 1.5}, + {"matrix": [1, 12], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 13], "x": 15.25, "y": 1.5}, + {"matrix": [1, 14], "x": 16.25, "y": 1.5}, + {"matrix": [1, 15], "x": 17.25, "y": 1.5}, + + {"matrix": [5, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 0], "x": 1.5, "y": 2.5}, + {"matrix": [2, 1], "x": 2.5, "y": 2.5}, + {"matrix": [2, 2], "x": 3.5, "y": 2.5}, + {"matrix": [2, 3], "x": 4.5, "y": 2.5}, + {"matrix": [2, 4], "x": 5.5, "y": 2.5}, + {"matrix": [2, 5], "x": 6.5, "y": 2.5}, + {"matrix": [2, 6], "x": 7.5, "y": 2.5}, + {"matrix": [2, 7], "x": 8.5, "y": 2.5}, + {"matrix": [2, 8], "x": 9.5, "y": 2.5}, + {"matrix": [2, 9], "x": 10.5, "y": 2.5}, + {"matrix": [2, 10], "x": 11.5, "y": 2.5}, + {"matrix": [2, 11], "x": 12.5, "y": 2.5}, + {"matrix": [2, 12], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 13], "x": 15.25, "y": 2.5}, + {"matrix": [2, 14], "x": 16.25, "y": 2.5}, + {"matrix": [2, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 2], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 0], "x": 1.75, "y": 3.5}, + {"matrix": [3, 1], "x": 2.75, "y": 3.5}, + {"matrix": [3, 2], "x": 3.75, "y": 3.5}, + {"matrix": [3, 3], "x": 4.75, "y": 3.5}, + {"matrix": [3, 4], "x": 5.75, "y": 3.5}, + {"matrix": [3, 5], "x": 6.75, "y": 3.5}, + {"matrix": [3, 6], "x": 7.75, "y": 3.5}, + {"matrix": [3, 7], "x": 8.75, "y": 3.5}, + {"matrix": [3, 8], "x": 9.75, "y": 3.5}, + {"matrix": [3, 9], "x": 10.75, "y": 3.5}, + {"matrix": [3, 10], "x": 11.75, "y": 3.5}, + {"matrix": [3, 11], "x": 12.75, "y": 3.5}, + {"matrix": [3, 12], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [5, 3], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 0], "x": 1.25, "y": 4.5}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 12], "x": 14, "y": 4.5}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 4], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 13], "x": 15.25, "y": 5.5}, + {"matrix": [5, 14], "x": 16.25, "y": 5.5}, + {"matrix": [5, 15], "x": 17.25, "y": 5.5} + ] } } } diff --git a/keyboards/exclusive/e7v1se/e7v1se.h b/keyboards/exclusive/e7v1se/e7v1se.h deleted file mode 100644 index c36072dc0a62..000000000000 --- a/keyboards/exclusive/e7v1se/e7v1se.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2019 Bart Riemens - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, \ - K50, K51, K52, K56, K5A, K5B, K5D, K5E, K5F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, K4E, KC_NO }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, KC_NO, K5D, K5E, K5F } \ -} diff --git a/keyboards/exclusive/e7v1se/info.json b/keyboards/exclusive/e7v1se/info.json index f91568a28cb1..3244831b4db1 100644 --- a/keyboards/exclusive/e7v1se/info.json +++ b/keyboards/exclusive/e7v1se/info.json @@ -25,88 +25,102 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00", "x": 0, "y": 0 }, - { "label": "K01", "x": 1.25, "y": 0 }, - { "label": "K02", "x": 2.25, "y": 0 }, - { "label": "K03", "x": 3.25, "y": 0 }, - { "label": "K04", "x": 4.25, "y": 0 }, - { "label": "K05", "x": 5.5, "y": 0 }, - { "label": "K06", "x": 6.5, "y": 0 }, - { "label": "K07", "x": 7.5, "y": 0 }, - { "label": "K08", "x": 8.5, "y": 0 }, - { "label": "K09", "x": 9.75, "y": 0 }, - { "label": "K0a", "x": 10.75, "y": 0 }, - { "label": "K0b", "x": 11.75, "y": 0 }, - { "label": "K0c", "x": 12.75, "y": 0 }, - { "label": "K0e", "x": 14, "y": 0 }, - { "label": "K0f", "x": 15.25, "y": 0 }, - { "label": "K10", "x": 0, "y": 1 }, - { "label": "K11", "x": 1, "y": 1 }, - { "label": "K12", "x": 2, "y": 1 }, - { "label": "K13", "x": 3, "y": 1 }, - { "label": "K14", "x": 4, "y": 1 }, - { "label": "K15", "x": 5, "y": 1 }, - { "label": "K16", "x": 6, "y": 1 }, - { "label": "K17", "x": 7, "y": 1 }, - { "label": "K18", "x": 8, "y": 1 }, - { "label": "K19", "x": 9, "y": 1 }, - { "label": "K1a", "x": 10, "y": 1 }, - { "label": "K1b", "x": 11, "y": 1 }, - { "label": "K1c", "x": 12, "y": 1 }, - { "label": "K1d", "x": 13, "y": 1 }, - { "label": "K1e", "x": 14, "y": 1 }, - { "label": "K1f", "x": 15.25, "y": 1 }, - { "label": "K20", "x": 0, "y": 2, "w": 1.5 }, - { "label": "K22", "x": 1.5, "y": 2 }, - { "label": "K23", "x": 2.5, "y": 2 }, - { "label": "K24", "x": 3.5, "y": 2 }, - { "label": "K25", "x": 4.5, "y": 2 }, - { "label": "K26", "x": 5.5, "y": 2 }, - { "label": "K27", "x": 6.5, "y": 2 }, - { "label": "K28", "x": 7.5, "y": 2 }, - { "label": "K29", "x": 8.5, "y": 2 }, - { "label": "K2a", "x": 9.5, "y": 2 }, - { "label": "K2b", "x": 10.5, "y": 2 }, - { "label": "K2c", "x": 11.5, "y": 2 }, - { "label": "K2d", "x": 12.5, "y": 2 }, - { "label": "K2e", "x": 13.5, "y": 2, "w": 1.5 }, - { "label": "K2f", "x": 15.25, "y": 2 }, - { "label": "K30", "x": 0, "y": 3, "w": 1.75 }, - { "label": "K32", "x": 1.75, "y": 3 }, - { "label": "K33", "x": 2.75, "y": 3 }, - { "label": "K34", "x": 3.75, "y": 3 }, - { "label": "K35", "x": 4.75, "y": 3 }, - { "label": "K36", "x": 5.75, "y": 3 }, - { "label": "K37", "x": 6.75, "y": 3 }, - { "label": "K38", "x": 7.75, "y": 3 }, - { "label": "K39", "x": 8.75, "y": 3 }, - { "label": "K3a", "x": 9.75, "y": 3 }, - { "label": "K3b", "x": 10.75, "y": 3 }, - { "label": "K3c", "x": 11.75, "y": 3 }, - { "label": "K3d", "x": 12.75, "y": 3, "w": 2.25 }, - { "label": "K40", "x": 0, "y": 4, "w": 1.25 }, - { "label": "K41", "x": 1.25, "y": 4 }, - { "label": "K42", "x": 2.25, "y": 4 }, - { "label": "K43", "x": 3.25, "y": 4 }, - { "label": "K44", "x": 4.25, "y": 4 }, - { "label": "K45", "x": 5.25, "y": 4 }, - { "label": "K46", "x": 6.25, "y": 4 }, - { "label": "K47", "x": 7.25, "y": 4 }, - { "label": "K48", "x": 8.25, "y": 4 }, - { "label": "K49", "x": 9.25, "y": 4 }, - { "label": "K4a", "x": 10.25, "y": 4 }, - { "label": "K4b", "x": 11.25, "y": 4 }, - { "label": "K4d", "x": 12.25, "y": 4, "w": 1.75 }, - { "label": "K4e", "x": 14.25, "y": 4.25 }, - { "label": "K50", "x": 0, "y": 5, "w": 1.25 }, - { "label": "K51", "x": 1.25, "y": 5, "w": 1.25 }, - { "label": "K52", "x": 2.5, "y": 5, "w": 1.25 }, - { "label": "K56", "x": 3.75, "y": 5, "w": 6.25 }, - { "label": "K5a", "x": 10, "y": 5, "w": 1.25 }, - { "label": "K5b", "x": 11.25, "y": 5, "w": 1.25 }, - { "label": "K5d", "x": 13.25, "y": 5.25 }, - { "label": "K5e", "x": 14.25, "y": 5.25 }, - { "label": "K5f", "x": 15.25, "y": 5.25 } + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [4, 14], "x": 14.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + + {"matrix": [5, 13], "x": 13.25, "y": 5.25}, + {"matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"matrix": [5, 15], "x": 15.25, "y": 5.25} ] } } diff --git a/keyboards/fc660c/fc660c.c b/keyboards/fc660c/fc660c.c index 592697cb8881..2054cd2818ca 100644 --- a/keyboards/fc660c/fc660c.c +++ b/keyboards/fc660c/fc660c.c @@ -14,7 +14,7 @@ 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 . */ -#include "fc660c.h" +#include "quantum.h" #ifdef ACTUATION_DEPTH_ADJUSTMENT #include "actuation_point.h" diff --git a/keyboards/fc660c/fc660c.h b/keyboards/fc660c/fc660c.h deleted file mode 100644 index fca02dc0e986..000000000000 --- a/keyboards/fc660c/fc660c.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2017 Balz Guenat - -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 XXX KC_NO - -#define LAYOUT( \ - k13, k10, k11, k12, k14, k16, k17, k15, k1B, k18, k19, k1A, k1C, k1E, k1F, \ - k03, k00, k01, k02, k04, k06, k07, k05, k0B, k08, k09, k0A, k0C, k0E, k0F, \ - k43, k40, k41, k42, k44, k46, k47, k45, k4B, k48, k49, k4A, k4E, \ - k33, k31, k32, k34, k36, k37, k35, k3B, k38, k39, k3A, k3C, k3D, \ - k23, k21, k22, k27, k28, k2A, k2C, k2E, k2D, k2F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, XXX, k0E, k0F }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, XXX, k1E, k1F }, \ - { XXX, k21, k22, k23, XXX, XXX, XXX, k27, k28, XXX, k2A, XXX, k2C, k2D, k2E, k2F }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, XXX, k4E, XXX } \ -} diff --git a/keyboards/fc660c/info.json b/keyboards/fc660c/info.json index ff58c4e23c52..c0385fa37fd3 100644 --- a/keyboards/fc660c/info.json +++ b/keyboards/fc660c/info.json @@ -17,7 +17,80 @@ "debounce": 0, "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"x":15.5, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15.5, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.25}, {"x":14.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6}, {"label":"Alt", "x":9.75, "y":4, "w":1.25}, {"label":"Win", "x":11, "y":4, "w":1.25}, {"label":"Menu", "x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, {"x":15.5, "y":4}] + "layout": [ + {"matrix": [1, 3], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [1, 1], "x": 2, "y": 0}, + {"matrix": [1, 2], "x": 3, "y": 0}, + {"matrix": [1, 4], "x": 4, "y": 0}, + {"matrix": [1, 6], "x": 5, "y": 0}, + {"matrix": [1, 7], "x": 6, "y": 0}, + {"matrix": [1, 5], "x": 7, "y": 0}, + {"matrix": [1, 11], "x": 8, "y": 0}, + {"matrix": [1, 8], "x": 9, "y": 0}, + {"matrix": [1, 9], "x": 10, "y": 0}, + {"matrix": [1, 10], "x": 11, "y": 0}, + {"matrix": [1, 12], "x": 12, "y": 0}, + {"matrix": [1, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 15], "x": 15.5, "y": 0}, + + {"matrix": [0, 3], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 0], "x": 1.5, "y": 1}, + {"matrix": [0, 1], "x": 2.5, "y": 1}, + {"matrix": [0, 2], "x": 3.5, "y": 1}, + {"matrix": [0, 4], "x": 4.5, "y": 1}, + {"matrix": [0, 6], "x": 5.5, "y": 1}, + {"matrix": [0, 7], "x": 6.5, "y": 1}, + {"matrix": [0, 5], "x": 7.5, "y": 1}, + {"matrix": [0, 11], "x": 8.5, "y": 1}, + {"matrix": [0, 8], "x": 9.5, "y": 1}, + {"matrix": [0, 9], "x": 10.5, "y": 1}, + {"matrix": [0, 10], "x": 11.5, "y": 1}, + {"matrix": [0, 12], "x": 12.5, "y": 1}, + {"matrix": [0, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [0, 15], "x": 15.5, "y": 1}, + + {"matrix": [4, 3], "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, 4], "x": 4.75, "y": 2}, + {"matrix": [4, 6], "x": 5.75, "y": 2}, + {"matrix": [4, 7], "x": 6.75, "y": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 11], "x": 8.75, "y": 2}, + {"matrix": [4, 8], "x": 9.75, "y": 2}, + {"matrix": [4, 9], "x": 10.75, "y": 2}, + {"matrix": [4, 10], "x": 11.75, "y": 2}, + {"matrix": [4, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 3], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 5], "x": 7.25, "y": 3}, + {"matrix": [3, 11], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.25}, + {"matrix": [3, 13], "x": 14.5, "y": 3}, + + {"matrix": [2, 3], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [2, 7], "x": 3.75, "y": 4, "w": 6}, + {"matrix": [2, 8], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [2, 10], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [2, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [2, 14], "x": 13.5, "y": 4}, + {"matrix": [2, 13], "x": 14.5, "y": 4}, + {"matrix": [2, 15], "x": 15.5, "y": 4} + ] } } } diff --git a/keyboards/fc980c/fc980c.c b/keyboards/fc980c/fc980c.c index 744a3614a53e..fc3696f244bf 100644 --- a/keyboards/fc980c/fc980c.c +++ b/keyboards/fc980c/fc980c.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 "fc980c.h" +#include "quantum.h" #ifdef ACTUATION_DEPTH_ADJUSTMENT #include "actuation_point.h" diff --git a/keyboards/fc980c/fc980c.h b/keyboards/fc980c/fc980c.h deleted file mode 100644 index ffb02e25799f..000000000000 --- a/keyboards/fc980c/fc980c.h +++ /dev/null @@ -1,65 +0,0 @@ -/* -Copyright 2017 Balz Guenat - -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" - -/* ----------------------------------------------------------------------------------------------------------------------- -| K0D | | K2D | K5D | K3D | K6D | | K7D | K7F | K7E | K7C | | K72 | K71 | K70 | K73 | | K74 | K76 | K77 | K75 | ----------------------------------------------------------------------------------------------------------------------- ----------------------------------------------------------------------------------------------------------------------- -| K0A | K69 | K59 | K58 | K5B | K6F | K5F | K5E | K6C | K5C | K52 | K51 | K50 | K55 | | K54 | K56 | K57 | K65 | ----------------------------------------------------------------------------------------------------------------------- -| K6A | K39 | K68 | K6B | K3B | K3F | K6E | K3E | K3C | K62 | K61 | K60 | K33 | K53 | | K64 | K66 | K67 | | ----------------------------------------------------------------------------------------------------------------| K25 | -| K3A | K29 | K38 | K28 | K2B | K2F | K2E | K2C | K1C | K32 | K31 | K20 | K63 | | K24 | K26 | K27 | | ----------------------------------------------------------------------------------------------------------------------- -| K2A | K18 | K08 | K1B | K0B | K1F | K1E | K0E | K22 | K11 | K21 | K30 || K34 || K14 | K16 | K17 | | ----------------------------------------------------------------------------------------------------------------| K15 | -| K1A | K09 | K19 | K0F | K02 | K01 | K10 || K00 | K04 | K06 || K07 | K05 | | ----------------------------------------------------------------------------------------------------------------------- -*/ - -#define LAYOUT( \ - K0D, K2D, K5D, K3D, K6D, K7D, K7F, K7E, K7C, K72, K71, K70, K73, K74, K76, K77, K75, \ - K0A, K69, K59, K58, K5B, K6F, K5F, K5E, K6C, K5C, K52, K51, K50, K55, K54, K56, K57, K65, \ - K6A, K39, K68, K6B, K3B, K3F, K6E, K3E, K3C, K62, K61, K60, K33, K53, K64, K66, K67, K25, \ - K3A, K29, K38, K28, K2B, K2F, K2E, K2C, K1C, K32, K31, K20, K63, K24, K26, K27, \ - K2A, K18, K08, K1B, K0B, K1F, K1E, K0E, K22, K11, K21, K30, K34, K14, K16, K17, K15, \ - K1A, K09, K19, K0F, K02, K01, K10, K00, K04, K06, K07, K05 \ -) { \ - { K00, K01, K02, KC_NO, K04, K05, K06, K07, K08, K09, K0A, K0B, KC_NO, K0D, K0E, K0F }, \ - { K10, K11, KC_NO, KC_NO, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \ - { K20, K21, K22, KC_NO, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, KC_NO, KC_NO, KC_NO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, KC_NO, K5B, K5C, K5D, K5E, K5F }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D, K6E, K6F }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, KC_NO, KC_NO, KC_NO, KC_NO, K7C, K7D, K7E, K7F } \ -} -/* -LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \ -) -*/ - diff --git a/keyboards/fc980c/info.json b/keyboards/fc980c/info.json index 50cd3b9b27df..27a10b6f51fe 100644 --- a/keyboards/fc980c/info.json +++ b/keyboards/fc980c/info.json @@ -19,104 +19,120 @@ "layouts": { "LAYOUT": { "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":"Delete", "x":15.5, "y":0}, - {"label":"Insert", "x":16.5, "y":0}, - {"label":"Page Up", "x":17.5, "y":0}, - {"label":"Page Down", "x":18.5, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Num Lock", "x":15.5, "y":1.5}, - {"label":"/", "x":16.5, "y":1.5}, - {"label":"*", "x":17.5, "y":1.5}, - {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":2.5}, - {"label":"8", "x":16.5, "y":2.5}, - {"label":"9", "x":17.5, "y":2.5}, - {"label":"+", "x":18.5, "y":2.5, "h":2}, - {"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":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"4", "x":15.5, "y":3.5}, - {"label":"5", "x":16.5, "y":3.5}, - {"label":"6", "x":17.5, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"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":"Shift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"Up", "x":14.25, "y":4.75}, - {"label":"1", "x":15.5, "y":4.5}, - {"label":"2", "x":16.5, "y":4.5}, - {"label":"3", "x":17.5, "y":4.5}, - {"label":"Enter", "x":18.5, "y":4.5, "h":2}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5}, - {"label":"Alt", "x":2.25, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.5, "y":5.5, "w":6}, - {"label":"Alt", "x":9.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "x":10.75, "y":5.5}, - {"label":"Fn", "x":11.75, "y":5.5, "w":1.25}, - {"label":"Left", "x":13.25, "y":5.75}, - {"label":"Down", "x":14.25, "y":5.75}, - {"label":"Right", "x":15.25, "y":5.75}, - {"label":"0", "x":16.5, "y":5.5}, - {"label":".", "x":17.5, "y":5.5} + {"matrix": [0, 13], "x": 0, "y": 0}, + + {"matrix": [2, 13], "x": 2, "y": 0}, + {"matrix": [5, 13], "x": 3, "y": 0}, + {"matrix": [3, 13], "x": 4, "y": 0}, + {"matrix": [6, 13], "x": 5, "y": 0}, + + {"matrix": [7, 13], "x": 6.5, "y": 0}, + {"matrix": [7, 15], "x": 7.5, "y": 0}, + {"matrix": [7, 14], "x": 8.5, "y": 0}, + {"matrix": [7, 12], "x": 9.5, "y": 0}, + + {"matrix": [7, 2], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [7, 0], "x": 13, "y": 0}, + {"matrix": [7, 3], "x": 14, "y": 0}, + + {"matrix": [7, 4], "x": 15.5, "y": 0}, + {"matrix": [7, 6], "x": 16.5, "y": 0}, + {"matrix": [7, 7], "x": 17.5, "y": 0}, + {"matrix": [7, 5], "x": 18.5, "y": 0}, + + {"matrix": [0, 10], "x": 0, "y": 1.5}, + {"matrix": [6, 9], "x": 1, "y": 1.5}, + {"matrix": [5, 9], "x": 2, "y": 1.5}, + {"matrix": [5, 8], "x": 3, "y": 1.5}, + {"matrix": [5, 11], "x": 4, "y": 1.5}, + {"matrix": [6, 15], "x": 5, "y": 1.5}, + {"matrix": [5, 15], "x": 6, "y": 1.5}, + {"matrix": [5, 14], "x": 7, "y": 1.5}, + {"matrix": [6, 12], "x": 8, "y": 1.5}, + {"matrix": [5, 12], "x": 9, "y": 1.5}, + {"matrix": [5, 2], "x": 10, "y": 1.5}, + {"matrix": [5, 1], "x": 11, "y": 1.5}, + {"matrix": [5, 0], "x": 12, "y": 1.5}, + {"matrix": [5, 5], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [5, 4], "x": 15.5, "y": 1.5}, + {"matrix": [5, 6], "x": 16.5, "y": 1.5}, + {"matrix": [5, 7], "x": 17.5, "y": 1.5}, + {"matrix": [6, 5], "x": 18.5, "y": 1.5}, + + {"matrix": [6, 10], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 9], "x": 1.5, "y": 2.5}, + {"matrix": [6, 8], "x": 2.5, "y": 2.5}, + {"matrix": [6, 11], "x": 3.5, "y": 2.5}, + {"matrix": [3, 11], "x": 4.5, "y": 2.5}, + {"matrix": [3, 15], "x": 5.5, "y": 2.5}, + {"matrix": [6, 14], "x": 6.5, "y": 2.5}, + {"matrix": [3, 14], "x": 7.5, "y": 2.5}, + {"matrix": [3, 12], "x": 8.5, "y": 2.5}, + {"matrix": [6, 2], "x": 9.5, "y": 2.5}, + {"matrix": [6, 1], "x": 10.5, "y": 2.5}, + {"matrix": [6, 0], "x": 11.5, "y": 2.5}, + {"matrix": [3, 3], "x": 12.5, "y": 2.5}, + {"matrix": [5, 3], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [6, 4], "x": 15.5, "y": 2.5}, + {"matrix": [6, 6], "x": 16.5, "y": 2.5}, + {"matrix": [6, 7], "x": 17.5, "y": 2.5}, + {"matrix": [2, 5], "x": 18.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 10], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [2, 9], "x": 1.75, "y": 3.5}, + {"matrix": [3, 8], "x": 2.75, "y": 3.5}, + {"matrix": [2, 8], "x": 3.75, "y": 3.5}, + {"matrix": [2, 11], "x": 4.75, "y": 3.5}, + {"matrix": [2, 15], "x": 5.75, "y": 3.5}, + {"matrix": [2, 14], "x": 6.75, "y": 3.5}, + {"matrix": [2, 12], "x": 7.75, "y": 3.5}, + {"matrix": [1, 12], "x": 8.75, "y": 3.5}, + {"matrix": [3, 2], "x": 9.75, "y": 3.5}, + {"matrix": [3, 1], "x": 10.75, "y": 3.5}, + {"matrix": [2, 0], "x": 11.75, "y": 3.5}, + {"matrix": [6, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [2, 4], "x": 15.5, "y": 3.5}, + {"matrix": [2, 6], "x": 16.5, "y": 3.5}, + {"matrix": [2, 7], "x": 17.5, "y": 3.5}, + + {"matrix": [2, 10], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [1, 8], "x": 2.25, "y": 4.5}, + {"matrix": [0, 8], "x": 3.25, "y": 4.5}, + {"matrix": [1, 11], "x": 4.25, "y": 4.5}, + {"matrix": [0, 11], "x": 5.25, "y": 4.5}, + {"matrix": [1, 15], "x": 6.25, "y": 4.5}, + {"matrix": [1, 14], "x": 7.25, "y": 4.5}, + {"matrix": [0, 14], "x": 8.25, "y": 4.5}, + {"matrix": [2, 2], "x": 9.25, "y": 4.5}, + {"matrix": [1, 1], "x": 10.25, "y": 4.5}, + {"matrix": [2, 1], "x": 11.25, "y": 4.5}, + {"matrix": [3, 0], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [3, 4], "x": 14.25, "y": 4.75}, + + {"matrix": [1, 4], "x": 15.5, "y": 4.5}, + {"matrix": [1, 6], "x": 16.5, "y": 4.5}, + {"matrix": [1, 7], "x": 17.5, "y": 4.5}, + {"matrix": [1, 5], "x": 18.5, "y": 4.5, "h": 2}, + + {"matrix": [1, 10], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [0, 9], "x": 1.25, "y": 5.5}, + {"matrix": [1, 9], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [0, 15], "x": 3.5, "y": 5.5, "w": 6}, + {"matrix": [0, 2], "x": 9.5, "y": 5.5, "w": 1.25}, + {"matrix": [0, 1], "x": 10.75, "y": 5.5}, + {"matrix": [1, 0], "x": 11.75, "y": 5.5, "w": 1.25}, + + {"matrix": [0, 0], "x": 13.25, "y": 5.75}, + {"matrix": [0, 4], "x": 14.25, "y": 5.75}, + {"matrix": [0, 6], "x": 15.25, "y": 5.75}, + + {"matrix": [0, 7], "x": 16.5, "y": 5.5}, + {"matrix": [0, 5], "x": 17.5, "y": 5.5} ] } } diff --git a/keyboards/feker/ik75/ik75.c b/keyboards/feker/ik75/ik75.c index af7d12fedc2c..98b24abfe86f 100644 --- a/keyboards/feker/ik75/ik75.c +++ b/keyboards/feker/ik75/ik75.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "ik75.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/feker/ik75/ik75.h b/keyboards/feker/ik75/ik75.h deleted file mode 100644 index c4e5743bac14..000000000000 --- a/keyboards/feker/ik75/ik75.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2022 Feker - * Copyright 2022 HorrorTroll - * - * 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 XXX KC_NO - -/* - * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐ ┌───┐ - * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D │ │4F │ - * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘ └───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │ │1F │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ │2F │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │ │3E │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┤ - * │40 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4D │┌───┐│3F │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┘│4E │└───┘ - * │50 │51 │52 │56 │5C │5A │59 │┌───┼───┼───┐ - * └────┴────┴────┴────────────────────────┴───┴───┴───┘│5D │5E │5F │ - * └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, K3F, \ - K50, K51, K52, K56, K5C, K5A, K59, K5D, K5E, K5F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, XXX, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, K4E, K4F }, \ - { K50, K51, K52, XXX, XXX, XXX, K56, XXX, XXX, K59, K5A, XXX, K5C, K5D, K5E, K5F } \ -} diff --git a/keyboards/feker/ik75/info.json b/keyboards/feker/ik75/info.json index a7819048e7b6..339a5cde505e 100644 --- a/keyboards/feker/ik75/info.json +++ b/keyboards/feker/ik75/info.json @@ -26,94 +26,104 @@ "layouts": { "LAYOUT": { "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":"Delete", "x":14, "y":0}, - {"label":"Mute", "x":15.5, "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.5, "y":1.25}, + {"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}, - {"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":"End", "x":15.5, "y":2.25}, + {"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}, - {"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":"PgUp", "x":15.5, "y":3.25}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "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":1.75}, - {"label":"\u2191", "x":14.25, "y":4.5}, - {"label":"PgDn", "x":15.5, "y":4.25}, + {"matrix": [0, 13], "x": 14, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "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}, - {"label":"Fn", "x":11, "y":5.25}, - {"label":"Ctrl", "x":12, "y":5.25}, - {"label":"\u2190", "x":13.25, "y":5.5}, - {"label":"\u2193", "x":14.25, "y":5.5}, - {"label":"\u2192", "x":15.25, "y":5.5} + {"matrix": [4, 15], "x": 15.5, "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, 15], "x": 15.5, "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, 15], "x": 15.5, "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": [3, 14], "x": 15.5, "y": 3.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": 1.75}, + + {"matrix": [4, 14], "x": 14.25, "y": 4.5}, + + {"matrix": [3, 15], "x": 15.5, "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, 12], "x": 10, "y": 5.25}, + {"matrix": [5, 10], "x": 11, "y": 5.25}, + {"matrix": [5, 9], "x": 12, "y": 5.25}, + + {"matrix": [5, 13], "x": 13.25, "y": 5.5}, + {"matrix": [5, 14], "x": 14.25, "y": 5.5}, + {"matrix": [5, 15], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/ffkeebs/siris/info.json b/keyboards/ffkeebs/siris/info.json index c5449eab0beb..6a1347cdf618 100644 --- a/keyboards/ffkeebs/siris/info.json +++ b/keyboards/ffkeebs/siris/info.json @@ -24,66 +24,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0.375}, - {"label":"0,1", "x":1, "y":0.375}, - {"label":"0,2", "x":2, "y":0.125}, - {"label":"0,3", "x":3, "y":0}, - {"label":"0,4", "x":4, "y":0.125}, - {"label":"0,5", "x":5, "y":0.25}, - {"label":"0,6", "x":10, "y":0.25}, - {"label":"0,7", "x":11, "y":0.125}, - {"label":"0,8", "x":12, "y":0}, - {"label":"0,9", "x":13, "y":0.125}, - {"label":"0,10", "x":14, "y":0.375}, - {"label":"0,11", "x":15, "y":0.375}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"label":"1,0", "x":0, "y":1.375}, - {"label":"1,1", "x":1, "y":1.375}, - {"label":"1,2", "x":2, "y":1.125}, - {"label":"1,3", "x":3, "y":1}, - {"label":"1,4", "x":4, "y":1.125}, - {"label":"1,5", "x":5, "y":1.25}, - {"label":"1,6", "x":10, "y":1.25}, - {"label":"1,7", "x":11, "y":1.125}, - {"label":"1,8", "x":12, "y":1}, - {"label":"1,9", "x":13, "y":1.125}, - {"label":"1,10", "x":14, "y":1.375}, - {"label":"1,11", "x":15, "y":1.375}, + {"matrix": [0, 6], "x": 10, "y": 0.25}, + {"matrix": [0, 7], "x": 11, "y": 0.125}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0.125}, + {"matrix": [0, 10], "x": 14, "y": 0.375}, + {"matrix": [0, 11], "x": 15, "y": 0.375}, - {"label":"2,0", "x":0, "y":2.375}, - {"label":"2,1", "x":1, "y":2.375}, - {"label":"2,2", "x":2, "y":2.125}, - {"label":"2,3", "x":3, "y":2}, - {"label":"2,4", "x":4, "y":2.125}, - {"label":"2,5", "x":5, "y":2.25}, - {"label":"4,5", "x":6.25, "y":2.625}, - {"label":"4,6", "x":8.75, "y":2.625}, - {"label":"2,6", "x":10, "y":2.25}, - {"label":"2,7", "x":11, "y":2.125}, - {"label":"2,8", "x":12, "y":2}, - {"label":"2,9", "x":13, "y":2.125}, - {"label":"2,10", "x":14, "y":2.375}, - {"label":"2,11", "x":15, "y":2.375}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"label":"3,0", "x":0, "y":3.375}, - {"label":"3,1", "x":1, "y":3.375}, - {"label":"3,2", "x":2, "y":3.125}, - {"label":"3,3", "x":3, "y":3}, - {"label":"3,4", "x":4, "y":3.125}, - {"label":"3,5", "x":5, "y":3.25}, - {"label":"3,6", "x":10, "y":3.25}, - {"label":"3,7", "x":11, "y":3.125}, - {"label":"3,8", "x":12, "y":3}, - {"label":"3,9", "x":13, "y":3.125}, - {"label":"3,10", "x":14, "y":3.375}, - {"label":"3,11", "x":15, "y":3.375}, + {"matrix": [1, 6], "x": 10, "y": 1.25}, + {"matrix": [1, 7], "x": 11, "y": 1.125}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [1, 9], "x": 13, "y": 1.125}, + {"matrix": [1, 10], "x": 14, "y": 1.375}, + {"matrix": [1, 11], "x": 15, "y": 1.375}, - {"label":"4,2", "x":3.75, "y":4.15}, - {"label":"4,3", "x":4.75, "y":4.25}, - {"x":6, "y":4.5, "w":1.5}, - {"x":8.5, "y":4.5, "w":1.5}, - {"label":"4,8", "x":10.25, "y":4.25}, - {"label":"4,0", "x":11.25, "y":4.15} + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [4, 5], "x": 6.25, "y": 2.625}, + + {"matrix": [4, 6], "x": 8.75, "y": 2.625}, + {"matrix": [2, 6], "x": 10, "y": 2.25}, + {"matrix": [2, 7], "x": 11, "y": 2.125}, + {"matrix": [2, 8], "x": 12, "y": 2}, + {"matrix": [2, 9], "x": 13, "y": 2.125}, + {"matrix": [2, 10], "x": 14, "y": 2.375}, + {"matrix": [2, 11], "x": 15, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [3, 6], "x": 10, "y": 3.25}, + {"matrix": [3, 7], "x": 11, "y": 3.125}, + {"matrix": [3, 8], "x": 12, "y": 3}, + {"matrix": [3, 9], "x": 13, "y": 3.125}, + {"matrix": [3, 10], "x": 14, "y": 3.375}, + {"matrix": [3, 11], "x": 15, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.75, "y": 4.15}, + {"matrix": [4, 3], "x": 4.75, "y": 4.25}, + + {"matrix": [4, 4], "x": 6, "y": 4.5, "w": 1.5}, + + {"matrix": [4, 7], "x": 8.5, "y": 4.5, "w": 1.5}, + + {"matrix": [4, 8], "x": 10.25, "y": 4.25}, + {"matrix": [4, 9], "x": 11.25, "y": 4.15} ] } } diff --git a/keyboards/ffkeebs/siris/siris.h b/keyboards/ffkeebs/siris/siris.h deleted file mode 100644 index 13956bcceb5a..000000000000 --- a/keyboards/ffkeebs/siris/siris.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2021 Swiftrax - -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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - 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, K45, K46, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, \ - K42, K43, K44, K47, K48, K49 \ -) { \ - { 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 }, \ - { XXX, XXX, K42, K43, K44, K45, K46, K47, K48, K49, XXX, XXX } \ -} diff --git a/keyboards/fluorite/fluorite.h b/keyboards/fluorite/fluorite.h deleted file mode 100644 index 75691c0adf04..000000000000 --- a/keyboards/fluorite/fluorite.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2019 Mafuyu Ihotsuno - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ -L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28, \ -L30, L31, L32, L33, L34, L35, L36, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R38, \ -L40, L41, L42, L43, L44, L45, L46, L47, L48, R40, R41, R42, R43, R44, R45, R46, R47, R48, \ -L50, L51, L52, L53, L54, L55, L56, L57, L58, R50, R51, R52, R53, R54, R55, R56, R57, R58, \ -L60, L61, L62, L63, L64, L65, L66, L67, L68, R60, R61, R62, R63, R64, R65, R66, R67, R68, \ -L70, L71, L72, L73, L74, L75, L76, L77, L78, R70, R71, R72, R73, R74, R75, R76, R77, R78 \ -) \ -{ \ - { KC_NO, L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { KC_NO, L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47, L48 }, \ - { L50, L51, L52, L53, L54, L55, L56, L57, L58 }, \ - { L60, L61, L62, L63, L64, L65, L66, L67, L68 }, \ - { L70, L71, L72, L73, L74, L75, L76, L77, L78 }, \ - { KC_NO, R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { KC_NO, R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R28, R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R38, R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { R48, R47, R46, R45, R44, R43, R42, R41, R40 }, \ - { R58, R57, R56, R55, R54, R53, R52, R51, R50 }, \ - { R68, R67, R66, R65, R64, R63, R62, R61, R60 }, \ - { R78, R77, R76, R75, R74, R73, R72, R71, R70 }, \ -} diff --git a/keyboards/fluorite/info.json b/keyboards/fluorite/info.json index b36190bef161..bdc94b3eb945 100644 --- a/keyboards/fluorite/info.json +++ b/keyboards/fluorite/info.json @@ -21,153 +21,146 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F1", "x":3.5, "y":0}, - {"label":"F2", "x":4.5, "y":0}, - {"label":"F3", "x":5.5, "y":0}, - {"label":"F4", "x":6.5, "y":0}, - {"label":"Print Screen", "x":7.5, "y":1}, - {"label":"*", "x":8.5, "y":1}, - {"label":"/", "x":9.5, "y":1}, - {"label":"0", "x":10.5, "y":1}, - {"label":"Num Lock", "x":12.5, "y":1}, - {"label":"/", "x":13.5, "y":1}, - {"label":"*", "x":14.5, "y":1}, - {"label":"Backspace", "x":15.5, "y":1}, - {"label":"F1", "x":16.5, "y":0}, - {"label":"F2", "x":17.5, "y":0}, - {"label":"F3", "x":18.5, "y":0}, - {"label":"F4", "x":19.5, "y":0}, - - {"label":"F5", "x":3.25, "y":1}, - {"label":"F6", "x":4.25, "y":1}, - {"label":"F7", "x":5.25, "y":1}, - {"label":"F8", "x":6.25, "y":1}, - {"label":"-", "x":7.5, "y":2}, - {"label":"7", "x":8.5, "y":2}, - {"label":"8", "x":9.5, "y":2}, - {"label":"9", "x":10.5, "y":2}, - {"label":"7", "x":12.5, "y":2}, - {"label":"8", "x":13.5, "y":2}, - {"label":"9", "x":14.5, "y":2}, - {"label":"-", "x":15.5, "y":2}, - {"label":"F5", "x":16.75, "y":1}, - {"label":"F6", "x":17.75, "y":1}, - {"label":"F7", "x":18.75, "y":1}, - {"label":"F8", "x":19.75, "y":1}, - - {"label":"GUI", "x":1.5, "y":2}, - {"label":"F9", "x":3, "y":2}, - {"label":"F10", "x":4, "y":2}, - {"label":"F11", "x":5, "y":2}, - {"label":"F12", "x":6, "y":2}, - {"label":"+", "x":7.5, "y":3}, - {"label":"4", "x":8.5, "y":3}, - {"label":"5", "x":9.5, "y":3}, - {"label":"6", "x":10.5, "y":3}, - {"label":"4", "x":12.5, "y":3}, - {"label":"5", "x":13.5, "y":3}, - {"label":"6", "x":14.5, "y":3}, - {"label":"+", "x":15.5, "y":3}, - {"label":"F9", "x":17, "y":2}, - {"label":"F10", "x":18, "y":2}, - {"label":"F11", "x":19, "y":2}, - {"label":"F12", "x":20, "y":2}, - {"label":"GUI", "x":21.5, "y":2}, - - {"label":"1", "x":1.5, "y":3}, - {"label":"2", "x":2.5, "y":3}, - {"label":"3", "x":3.5, "y":3}, - {"label":"4", "x":4.5, "y":3}, - {"label":"5", "x":5.5, "y":3}, - {"label":"Esc", "x":7.5, "y":4}, - {"label":"1", "x":8.5, "y":4}, - {"label":"2", "x":9.5, "y":4}, - {"label":"3", "x":10.5, "y":4}, - {"label":"1", "x":12.5, "y":4}, - {"label":"2", "x":13.5, "y":4}, - {"label":"3", "x":14.5, "y":4}, - {"label":"Tab", "x":15.5, "y":4}, - {"label":"6", "x":17.5, "y":3}, - {"label":"7", "x":18.5, "y":3}, - {"label":"8", "x":19.5, "y":3}, - {"label":"9", "x":20.5, "y":3}, - {"label":"0", "x":21.5, "y":3}, - - {"label":"Q", "x":1.75, "y":4}, - {"label":"W", "x":2.75, "y":4}, - {"label":"E", "x":3.75, "y":4}, - {"label":"R", "x":4.75, "y":4}, - {"label":"T", "x":5.75, "y":4}, - {"label":"Backspace", "x":7.5, "y":5}, - {"label":"Y", "x":8.5, "y":5}, - {"label":"Insert", "x":9.5, "y":5}, - {"label":".", "x":10.5, "y":5}, - {"label":"0", "x":12.5, "y":5}, - {"label":".", "x":13.5, "y":5}, - {"label":"Page Up", "x":14.5, "y":5}, - {"label":"Home", "x":15.5, "y":5}, - {"label":"Y", "x":17.25, "y":4}, - {"label":"U", "x":18.25, "y":4}, - {"label":"I", "x":19.25, "y":4}, - {"label":"O", "x":20.25, "y":4}, - {"label":"P", "x":21.25, "y":4}, - - {"label":"A", "x":2, "y":5}, - {"label":"S", "x":3, "y":5}, - {"label":"D", "x":4, "y":5}, - {"label":"F", "x":5, "y":5}, - {"label":"G", "x":6, "y":5}, - {"label":"Delete", "x":7.5, "y":6}, - {"label":"N", "x":8.5, "y":6}, - {"label":"Up", "x":9.5, "y":6}, - {"label":"PEnter", "x":10.5, "y":6}, - {"label":"PEnter", "x":12.5, "y":6}, - {"label":"Up", "x":13.5, "y":6}, - {"label":"Page Down", "x":14.5, "y":6}, - {"label":"End", "x":15.5, "y":6}, - {"label":"H", "x":17, "y":5}, - {"label":"J", "x":18, "y":5}, - {"label":"K", "x":19, "y":5}, - {"label":"L", "x":20, "y":5}, - {"label":"-", "x":21, "y":5}, - - {"label":"Z", "x":2.25, "y":6}, - {"label":"X", "x":3.25, "y":6}, - {"label":"C", "x":4.25, "y":6}, - {"label":"V", "x":5.25, "y":6}, - {"label":"B", "x":6.25, "y":6}, - {"label":"Shift", "x":7.25, "y":7, "w":1.25}, - {"label":"Left", "x":8.5, "y":7}, - {"label":"Down", "x":9.5, "y":7}, - {"label":"Right", "x":10.5, "y":7}, - {"label":"Left", "x":12.5, "y":7}, - {"label":"Down", "x":13.5, "y":7}, - {"label":"Right", "x":14.5, "y":7}, - {"label":"Shift", "x":15.5, "y":7, "w":1.25}, - {"label":"N", "x":16.75, "y":6}, - {"label":"M", "x":17.75, "y":6}, - {"label":",", "x":18.75, "y":6}, - {"label":".", "x":19.75, "y":6}, - {"label":"/", "x":20.75, "y":6}, - - {"label":"`", "x":0.25, "y":3}, - {"label":"Tab", "x":0.25, "y":4, "w":1.5}, - {"label":"Shift", "x":0.5, "y":5, "w":1.5}, - {"label":"Ctrl", "x":1, "y":6}, - {"label":"TT(3)", "x":0, "y":6}, - {"label":"Space", "x":4.625, "y":7, "w":1.25}, - {"label":"MO(1)", "x":5.875, "y":7}, - {"label":"Ctrl", "x":9.25, "y":8, "w":1.25}, - {"label":"Alt", "x":10.5, "y":8}, - {"label":"Alt", "x":12.5, "y":8}, - {"label":"Ctrl", "x":13.5, "y":8, "w":1.25}, - {"label":"MO(2)", "x":17.125, "y":7}, - {"label":"Enter", "x":18.125, "y":7, "w":1.25}, - {"label":"Esc", "x":23, "y":6}, - {"label":"Menu", "x":22, "y":6}, - {"label":"\"", "x":22, "y":5, "w":1.5}, - {"label":"=", "x":22.25, "y":4, "w":1.5}, - {"label":"Backspace", "x":22.5, "y":3, "w":1.5} + {"matrix": [0, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [0, 3], "x": 5.5, "y": 0}, + {"matrix": [0, 4], "x": 6.5, "y": 0}, + {"matrix": [0, 5], "x": 7.5, "y": 1}, + {"matrix": [0, 6], "x": 8.5, "y": 1}, + {"matrix": [0, 7], "x": 9.5, "y": 1}, + {"matrix": [0, 8], "x": 10.5, "y": 1}, + {"matrix": [8, 8], "x": 12.5, "y": 1}, + {"matrix": [8, 7], "x": 13.5, "y": 1}, + {"matrix": [8, 6], "x": 14.5, "y": 1}, + {"matrix": [8, 5], "x": 15.5, "y": 1}, + {"matrix": [8, 4], "x": 16.5, "y": 0}, + {"matrix": [8, 3], "x": 17.5, "y": 0}, + {"matrix": [8, 2], "x": 18.5, "y": 0}, + {"matrix": [8, 1], "x": 19.5, "y": 0}, + {"matrix": [1, 1], "x": 3.25, "y": 1}, + {"matrix": [1, 2], "x": 4.25, "y": 1}, + {"matrix": [1, 3], "x": 5.25, "y": 1}, + {"matrix": [1, 4], "x": 6.25, "y": 1}, + {"matrix": [1, 5], "x": 7.5, "y": 2}, + {"matrix": [1, 6], "x": 8.5, "y": 2}, + {"matrix": [1, 7], "x": 9.5, "y": 2}, + {"matrix": [1, 8], "x": 10.5, "y": 2}, + {"matrix": [9, 8], "x": 12.5, "y": 2}, + {"matrix": [9, 7], "x": 13.5, "y": 2}, + {"matrix": [9, 6], "x": 14.5, "y": 2}, + {"matrix": [9, 5], "x": 15.5, "y": 2}, + {"matrix": [9, 4], "x": 16.75, "y": 1}, + {"matrix": [9, 3], "x": 17.75, "y": 1}, + {"matrix": [9, 2], "x": 18.75, "y": 1}, + {"matrix": [9, 1], "x": 19.75, "y": 1}, + {"matrix": [2, 0], "x": 1.5, "y": 2}, + {"matrix": [2, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 3], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 6, "y": 2}, + {"matrix": [2, 5], "x": 7.5, "y": 3}, + {"matrix": [2, 6], "x": 8.5, "y": 3}, + {"matrix": [2, 7], "x": 9.5, "y": 3}, + {"matrix": [2, 8], "x": 10.5, "y": 3}, + {"matrix": [10, 8], "x": 12.5, "y": 3}, + {"matrix": [10, 7], "x": 13.5, "y": 3}, + {"matrix": [10, 6], "x": 14.5, "y": 3}, + {"matrix": [10, 5], "x": 15.5, "y": 3}, + {"matrix": [10, 4], "x": 17, "y": 2}, + {"matrix": [10, 3], "x": 18, "y": 2}, + {"matrix": [10, 2], "x": 19, "y": 2}, + {"matrix": [10, 1], "x": 20, "y": 2}, + {"matrix": [10, 0], "x": 21.5, "y": 2}, + {"matrix": [3, 0], "x": 1.5, "y": 3}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 4}, + {"matrix": [3, 6], "x": 8.5, "y": 4}, + {"matrix": [3, 7], "x": 9.5, "y": 4}, + {"matrix": [3, 8], "x": 10.5, "y": 4}, + {"matrix": [11, 8], "x": 12.5, "y": 4}, + {"matrix": [11, 7], "x": 13.5, "y": 4}, + {"matrix": [11, 6], "x": 14.5, "y": 4}, + {"matrix": [11, 5], "x": 15.5, "y": 4}, + {"matrix": [11, 4], "x": 17.5, "y": 3}, + {"matrix": [11, 3], "x": 18.5, "y": 3}, + {"matrix": [11, 2], "x": 19.5, "y": 3}, + {"matrix": [11, 1], "x": 20.5, "y": 3}, + {"matrix": [11, 0], "x": 21.5, "y": 3}, + {"matrix": [4, 0], "x": 1.75, "y": 4}, + {"matrix": [4, 1], "x": 2.75, "y": 4}, + {"matrix": [4, 2], "x": 3.75, "y": 4}, + {"matrix": [4, 3], "x": 4.75, "y": 4}, + {"matrix": [4, 4], "x": 5.75, "y": 4}, + {"matrix": [4, 5], "x": 7.5, "y": 5}, + {"matrix": [4, 6], "x": 8.5, "y": 5}, + {"matrix": [4, 7], "x": 9.5, "y": 5}, + {"matrix": [4, 8], "x": 10.5, "y": 5}, + {"matrix": [12, 8], "x": 12.5, "y": 5}, + {"matrix": [12, 7], "x": 13.5, "y": 5}, + {"matrix": [12, 6], "x": 14.5, "y": 5}, + {"matrix": [12, 5], "x": 15.5, "y": 5}, + {"matrix": [12, 4], "x": 17.25, "y": 4}, + {"matrix": [12, 3], "x": 18.25, "y": 4}, + {"matrix": [12, 2], "x": 19.25, "y": 4}, + {"matrix": [12, 1], "x": 20.25, "y": 4}, + {"matrix": [12, 0], "x": 21.25, "y": 4}, + {"matrix": [5, 0], "x": 2, "y": 5}, + {"matrix": [5, 1], "x": 3, "y": 5}, + {"matrix": [5, 2], "x": 4, "y": 5}, + {"matrix": [5, 3], "x": 5, "y": 5}, + {"matrix": [5, 4], "x": 6, "y": 5}, + {"matrix": [5, 5], "x": 7.5, "y": 6}, + {"matrix": [5, 6], "x": 8.5, "y": 6}, + {"matrix": [5, 7], "x": 9.5, "y": 6}, + {"matrix": [5, 8], "x": 10.5, "y": 6}, + {"matrix": [13, 8], "x": 12.5, "y": 6}, + {"matrix": [13, 7], "x": 13.5, "y": 6}, + {"matrix": [13, 6], "x": 14.5, "y": 6}, + {"matrix": [13, 5], "x": 15.5, "y": 6}, + {"matrix": [13, 4], "x": 17, "y": 5}, + {"matrix": [13, 3], "x": 18, "y": 5}, + {"matrix": [13, 2], "x": 19, "y": 5}, + {"matrix": [13, 1], "x": 20, "y": 5}, + {"matrix": [13, 0], "x": 21, "y": 5}, + {"matrix": [6, 0], "x": 2.25, "y": 6}, + {"matrix": [6, 1], "x": 3.25, "y": 6}, + {"matrix": [6, 2], "x": 4.25, "y": 6}, + {"matrix": [6, 3], "x": 5.25, "y": 6}, + {"matrix": [6, 4], "x": 6.25, "y": 6}, + {"matrix": [6, 5], "x": 7.25, "y": 7, "w": 1.25}, + {"matrix": [6, 6], "x": 8.5, "y": 7}, + {"matrix": [6, 7], "x": 9.5, "y": 7}, + {"matrix": [6, 8], "x": 10.5, "y": 7}, + {"matrix": [14, 8], "x": 12.5, "y": 7}, + {"matrix": [14, 7], "x": 13.5, "y": 7}, + {"matrix": [14, 6], "x": 14.5, "y": 7}, + {"matrix": [14, 5], "x": 15.5, "y": 7, "w": 1.25}, + {"matrix": [14, 4], "x": 16.75, "y": 6}, + {"matrix": [14, 3], "x": 17.75, "y": 6}, + {"matrix": [14, 2], "x": 18.75, "y": 6}, + {"matrix": [14, 1], "x": 19.75, "y": 6}, + {"matrix": [14, 0], "x": 20.75, "y": 6}, + {"matrix": [7, 0], "x": 0.25, "y": 3}, + {"matrix": [7, 1], "x": 0.25, "y": 4, "w": 1.5}, + {"matrix": [7, 2], "x": 0.5, "y": 5, "w": 1.5}, + {"matrix": [7, 3], "x": 1, "y": 6}, + {"matrix": [7, 4], "x": 0, "y": 6}, + {"matrix": [7, 5], "x": 4.625, "y": 7, "w": 1.25}, + {"matrix": [7, 6], "x": 5.875, "y": 7}, + {"matrix": [7, 7], "x": 9.25, "y": 8, "w": 1.25}, + {"matrix": [7, 8], "x": 10.5, "y": 8}, + {"matrix": [15, 8], "x": 12.5, "y": 8}, + {"matrix": [15, 7], "x": 13.5, "y": 8, "w": 1.25}, + {"matrix": [15, 6], "x": 17.125, "y": 7}, + {"matrix": [15, 5], "x": 18.125, "y": 7, "w": 1.25}, + {"matrix": [15, 4], "x": 23, "y": 6}, + {"matrix": [15, 3], "x": 22, "y": 6}, + {"matrix": [15, 2], "x": 22, "y": 5, "w": 1.5}, + {"matrix": [15, 1], "x": 22.25, "y": 4, "w": 1.5}, + {"matrix": [15, 0], "x": 22.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/flx/virgo/info.json b/keyboards/flx/virgo/info.json index 3a022fcf376f..f7ce7724825e 100644 --- a/keyboards/flx/virgo/info.json +++ b/keyboards/flx/virgo/info.json @@ -25,97 +25,116 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C6,F0)", "x":0, "y":0}, - {"label":"K01 (C6,F1)", "x":1.5, "y":0}, - {"label":"K11 (B6,F1)", "x":2.5, "y":0}, - {"label":"K02 (C6,F4)", "x":3.5, "y":0}, - {"label":"K12 (B6,F4)", "x":4.5, "y":0}, - {"label":"K03 (C6,F5)", "x":6, "y":0}, - {"label":"K13 (B6,F5)", "x":9, "y":0}, - {"label":"K04 (C6,F6)", "x":10, "y":0}, - {"label":"K14 (B6,F6)", "x":11, "y":0}, - {"label":"K05 (C6,F7)", "x":12.5, "y":0}, - {"label":"K15 (B6,F7)", "x":13.5, "y":0}, - {"label":"K06 (C6,C7)", "x":14.5, "y":0}, - {"label":"K16 (B6,C7)", "x":15.5, "y":0}, - {"label":"K07 (C6,B0)", "x":17.25, "y":0}, - {"label":"K17 (B6,B0)", "x":18.25, "y":0}, - {"label":"K08 (C6,B1)", "x":19.25, "y":0}, - {"label":"K20 (B5,F0)", "x":0, "y":1.25}, - {"label":"K30 (B4,F0)", "x":1, "y":1.25}, - {"label":"K21 (B5,F1)", "x":2, "y":1.25}, - {"label":"K31 (B4,F1)", "x":3, "y":1.25}, - {"label":"K22 (B5,F4)", "x":4, "y":1.25}, - {"label":"K32 (B4,F4)", "x":5, "y":1.25}, - {"label":"K23 (B5,F5)", "x":6, "y":1.25}, - {"label":"K33 (B4,F5)", "x":9, "y":1.25}, - {"label":"K24 (B5,F6)", "x":10, "y":1.25}, - {"label":"K34 (B4,F6)", "x":11, "y":1.25}, - {"label":"K25 (B5,F7)", "x":12, "y":1.25}, - {"label":"K35 (B4,F7)", "x":13, "y":1.25}, - {"label":"K26 (B5,C7)", "x":14, "y":1.25}, - {"label":"K36 (B4,C7)", "x":15, "y":1.25}, - {"label":"K66 (D4,C7)", "x":16, "y":1.25}, - {"label":"K27 (B5,B0)", "x":17.25, "y":1.25}, - {"label":"K37 (B4,B0)", "x":18.25, "y":1.25}, - {"label":"K28 (B5,B1)", "x":19.25, "y":1.25}, - {"label":"K40 (D7,F0)", "x":0, "y":2.25, "w":1.5}, - {"label":"K50 (D6,F0)", "x":1.5, "y":2.25}, - {"label":"K41 (D7,F1)", "x":2.5, "y":2.25}, - {"label":"K51 (D6,F1)", "x":3.5, "y":2.25}, - {"label":"K42 (D7,F4)", "x":4.5, "y":2.25}, - {"label":"K52 (D6,F4)", "x":5.5, "y":2.25}, - {"label":"K43 (D7,F5)", "x":8.5, "y":2.25}, - {"label":"K53 (D6,F5)", "x":9.5, "y":2.25}, - {"label":"K44 (D7,F6)", "x":10.5, "y":2.25}, - {"label":"K54 (D6,F6)", "x":11.5, "y":2.25}, - {"label":"K45 (D7,F7)", "x":12.5, "y":2.25}, - {"label":"K55 (D6,F7)", "x":13.5, "y":2.25}, - {"label":"K46 (D7,C7)", "x":14.5, "y":2.25}, - {"label":"K56 (D6,C7)", "x":15.5, "y":2.25, "w":1.5}, - {"label":"K47 (D7,B0)", "x":17.25, "y":2.25}, - {"label":"K57 (D6,B0)", "x":18.25, "y":2.25}, - {"label":"K48 (D7,B1)", "x":19.25, "y":2.25}, - {"label":"K60 (D4,F0)", "x":0, "y":3.25, "w":1.75}, - {"label":"K70 (D5,F0)", "x":1.75, "y":3.25}, - {"label":"K61 (D4,F1)", "x":2.75, "y":3.25}, - {"label":"K71 (D5,F1)", "x":3.75, "y":3.25}, - {"label":"K62 (D4,F4)", "x":4.75, "y":3.25}, - {"label":"K72 (D5,F4)", "x":5.75, "y":3.25}, - {"label":"K63 (D4,F5)", "x":8.75, "y":3.25}, - {"label":"K73 (D5,F5)", "x":9.75, "y":3.25}, - {"label":"K64 (D4,F6)", "x":10.75, "y":3.25}, - {"label":"K74 (D5,F6)", "x":11.75, "y":3.25}, - {"label":"K65 (D4,F7)", "x":12.75, "y":3.25}, - {"label":"K75 (D5,F7)", "x":13.75, "y":3.25}, - {"label":"K76 (D5,C7)", "x":14.75, "y":3.25, "w":2.25}, - {"label":"K80 (D3,F0)", "x":0, "y":4.25, "w":1.25}, - {"label":"K90 (D2,F0)", "x":1.25, "y":4.25}, - {"label":"K81 (D3,F1)", "x":2.25, "y":4.25}, - {"label":"K91 (D2,F1)", "x":3.25, "y":4.25}, - {"label":"K82 (D3,F4)", "x":4.25, "y":4.25}, - {"label":"K92 (D2,F4)", "x":5.25, "y":4.25}, - {"label":"K83 (D3,F5)", "x":6.25, "y":4.25}, - {"label":"KA3 (D1,F5)", "x":8.25, "y":4.25}, - {"label":"K93 (D2,F5)", "x":9.25, "y":4.25}, - {"label":"K84 (D3,F6)", "x":10.25, "y":4.25}, - {"label":"K94 (D2,F6)", "x":11.25, "y":4.25}, - {"label":"K85 (D3,F7)", "x":12.25, "y":4.25}, - {"label":"K95 (D2,F7)", "x":13.25, "y":4.25}, - {"label":"K86 (D3,C7)", "x":14.25, "y":4.25, "w":1.75}, - {"label":"K96 (D2,C7)", "x":16, "y":4.25}, - {"label":"K97 (D2,B0)", "x":18.25, "y":4.25}, - {"label":"KA0 (D1,F0)", "x":0, "y":5.25, "w":1.5}, - {"label":"KB0 (D0,F0)", "x":2.5, "y":5.25, "w":1.5}, - {"label":"KA1 (D1,F1)", "x":4, "y":5.25}, - {"label":"KB2 (D0,F4)", "x":5, "y":5.25, "w":2.25}, - {"label":"KB4 (D0,F6)", "x":8.25, "y":5.25, "w":2.75}, - {"label":"KB5 (D0,F7)", "x":11, "y":5.25}, - {"label":"KA6 (D1,C7)", "x":12, "y":5.25, "w":1.5}, - {"label":"KB6 (D0,C7)", "x":14.5, "y":5.25, "w":1.5}, - {"label":"KA7 (D1,B0)", "x":17.25, "y":5.25}, - {"label":"KB7 (D0,B0)", "x":18.25, "y":5.25}, - {"label":"KA8 (D1,B1)", "x":19.25, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [1, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [1, 2], "x": 4.5, "y": 0}, + + {"matrix": [0, 3], "x": 6, "y": 0}, + + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [0, 4], "x": 10, "y": 0}, + {"matrix": [1, 4], "x": 11, "y": 0}, + + {"matrix": [0, 5], "x": 12.5, "y": 0}, + {"matrix": [1, 5], "x": 13.5, "y": 0}, + {"matrix": [0, 6], "x": 14.5, "y": 0}, + {"matrix": [1, 6], "x": 15.5, "y": 0}, + + {"matrix": [0, 7], "x": 17.25, "y": 0}, + {"matrix": [1, 7], "x": 18.25, "y": 0}, + {"matrix": [0, 8], "x": 19.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + + {"matrix": [3, 3], "x": 9, "y": 1.25}, + {"matrix": [2, 4], "x": 10, "y": 1.25}, + {"matrix": [3, 4], "x": 11, "y": 1.25}, + {"matrix": [2, 5], "x": 12, "y": 1.25}, + {"matrix": [3, 5], "x": 13, "y": 1.25}, + {"matrix": [2, 6], "x": 14, "y": 1.25}, + {"matrix": [3, 6], "x": 15, "y": 1.25}, + {"matrix": [6, 6], "x": 16, "y": 1.25}, + + {"matrix": [2, 7], "x": 17.25, "y": 1.25}, + {"matrix": [3, 7], "x": 18.25, "y": 1.25}, + {"matrix": [2, 8], "x": 19.25, "y": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + + {"matrix": [4, 3], "x": 8.5, "y": 2.25}, + {"matrix": [5, 3], "x": 9.5, "y": 2.25}, + {"matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"matrix": [5, 4], "x": 11.5, "y": 2.25}, + {"matrix": [4, 5], "x": 12.5, "y": 2.25}, + {"matrix": [5, 5], "x": 13.5, "y": 2.25}, + {"matrix": [4, 6], "x": 14.5, "y": 2.25}, + {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5}, + + {"matrix": [4, 7], "x": 17.25, "y": 2.25}, + {"matrix": [5, 7], "x": 18.25, "y": 2.25}, + {"matrix": [4, 8], "x": 19.25, "y": 2.25}, + + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + + {"matrix": [6, 3], "x": 8.75, "y": 3.25}, + {"matrix": [7, 3], "x": 9.75, "y": 3.25}, + {"matrix": [6, 4], "x": 10.75, "y": 3.25}, + {"matrix": [7, 4], "x": 11.75, "y": 3.25}, + {"matrix": [6, 5], "x": 12.75, "y": 3.25}, + {"matrix": [7, 5], "x": 13.75, "y": 3.25}, + {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4.25}, + {"matrix": [9, 1], "x": 3.25, "y": 4.25}, + {"matrix": [8, 2], "x": 4.25, "y": 4.25}, + {"matrix": [9, 2], "x": 5.25, "y": 4.25}, + {"matrix": [8, 3], "x": 6.25, "y": 4.25}, + + {"matrix": [10, 3], "x": 8.25, "y": 4.25}, + {"matrix": [9, 3], "x": 9.25, "y": 4.25}, + {"matrix": [8, 4], "x": 10.25, "y": 4.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4.25}, + {"matrix": [8, 5], "x": 12.25, "y": 4.25}, + {"matrix": [9, 5], "x": 13.25, "y": 4.25}, + {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75}, + {"matrix": [9, 6], "x": 16, "y": 4.25}, + + {"matrix": [9, 7], "x": 18.25, "y": 4.25}, + + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [10, 1], "x": 4, "y": 5.25}, + {"matrix": [11, 2], "x": 5, "y": 5.25, "w": 2.25}, + + {"matrix": [11, 4], "x": 8.25, "y": 5.25, "w": 2.75}, + {"matrix": [11, 5], "x": 11, "y": 5.25}, + {"matrix": [10, 6], "x": 12, "y": 5.25, "w": 1.5}, + {"matrix": [11, 6], "x": 14.5, "y": 5.25, "w": 1.5}, + + {"matrix": [10, 7], "x": 17.25, "y": 5.25}, + {"matrix": [11, 7], "x": 18.25, "y": 5.25}, + {"matrix": [10, 8], "x": 19.25, "y": 5.25} ] } } diff --git a/keyboards/flx/virgo/virgo.c b/keyboards/flx/virgo/virgo.c index 679f90fb6651..5260e153223d 100644 --- a/keyboards/flx/virgo/virgo.c +++ b/keyboards/flx/virgo/virgo.c @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "virgo.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/flx/virgo/virgo.h b/keyboards/flx/virgo/virgo.h deleted file mode 100644 index fcfcac50e4b5..000000000000 --- a/keyboards/flx/virgo/virgo.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 MechMerlin - * Edits etc 2020 Flexerm - * - * 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( \ - K00, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K66, K27, K37, K28, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K57, K48, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \ - K80, K90, K81, K91, K82, K92, K83, KA3, K93, K84, K94, K85, K95, K86, K96, K97, \ - KA0, KB0, KA1, KB2, KB4, KB5, KA6, KB6, KA7, KB7, KA8 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, K17, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, KC_NO, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, K86, KC_NO, KC_NO }, \ - { K90, K91, K92, K93, K94, K95, K96, K97, KC_NO }, \ - { KA0, KA1, KC_NO, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \ - { KB0, KC_NO, KB2, KC_NO, KB4, KB5, KB6, KB7, KC_NO }, \ -} - diff --git a/keyboards/flxlb/zplit/info.json b/keyboards/flxlb/zplit/info.json index 544bd4e3854c..a2c27492cf49 100644 --- a/keyboards/flxlb/zplit/info.json +++ b/keyboards/flxlb/zplit/info.json @@ -29,57 +29,57 @@ "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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": [4, 5], "x": 7, "y": 0}, + {"matrix": [4, 4], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 12, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [5, 5], "x": 7, "y": 1}, + {"matrix": [5, 4], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 0], "x": 12, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [6, 5], "x": 7, "y": 2}, + {"matrix": [6, 4], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 12, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [7, 5], "x": 7, "y": 3}, + {"matrix": [7, 4], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 12, "y": 3} ] } } diff --git a/keyboards/flxlb/zplit/zplit.h b/keyboards/flxlb/zplit/zplit.h deleted file mode 100644 index 6a90efa8af4d..000000000000 --- a/keyboards/flxlb/zplit/zplit.h +++ /dev/null @@ -1,37 +0,0 @@ - /* Copyright 2021 FluxLab - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/foostan/cornelius/cornelius.h b/keyboards/foostan/cornelius/cornelius.h deleted file mode 100644 index c9b63ee32c50..000000000000 --- a/keyboards/foostan/cornelius/cornelius.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 foostan - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 } \ -} diff --git a/keyboards/foostan/cornelius/info.json b/keyboards/foostan/cornelius/info.json index b5613fe44cce..542f7cb3e01e 100644 --- a/keyboards/foostan/cornelius/info.json +++ b/keyboards/foostan/cornelius/info.json @@ -15,57 +15,64 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts":{ - "LAYOUT":{ - "layout":[ - {"label":"Tab", "x":0,"y":0.625}, - {"label":"Q", "x":1,"y":0.625}, - {"label":"W", "x":2,"y":0.25}, - {"label":"E", "x":3,"y":0}, - {"label":"R", "x":4,"y":0.125}, - {"label":"T", "x":5,"y":0.25}, - {"label":"Y", "x":8,"y":0.25}, - {"label":"U", "x":9,"y":0.125}, - {"label":"I", "x":10,"y":0}, - {"label":"O", "x":11,"y":0.25}, - {"label":"P", "x":12,"y":0.625}, - {"label":"Bksp", "x":13,"y":0.625}, - {"label":"Esc", "x":0,"y":1.625}, - {"label":"A", "x":1,"y":1.625}, - {"label":"S", "x":2,"y":1.25}, - {"label":"D", "x":3,"y":1}, - {"label":"F", "x":4,"y":1.125}, - {"label":"G", "x":5,"y":1.25}, - {"label":"H", "x":8,"y":1.25}, - {"label":"J", "x":9,"y":1.125}, - {"label":"K", "x":10,"y":1}, - {"label":"L", "x":11,"y":1.25}, - {"label":":", "x":12,"y":1.625}, - {"label":"\"", "x":13,"y":1.625}, - {"label":"Shift", "x":0,"y":2.625}, - {"label":"Z", "x":1,"y":2.625}, - {"label":"X", "x":2,"y":2.25}, - {"label":"C", "x":3,"y":2}, - {"label":"V", "x":4,"y":2.125}, - {"label":"B", "x":5,"y":2.25}, - {"label":"N", "x":8,"y":2.25}, - {"label":"M", "x":9,"y":2.125}, - {"label":"<", "x":10,"y":2}, - {"label":">", "x":11,"y":2.25}, - {"label":"?", "x":12,"y":2.625}, - {"label":"Shift", "x":13,"y":2.625}, - {"label":"Fn", "x":0,"y":3.625}, - {"label":"Ctrl", "x":1,"y":3.625}, - {"label":"Win", "x":2,"y":3.25}, - {"label":"Alt", "x":3.5,"y":3.25}, - {"label":"Lower", "x":4.5,"y":3.5}, - {"x":5.5,"y":3.75}, - {"x":7.5,"y":3.75}, - {"label":"Raise", "x":8.5,"y":3.5}, - {"label":"Alt", "x":9.5,"y":3.25}, - {"label":"Win", "x":11,"y":3.25}, - {"label":"Ctrl", "x":12,"y":3.625}, - {"label":"Fn", "x":13,"y":3.625} + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.625}, + {"matrix": [0, 1], "x": 1, "y": 0.625}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [0, 6], "x": 8, "y": 0.25}, + {"matrix": [0, 7], "x": 9, "y": 0.125}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.25}, + {"matrix": [0, 10], "x": 12, "y": 0.625}, + {"matrix": [0, 11], "x": 13, "y": 0.625}, + + {"matrix": [1, 0], "x": 0, "y": 1.625}, + {"matrix": [1, 1], "x": 1, "y": 1.625}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1.125}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.25}, + {"matrix": [1, 10], "x": 12, "y": 1.625}, + {"matrix": [1, 11], "x": 13, "y": 1.625}, + + {"matrix": [2, 0], "x": 0, "y": 2.625}, + {"matrix": [2, 1], "x": 1, "y": 2.625}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [2, 6], "x": 8, "y": 2.25}, + {"matrix": [2, 7], "x": 9, "y": 2.125}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.25}, + {"matrix": [2, 10], "x": 12, "y": 2.625}, + {"matrix": [2, 11], "x": 13, "y": 2.625}, + + {"matrix": [3, 0], "x": 0, "y": 3.625}, + {"matrix": [3, 1], "x": 1, "y": 3.625}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75}, + + {"matrix": [3, 6], "x": 7.5, "y": 3.75}, + {"matrix": [3, 7], "x": 8.5, "y": 3.5}, + {"matrix": [3, 8], "x": 9.5, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3.25}, + {"matrix": [3, 10], "x": 12, "y": 3.625}, + {"matrix": [3, 11], "x": 13, "y": 3.625} ] } } diff --git a/keyboards/fortitude60/rev1/info.json b/keyboards/fortitude60/rev1/info.json index 21774d1e8230..175e621e230d 100644 --- a/keyboards/fortitude60/rev1/info.json +++ b/keyboards/fortitude60/rev1/info.json @@ -27,7 +27,77 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"L00", "x":0, "y":0}, {"label":"L01", "x":1, "y":0}, {"label":"L02", "x":2, "y":0}, {"label":"L03", "x":3, "y":0}, {"label":"L04", "x":4, "y":0}, {"label":"L05", "x":5, "y":0}, {"label":"R00", "x":9, "y":0}, {"label":"R01", "x":10, "y":0}, {"label":"R02", "x":11, "y":0}, {"label":"R03", "x":12, "y":0}, {"label":"R04", "x":13, "y":0}, {"label":"R05", "x":14, "y":0}, {"label":"L10", "x":0, "y":1}, {"label":"L11", "x":1, "y":1}, {"label":"L12", "x":2, "y":1}, {"label":"L13", "x":3, "y":1}, {"label":"L14", "x":4, "y":1}, {"label":"L15", "x":5, "y":1}, {"label":"R10", "x":9, "y":1}, {"label":"R11", "x":10, "y":1}, {"label":"R12", "x":11, "y":1}, {"label":"R13", "x":12, "y":1}, {"label":"R14", "x":13, "y":1}, {"label":"R15", "x":14, "y":1}, {"label":"L20", "x":0, "y":2}, {"label":"L21", "x":1, "y":2}, {"label":"L22", "x":2, "y":2}, {"label":"L23", "x":3, "y":2}, {"label":"L24", "x":4, "y":2}, {"label":"L25", "x":5, "y":2}, {"label":"R20", "x":9, "y":2}, {"label":"R21", "x":10, "y":2}, {"label":"R22", "x":11, "y":2}, {"label":"R23", "x":12, "y":2}, {"label":"R24", "x":13, "y":2}, {"label":"R25", "x":14, "y":2}, {"label":"L30", "x":0, "y":3}, {"label":"L31", "x":1, "y":3}, {"label":"L32", "x":2, "y":3}, {"label":"L33", "x":3, "y":3}, {"label":"L34", "x":4, "y":3}, {"label":"L35", "x":5, "y":3}, {"label":"LT5", "x":6, "y":3}, {"label":"RT5", "x":8, "y":3}, {"label":"R30", "x":9, "y":3}, {"label":"R31", "x":10, "y":3}, {"label":"R32", "x":11, "y":3}, {"label":"R33", "x":12, "y":3}, {"label":"R34", "x":13, "y":3}, {"label":"R35", "x":14, "y":3}, {"label":"LT0", "x":2, "y":4}, {"label":"LT1", "x":3, "y":4}, {"label":"LT2", "x":4, "y":4}, {"label":"LT3", "x":5, "y":4}, {"label":"LT4", "x":6, "y":4}, {"label":"RT4", "x":8, "y":4}, {"label":"RT3", "x":9, "y":4}, {"label":"RT2", "x":10, "y":4}, {"label":"RT1", "x":11, "y":4}, {"label":"RT0", "x":12, "y":4}] + "layout": [ + {"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": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [4, 5], "x": 6, "y": 3}, + + {"matrix": [9, 5], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 2, "y": 4}, + {"matrix": [4, 1], "x": 3, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4}, + {"matrix": [4, 3], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 6, "y": 4}, + + {"matrix": [9, 4], "x": 8, "y": 4}, + {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 0], "x": 12, "y": 4} + ] } } } diff --git a/keyboards/fortitude60/rev1/rev1.h b/keyboards/fortitude60/rev1/rev1.h deleted file mode 100644 index 7445cfa9062a..000000000000 --- a/keyboards/fortitude60/rev1/rev1.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -// Standard Keymap -// (TRRS jack on the left half is to the right, TRRS jack on the right half is to the left) -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT5, RT5, R30, R31, R32, R33, R34, R35, \ - LT0, LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1, RT0 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { LT0, LT1, LT2, LT3, LT4, LT5 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { RT0, RT1, RT2, RT3, RT4, RT5 } \ - } diff --git a/keyboards/foxlab/key65/hotswap/hotswap.h b/keyboards/foxlab/key65/hotswap/hotswap.h deleted file mode 100644 index 878a61bcef0a..000000000000 --- a/keyboards/foxlab/key65/hotswap/hotswap.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Jumail Mundekkat / MxBlue - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K47, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, KC_NO, K47, KC_NO, KC_NO, KC_NO, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/foxlab/key65/hotswap/info.json b/keyboards/foxlab/key65/hotswap/info.json index 96a1f0f3b91d..619f59671d2f 100644 --- a/keyboards/foxlab/key65/hotswap/info.json +++ b/keyboards/foxlab/key65/hotswap/info.json @@ -29,72 +29,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D2,F5)", "x":0, "y":0}, - {"label":"K01 (D2,F4)", "x":1, "y":0}, - {"label":"K02 (D2,F1)", "x":2, "y":0}, - {"label":"K03 (D2,F0)", "x":3, "y":0}, - {"label":"K04 (D2,B0)", "x":4, "y":0}, - {"label":"K05 (D2,F6)", "x":5, "y":0}, - {"label":"K06 (D2,F7)", "x":6, "y":0}, - {"label":"K07 (D2,C7)", "x":7, "y":0}, - {"label":"K08 (D2,C6)", "x":8, "y":0}, - {"label":"K09 (D2,B6)", "x":9, "y":0}, - {"label":"K0A (D2,B5)", "x":10, "y":0}, - {"label":"K0B (D2,B4)", "x":11, "y":0}, - {"label":"K0C (D2,D7)", "x":12, "y":0}, - {"label":"K0D (D2,D6)", "x":13, "y":0, "w":2}, - {"label":"K0E (D2,D4)", "x":15, "y":0}, - {"label":"K10 (D1,F5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (D1,F4)", "x":1.5, "y":1}, - {"label":"K12 (D1,F1)", "x":2.5, "y":1}, - {"label":"K13 (D1,F0)", "x":3.5, "y":1}, - {"label":"K14 (D1,B0)", "x":4.5, "y":1}, - {"label":"K15 (D1,F6)", "x":5.5, "y":1}, - {"label":"K16 (D1,F7)", "x":6.5, "y":1}, - {"label":"K17 (D1,C7)", "x":7.5, "y":1}, - {"label":"K18 (D1,C6)", "x":8.5, "y":1}, - {"label":"K19 (D1,B6)", "x":9.5, "y":1}, - {"label":"K1A (D1,B5)", "x":10.5, "y":1}, - {"label":"K1B (D1,B4)", "x":11.5, "y":1}, - {"label":"K1C (D1,D7)", "x":12.5, "y":1}, - {"label":"K1D (D1,D6)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (D1,D4)", "x":15, "y":1}, - {"label":"K20 (D0,F5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (D0,F4)", "x":1.75, "y":2}, - {"label":"K22 (D0,F1)", "x":2.75, "y":2}, - {"label":"K23 (D0,F0)", "x":3.75, "y":2}, - {"label":"K24 (D0,B0)", "x":4.75, "y":2}, - {"label":"K25 (D0,F6)", "x":5.75, "y":2}, - {"label":"K26 (D0,F7)", "x":6.75, "y":2}, - {"label":"K27 (D0,C7)", "x":7.75, "y":2}, - {"label":"K28 (D0,C6)", "x":8.75, "y":2}, - {"label":"K29 (D0,B6)", "x":9.75, "y":2}, - {"label":"K2A (D0,B5)", "x":10.75, "y":2}, - {"label":"K2B (D0,B4)", "x":11.75, "y":2}, - {"label":"K2C (D0,D7)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (D0,D4)", "x":15, "y":2}, - {"label":"K30 (D3,F5)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (D3,F1)", "x":2.25, "y":3}, - {"label":"K33 (D3,F0)", "x":3.25, "y":3}, - {"label":"K34 (D3,B0)", "x":4.25, "y":3}, - {"label":"K35 (D3,F6)", "x":5.25, "y":3}, - {"label":"K36 (D3,F7)", "x":6.25, "y":3}, - {"label":"K37 (D3,C7)", "x":7.25, "y":3}, - {"label":"K38 (D3,C6)", "x":8.25, "y":3}, - {"label":"K39 (D3,B6)", "x":9.25, "y":3}, - {"label":"K3A (D3,B5)", "x":10.25, "y":3}, - {"label":"K3B (D3,B4)", "x":11.25, "y":3}, - {"label":"K3C (D3,D7)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D3,D6)", "x":14, "y":3}, - {"label":"K3E (D3,D4)", "x":15, "y":3}, - {"label":"K40 (B3,F5)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B3,F4)", "x":1.5, "y":4}, - {"label":"K42 (B3,F1)", "x":2.5, "y":4, "w":1.5}, - {"label":"K47 (B3,C7)", "x":4, "y":4, "w":7}, - {"label":"K4B (B3,B4)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (B3,D7)", "x":13, "y":4}, - {"label":"K4D (B3,D6)", "x":14, "y":4}, - {"label":"K4E (B3,D4)", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/foxlab/time_re/hotswap/hotswap.h b/keyboards/foxlab/time_re/hotswap/hotswap.h deleted file mode 100644 index 6f7dda6dfd82..000000000000 --- a/keyboards/foxlab/time_re/hotswap/hotswap.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 DongXing - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, 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, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, KC_NO, K3D, K3E, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \ -} diff --git a/keyboards/foxlab/time_re/hotswap/info.json b/keyboards/foxlab/time_re/hotswap/info.json index 1204298a1b7b..14f0772f8d6f 100644 --- a/keyboards/foxlab/time_re/hotswap/info.json +++ b/keyboards/foxlab/time_re/hotswap/info.json @@ -28,96 +28,109 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,F0)", "x":0, "y":0}, - {"label":"K02 (D1,F4)", "x":2, "y":0}, - {"label":"K03 (D1,F5)", "x":3, "y":0}, - {"label":"K04 (D1,F6)", "x":4, "y":0}, - {"label":"K05 (D1,F7)", "x":5, "y":0}, - {"label":"K06 (D1,C7)", "x":6.5, "y":0}, - {"label":"K07 (D1,C6)", "x":7.5, "y":0}, - {"label":"K08 (D1,B6)", "x":8.5, "y":0}, - {"label":"K09 (D1,B5)", "x":9.5, "y":0}, - {"label":"K0A (D1,B4)", "x":11, "y":0}, - {"label":"K0B (D1,D7)", "x":12, "y":0}, - {"label":"K0C (D1,D4)", "x":13, "y":0}, - {"label":"K0D (D1,D6)", "x":14, "y":0}, - {"label":"K0E (D1,D2)", "x":15.25, "y":0}, - {"label":"K0F (D1,D3)", "x":16.25, "y":0}, - {"label":"K0G (D1,D5)", "x":17.25, "y":0}, - {"label":"K10 (D0,F0)", "x":0, "y":1.5}, - {"label":"K11 (D0,F1)", "x":1, "y":1.5}, - {"label":"K12 (D0,F4)", "x":2, "y":1.5}, - {"label":"K13 (D0,F5)", "x":3, "y":1.5}, - {"label":"K14 (D0,F6)", "x":4, "y":1.5}, - {"label":"K15 (D0,F7)", "x":5, "y":1.5}, - {"label":"K16 (D0,C7)", "x":6, "y":1.5}, - {"label":"K17 (D0,C6)", "x":7, "y":1.5}, - {"label":"K18 (D0,B6)", "x":8, "y":1.5}, - {"label":"K19 (D0,B5)", "x":9, "y":1.5}, - {"label":"K1A (D0,B4)", "x":10, "y":1.5}, - {"label":"K1B (D0,D7)", "x":11, "y":1.5}, - {"label":"K1C (D0,D4)", "x":12, "y":1.5}, - {"label":"K1D (D0,D6)", "x":13, "y":1.5}, - {"label":"K3E (B0,D2)", "x":14, "y":1.5}, - {"label":"K1E (D0,D2)", "x":15.25, "y":1.5}, - {"label":"K1F (D0,D3)", "x":16.25, "y":1.5}, - {"label":"K1G (D0,D5)", "x":17.25, "y":1.5}, - {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B3,F1)", "x":1.5, "y":2.5}, - {"label":"K22 (B3,F4)", "x":2.5, "y":2.5}, - {"label":"K23 (B3,F5)", "x":3.5, "y":2.5}, - {"label":"K24 (B3,F6)", "x":4.5, "y":2.5}, - {"label":"K25 (B3,F7)", "x":5.5, "y":2.5}, - {"label":"K26 (B3,C7)", "x":6.5, "y":2.5}, - {"label":"K27 (B3,C6)", "x":7.5, "y":2.5}, - {"label":"K28 (B3,B6)", "x":8.5, "y":2.5}, - {"label":"K29 (B3,B5)", "x":9.5, "y":2.5}, - {"label":"K2A (B3,B4)", "x":10.5, "y":2.5}, - {"label":"K2B (B3,D7)", "x":11.5, "y":2.5}, - {"label":"K2C (B3,D4)", "x":12.5, "y":2.5}, - {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K2E (B3,D2)", "x":15.25, "y":2.5}, - {"label":"K2F (B3,D3)", "x":16.25, "y":2.5}, - {"label":"K2G (B3,D5)", "x":17.25, "y":2.5}, - {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B0,F1)", "x":1.75, "y":3.5}, - {"label":"K32 (B0,F4)", "x":2.75, "y":3.5}, - {"label":"K33 (B0,F5)", "x":3.75, "y":3.5}, - {"label":"K34 (B0,F6)", "x":4.75, "y":3.5}, - {"label":"K35 (B0,F7)", "x":5.75, "y":3.5}, - {"label":"K36 (B0,C7)", "x":6.75, "y":3.5}, - {"label":"K37 (B0,C6)", "x":7.75, "y":3.5}, - {"label":"K38 (B0,B6)", "x":8.75, "y":3.5}, - {"label":"K39 (B0,B5)", "x":9.75, "y":3.5}, - {"label":"K3A (B0,B4)", "x":10.75, "y":3.5}, - {"label":"K3B (B0,D7)", "x":11.75, "y":3.5}, - {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B2,F1)", "x":1.25, "y":4.5}, - {"label":"K42 (B2,F4)", "x":2.25, "y":4.5}, - {"label":"K43 (B2,F5)", "x":3.25, "y":4.5}, - {"label":"K44 (B2,F6)", "x":4.25, "y":4.5}, - {"label":"K45 (B2,F7)", "x":5.25, "y":4.5}, - {"label":"K46 (B2,C7)", "x":6.25, "y":4.5}, - {"label":"K47 (B2,C6)", "x":7.25, "y":4.5}, - {"label":"K48 (B2,B6)", "x":8.25, "y":4.5}, - {"label":"K49 (B2,B5)", "x":9.25, "y":4.5}, - {"label":"K4A (B2,B4)", "x":10.25, "y":4.5}, - {"label":"K4B (B2,D7)", "x":11.25, "y":4.5}, - {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K4D (B2,D6)", "x":14, "y":4.5}, - {"label":"K4F (B2,D3)", "x":16.25, "y":4.5}, - {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (B1,D2)", "x":15.25, "y":5.5}, - {"label":"K5F (B1,D3)", "x":16.25, "y":5.5}, - {"label":"K5G (B1,D5)", "x":17.25, "y":5.5} + {"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.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [3, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/foxlab/time_re/universal/info.json b/keyboards/foxlab/time_re/universal/info.json index 4632d8c359ea..5cfbf7eec2c1 100644 --- a/keyboards/foxlab/time_re/universal/info.json +++ b/keyboards/foxlab/time_re/universal/info.json @@ -28,96 +28,109 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,F0)", "x":0, "y":0}, - {"label":"K02 (D1,F4)", "x":2, "y":0}, - {"label":"K03 (D1,F5)", "x":3, "y":0}, - {"label":"K04 (D1,F6)", "x":4, "y":0}, - {"label":"K05 (D1,F7)", "x":5, "y":0}, - {"label":"K06 (D1,C7)", "x":6.5, "y":0}, - {"label":"K07 (D1,C6)", "x":7.5, "y":0}, - {"label":"K08 (D1,B6)", "x":8.5, "y":0}, - {"label":"K09 (D1,B5)", "x":9.5, "y":0}, - {"label":"K0A (D1,B4)", "x":11, "y":0}, - {"label":"K0B (D1,D7)", "x":12, "y":0}, - {"label":"K0C (D1,D4)", "x":13, "y":0}, - {"label":"K0D (D1,D6)", "x":14, "y":0}, - {"label":"K0E (D1,D2)", "x":15.25, "y":0}, - {"label":"K0F (D1,D3)", "x":16.25, "y":0}, - {"label":"K0G (D1,D5)", "x":17.25, "y":0}, - {"label":"K10 (D0,F0)", "x":0, "y":1.5}, - {"label":"K11 (D0,F1)", "x":1, "y":1.5}, - {"label":"K12 (D0,F4)", "x":2, "y":1.5}, - {"label":"K13 (D0,F5)", "x":3, "y":1.5}, - {"label":"K14 (D0,F6)", "x":4, "y":1.5}, - {"label":"K15 (D0,F7)", "x":5, "y":1.5}, - {"label":"K16 (D0,C7)", "x":6, "y":1.5}, - {"label":"K17 (D0,C6)", "x":7, "y":1.5}, - {"label":"K18 (D0,B6)", "x":8, "y":1.5}, - {"label":"K19 (D0,B5)", "x":9, "y":1.5}, - {"label":"K1A (D0,B4)", "x":10, "y":1.5}, - {"label":"K1B (D0,D7)", "x":11, "y":1.5}, - {"label":"K1C (D0,D4)", "x":12, "y":1.5}, - {"label":"K1D (D0,D6)", "x":13, "y":1.5}, - {"label":"K3E (B0,D2)", "x":14, "y":1.5}, - {"label":"K1E (D0,D2)", "x":15.25, "y":1.5}, - {"label":"K1F (D0,D3)", "x":16.25, "y":1.5}, - {"label":"K1G (D0,D5)", "x":17.25, "y":1.5}, - {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B3,F1)", "x":1.5, "y":2.5}, - {"label":"K22 (B3,F4)", "x":2.5, "y":2.5}, - {"label":"K23 (B3,F5)", "x":3.5, "y":2.5}, - {"label":"K24 (B3,F6)", "x":4.5, "y":2.5}, - {"label":"K25 (B3,F7)", "x":5.5, "y":2.5}, - {"label":"K26 (B3,C7)", "x":6.5, "y":2.5}, - {"label":"K27 (B3,C6)", "x":7.5, "y":2.5}, - {"label":"K28 (B3,B6)", "x":8.5, "y":2.5}, - {"label":"K29 (B3,B5)", "x":9.5, "y":2.5}, - {"label":"K2A (B3,B4)", "x":10.5, "y":2.5}, - {"label":"K2B (B3,D7)", "x":11.5, "y":2.5}, - {"label":"K2C (B3,D4)", "x":12.5, "y":2.5}, - {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K2E (B3,D2)", "x":15.25, "y":2.5}, - {"label":"K2F (B3,D3)", "x":16.25, "y":2.5}, - {"label":"K2G (B3,D5)", "x":17.25, "y":2.5}, - {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B0,F1)", "x":1.75, "y":3.5}, - {"label":"K32 (B0,F4)", "x":2.75, "y":3.5}, - {"label":"K33 (B0,F5)", "x":3.75, "y":3.5}, - {"label":"K34 (B0,F6)", "x":4.75, "y":3.5}, - {"label":"K35 (B0,F7)", "x":5.75, "y":3.5}, - {"label":"K36 (B0,C7)", "x":6.75, "y":3.5}, - {"label":"K37 (B0,C6)", "x":7.75, "y":3.5}, - {"label":"K38 (B0,B6)", "x":8.75, "y":3.5}, - {"label":"K39 (B0,B5)", "x":9.75, "y":3.5}, - {"label":"K3A (B0,B4)", "x":10.75, "y":3.5}, - {"label":"K3B (B0,D7)", "x":11.75, "y":3.5}, - {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B2,F1)", "x":1.25, "y":4.5}, - {"label":"K42 (B2,F4)", "x":2.25, "y":4.5}, - {"label":"K43 (B2,F5)", "x":3.25, "y":4.5}, - {"label":"K44 (B2,F6)", "x":4.25, "y":4.5}, - {"label":"K45 (B2,F7)", "x":5.25, "y":4.5}, - {"label":"K46 (B2,C7)", "x":6.25, "y":4.5}, - {"label":"K47 (B2,C6)", "x":7.25, "y":4.5}, - {"label":"K48 (B2,B6)", "x":8.25, "y":4.5}, - {"label":"K49 (B2,B5)", "x":9.25, "y":4.5}, - {"label":"K4A (B2,B4)", "x":10.25, "y":4.5}, - {"label":"K4B (B2,D7)", "x":11.25, "y":4.5}, - {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K4D (B2,D6)", "x":14, "y":4.5}, - {"label":"K4F (B2,D3)", "x":16.25, "y":4.5}, - {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (B1,D2)", "x":15.25, "y":5.5}, - {"label":"K5F (B1,D3)", "x":16.25, "y":5.5}, - {"label":"K5G (B1,D5)", "x":17.25, "y":5.5} + {"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.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [3, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/foxlab/time_re/universal/universal.h b/keyboards/foxlab/time_re/universal/universal.h deleted file mode 100644 index 6f7dda6dfd82..000000000000 --- a/keyboards/foxlab/time_re/universal/universal.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 DongXing - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, 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, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, KC_NO, K3D, K3E, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \ -} diff --git a/keyboards/fr4/southpaw75/info.json b/keyboards/fr4/southpaw75/info.json index 77949825fbb3..066af0b9a7c6 100644 --- a/keyboards/fr4/southpaw75/info.json +++ b/keyboards/fr4/southpaw75/info.json @@ -17,7 +17,90 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Num Lock", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"~", "x":4, "y":0}, {"label":"!", "x":5, "y":0}, {"label":"@", "x":6, "y":0}, {"label":"#", "x":7, "y":0}, {"label":"$", "x":8, "y":0}, {"label":"%", "x":9, "y":0}, {"label":"^", "x":10, "y":0}, {"label":"&", "x":11, "y":0}, {"label":"*", "x":12, "y":0}, {"label":"(", "x":13, "y":0}, {"label":")", "x":14, "y":0}, {"label":"_", "x":15, "y":0}, {"label":"+", "x":16, "y":0}, {"label":"Backspace", "x":17, "y":0, "w":2}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"Tab", "x":4, "y":1, "w":1.5}, {"label":"Q", "x":5.5, "y":1}, {"label":"W", "x":6.5, "y":1}, {"label":"E", "x":7.5, "y":1}, {"label":"R", "x":8.5, "y":1}, {"label":"T", "x":9.5, "y":1}, {"label":"Y", "x":10.5, "y":1}, {"label":"U", "x":11.5, "y":1}, {"label":"I", "x":12.5, "y":1}, {"label":"O", "x":13.5, "y":1}, {"label":"P", "x":14.5, "y":1}, {"label":"{", "x":15.5, "y":1}, {"label":"}", "x":16.5, "y":1}, {"label":"|", "x":17.5, "y":1, "w":1.5}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Caps Lock", "x":4, "y":2, "w":1.75}, {"label":"A", "x":5.75, "y":2}, {"label":"S", "x":6.75, "y":2}, {"label":"D", "x":7.75, "y":2}, {"label":"F", "x":8.75, "y":2}, {"label":"G", "x":9.75, "y":2}, {"label":"H", "x":10.75, "y":2}, {"label":"J", "x":11.75, "y":2}, {"label":"K", "x":12.75, "y":2}, {"label":"L", "x":13.75, "y":2}, {"label":":", "x":14.75, "y":2}, {"label":"\"", "x":15.75, "y":2}, {"label":"Enter", "x":16.75, "y":2, "w":2.25}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"Shift", "x":4, "y":3, "w":2.25}, {"label":"Z", "x":6.25, "y":3}, {"label":"X", "x":7.25, "y":3}, {"label":"C", "x":8.25, "y":3}, {"label":"V", "x":9.25, "y":3}, {"label":"B", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":2.75}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}, {"label":"Ctrl", "x":4, "y":4, "w":1.25}, {"label":"Win", "x":5.25, "y":4, "w":1.25}, {"label":"Alt", "x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":6.25}, {"label":"Alt", "x":14, "y":4, "w":1.25}, {"label":"Win", "x":15.25, "y":4, "w":1.25}, {"label":"Menu", "x":16.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":17.75, "y":4, "w":1.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [1, 7], "x": 16, "y": 0}, + {"matrix": [1, 8], "x": 17, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1, "h": 2}, + {"matrix": [2, 4], "x": 4, "y": 1, "w": 1.5}, + {"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": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 0], "x": 9.5, "y": 1}, + {"matrix": [3, 1], "x": 10.5, "y": 1}, + {"matrix": [3, 2], "x": 11.5, "y": 1}, + {"matrix": [3, 3], "x": 12.5, "y": 1}, + {"matrix": [3, 4], "x": 13.5, "y": 1}, + {"matrix": [3, 5], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1}, + {"matrix": [3, 7], "x": 16.5, "y": 1}, + {"matrix": [3, 8], "x": 17.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 4, "y": 2, "w": 1.75}, + {"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": [4, 8], "x": 9.75, "y": 2}, + {"matrix": [5, 0], "x": 10.75, "y": 2}, + {"matrix": [5, 1], "x": 11.75, "y": 2}, + {"matrix": [5, 2], "x": 12.75, "y": 2}, + {"matrix": [5, 3], "x": 13.75, "y": 2}, + {"matrix": [5, 4], "x": 14.75, "y": 2}, + {"matrix": [5, 5], "x": 15.75, "y": 2}, + {"matrix": [5, 6], "x": 16.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 7], "x": 0, "y": 3}, + {"matrix": [5, 8], "x": 1, "y": 3}, + {"matrix": [6, 0], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3, "h": 2}, + {"matrix": [6, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [6, 4], "x": 7.25, "y": 3}, + {"matrix": [6, 5], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 7], "x": 10.25, "y": 3}, + {"matrix": [6, 8], "x": 11.25, "y": 3}, + {"matrix": [7, 0], "x": 12.25, "y": 3}, + {"matrix": [7, 1], "x": 13.25, "y": 3}, + {"matrix": [7, 2], "x": 14.25, "y": 3}, + {"matrix": [7, 3], "x": 15.25, "y": 3}, + {"matrix": [7, 4], "x": 16.25, "y": 3, "w": 2.75}, + + {"matrix": [7, 5], "x": 0, "y": 4, "w": 2}, + {"matrix": [7, 6], "x": 2, "y": 4}, + {"matrix": [7, 7], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [7, 8], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 7.75, "y": 4, "w": 6.25}, + {"matrix": [8, 2], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 16.5, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 17.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/fr4/southpaw75/southpaw75.h b/keyboards/fr4/southpaw75/southpaw75.h deleted file mode 100644 index 7842d8ea9068..000000000000 --- a/keyboards/fr4/southpaw75/southpaw75.h +++ /dev/null @@ -1,37 +0,0 @@ - /* - Copyright 2020 Kelvin Hall - - 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, K35, K36, K37, K38, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K50, K51, K52, K53, K54, K55, K56, \ - K57, K58, K60, K61, K62, K63, K64, K65, K66, K67, K68, K70, K71, K72, K73, K74, \ - K75, K76, K77, K78, K80, K81, K82, K83, K84, K85 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/free_willy/free_willy.h b/keyboards/free_willy/free_willy.h deleted file mode 100644 index 88597a053d46..000000000000 --- a/keyboards/free_willy/free_willy.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Caleb Lightfoot - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K32, K33, K34, K35, K36, K37 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { XXX, XXX, K32, K33, K34, K35, K36, K37, XXX, XXX } \ -} diff --git a/keyboards/free_willy/info.json b/keyboards/free_willy/info.json index 88d2907acd26..c9457da71d21 100644 --- a/keyboards/free_willy/info.json +++ b/keyboards/free_willy/info.json @@ -18,43 +18,46 @@ "layouts": { "LAYOUT": { "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":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3} - ] + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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} + ] } } } diff --git a/keyboards/friedrich/friedrich.h b/keyboards/friedrich/friedrich.h deleted file mode 100644 index d4f043b771f7..000000000000 --- a/keyboards/friedrich/friedrich.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 kb-elmo - * - * 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 - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k210, k011, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k211, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k311, \ - k400, k401, k405, k409, k410 \ -) { \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, ____, k311 }, \ - { k400, k401, ____, ____, ____, k405, ____, ____, ____, k409, k410, ____ } \ -} diff --git a/keyboards/friedrich/info.json b/keyboards/friedrich/info.json index 2522d2898826..321bacdbd551 100644 --- a/keyboards/friedrich/info.json +++ b/keyboards/friedrich/info.json @@ -20,58 +20,63 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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":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, "w":1.5}, - {"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, "w":2.25}, - {"x":0, "y":3, "w":2.25}, - {"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, "w":1.75}, - {"x":1.125, "y":4}, - {"x":2.125, "y":4, "w":1.25}, - {"x":3.375, "y":4, "w":6.25}, - {"x":9.625, "y":4, "w":1.25}, - {"x":10.875, "y":4} + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [2, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 1.125, "y": 4}, + {"matrix": [4, 1], "x": 2.125, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.375, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 9.625, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10.875, "y": 4} ] } } diff --git a/keyboards/function96/v1/info.json b/keyboards/function96/v1/info.json index a3c177cfd792..63bd287f473b 100644 --- a/keyboards/function96/v1/info.json +++ b/keyboards/function96/v1/info.json @@ -17,7 +17,115 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print", "x":13, "y":0}, {"label":"Del", "x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"x":15, "y":1}, {"label":"/", "x":16, "y":1}, {"label":"*", "x":17, "y":1}, {"label":"-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"7", "x":15, "y":2}, {"label":"8", "x":16, "y":2}, {"label":"9", "x":17, "y":2}, {"label":"+", "x":18, "y":2, "h":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"4", "x":15, "y":3}, {"label":"5", "x":16, "y":3}, {"label":"6", "x":17, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"1", "x":15, "y":4}, {"label":"2", "x":16, "y":4}, {"label":"3", "x":17, "y":4}, {"x":18, "y":4, "h":2}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":2.25}, {"x":6, "y":5, "w":1.25}, {"x":7.25, "y":5, "w":2.75}, {"x":10, "y":5, "w":1.25}, {"x":11.25, "y":5, "w":1.25}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}, {"label":"0", "x":16, "y":5}, {"x":17, "y":5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + {"matrix": [0, 17], "x": 17, "y": 0}, + {"matrix": [0, 18], "x": 18, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + {"matrix": [1, 17], "x": 17, "y": 1}, + {"matrix": [1, 18], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + {"matrix": [2, 17], "x": 17, "y": 2}, + {"matrix": [2, 18], "x": 18, "y": 2, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3}, + {"matrix": [3, 17], "x": 17, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + {"matrix": [4, 16], "x": 16, "y": 4}, + {"matrix": [4, 17], "x": 17, "y": 4}, + {"matrix": [4, 18], "x": 18, "y": 4, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 2.25}, + {"matrix": [5, 6], "x": 6, "y": 5, "w": 1.25}, + {"matrix": [5, 8], "x": 7.25, "y": 5, "w": 2.75}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5}, + {"matrix": [5, 17], "x": 17, "y": 5} + ] } } } diff --git a/keyboards/function96/v1/v1.h b/keyboards/function96/v1/v1.h deleted file mode 100644 index 50cd1fb2bf58..000000000000 --- a/keyboards/function96/v1/v1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 Matt3o - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ - K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, \ - K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54, \ - K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, \ - K71, K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, \ - K88, K89, K90, K91, K92, K93, K94, K95, K96, K97, K98, K99, K100 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17 , K18}, \ - { K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, KC_NO, K33, K34, K35 , K36}, \ - { K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, KC_NO, K50, K51, K52, K53 , K54}, \ - { K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, KC_NO, K67, KC_NO, K68, K69, K70 , KC_NO}, \ - { K71, K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, KC_NO, K82, KC_NO, K83, K84, K85, K86 , K87}, \ - { K88, K89, KC_NO, K90, K91, KC_NO, K92, KC_NO, K93, KC_NO, K94, K95, KC_NO, K96, K97, K98, K99, K100, KC_NO} \ -} diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json index ba8b96a0602a..c8a32481249d 100644 --- a/keyboards/fungo/rev1/info.json +++ b/keyboards/fungo/rev1/info.json @@ -31,86 +31,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, - {"x":6, "y":0.5}, - {"x":12, "y":0.5}, - {"x":13, "y":0.25}, - {"x":14, "y":0.125}, - {"x":15, "y":0}, - {"x":16, "y":0.125}, - {"x":17, "y":0.375}, - {"x":18, "y":0.375}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, - {"x":6, "y":1.5}, - {"x":12, "y":1.5}, - {"x":13, "y":1.25}, - {"x":14, "y":1.125}, - {"x":15, "y":1}, - {"x":16, "y":1.125}, - {"x":17, "y":1.375}, - {"x":18, "y":1.375}, + {"matrix": [6, 0], "x": 12, "y": 0.5}, + {"matrix": [6, 1], "x": 13, "y": 0.25}, + {"matrix": [6, 2], "x": 14, "y": 0.125}, + {"matrix": [6, 3], "x": 15, "y": 0}, + {"matrix": [6, 4], "x": 16, "y": 0.125}, + {"matrix": [6, 5], "x": 17, "y": 0.375}, + {"matrix": [6, 6], "x": 18, "y": 0.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, - {"x":6, "y":2.5}, - {"x":12, "y":2.5}, - {"x":13, "y":2.25}, - {"x":14, "y":2.125}, - {"x":15, "y":2}, - {"x":16, "y":2.125}, - {"x":17, "y":2.375}, - {"x":18, "y":2.375}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"x":0, "y":3.375}, - {"x":1, "y":3.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.125}, - {"x":5, "y":3.25}, - {"x":6, "y":3.5}, - {"x":7, "y":4.25}, - {"x":8, "y":4.5}, - {"x":10, "y":4.5}, - {"x":11, "y":4.25}, - {"x":12, "y":3.5}, - {"x":13, "y":3.25}, - {"x":14, "y":3.125}, - {"x":15, "y":3}, - {"x":16, "y":3.125}, - {"x":17, "y":3.375}, - {"x":18, "y":3.375}, + {"matrix": [7, 0], "x": 12, "y": 1.5}, + {"matrix": [7, 1], "x": 13, "y": 1.25}, + {"matrix": [7, 2], "x": 14, "y": 1.125}, + {"matrix": [7, 3], "x": 15, "y": 1}, + {"matrix": [7, 4], "x": 16, "y": 1.125}, + {"matrix": [7, 5], "x": 17, "y": 1.375}, + {"matrix": [7, 6], "x": 18, "y": 1.375}, - {"x":0, "y":4.375}, - {"x":1, "y":4.375}, - {"x":2, "y":4.25}, - {"x":3.25, "y":4.25}, - {"x":4.5, "y":4.5}, - {"x":5.75, "y":5}, - {"x":7, "y":5.25}, - {"x":8, "y":5.5}, - {"x":10, "y":5.5}, - {"x":11, "y":5.25}, - {"x":12.25, "y":5}, - {"x":13.5, "y":4.5}, - {"x":14.75, "y":4.25}, - {"x":16, "y":4.25}, - {"x":17, "y":4.375}, - {"x":18, "y":4.375} + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + + {"matrix": [8, 0], "x": 12, "y": 2.5}, + {"matrix": [8, 1], "x": 13, "y": 2.25}, + {"matrix": [8, 2], "x": 14, "y": 2.125}, + {"matrix": [8, 3], "x": 15, "y": 2}, + {"matrix": [8, 4], "x": 16, "y": 2.125}, + {"matrix": [8, 5], "x": 17, "y": 2.375}, + {"matrix": [8, 6], "x": 18, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, + {"matrix": [4, 6], "x": 7, "y": 4.25}, + {"matrix": [5, 2], "x": 8, "y": 4.5}, + + {"matrix": [11, 4], "x": 10, "y": 4.5}, + {"matrix": [10, 0], "x": 11, "y": 4.25}, + {"matrix": [9, 0], "x": 12, "y": 3.5}, + {"matrix": [9, 1], "x": 13, "y": 3.25}, + {"matrix": [9, 2], "x": 14, "y": 3.125}, + {"matrix": [9, 3], "x": 15, "y": 3}, + {"matrix": [9, 4], "x": 16, "y": 3.125}, + {"matrix": [9, 5], "x": 17, "y": 3.375}, + {"matrix": [9, 6], "x": 18, "y": 3.375}, + + {"matrix": [5, 0], "x": 0, "y": 4.375}, + {"matrix": [5, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 0], "x": 2, "y": 4.25}, + {"matrix": [4, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 2], "x": 4.5, "y": 4.5}, + {"matrix": [4, 3], "x": 5.75, "y": 5}, + {"matrix": [4, 4], "x": 7, "y": 5.25}, + {"matrix": [4, 5], "x": 8, "y": 5.5}, + + {"matrix": [10, 1], "x": 10, "y": 5.5}, + {"matrix": [10, 2], "x": 11, "y": 5.25}, + {"matrix": [10, 3], "x": 12.25, "y": 5}, + {"matrix": [10, 4], "x": 13.5, "y": 4.5}, + {"matrix": [10, 5], "x": 14.75, "y": 4.25}, + {"matrix": [10, 6], "x": 16, "y": 4.25}, + {"matrix": [11, 5], "x": 17, "y": 4.375}, + {"matrix": [11, 6], "x": 18, "y": 4.375} ] } } diff --git a/keyboards/fungo/rev1/rev1.h b/keyboards/fungo/rev1/rev1.h deleted file mode 100644 index bcb5ae345f6a..000000000000 --- a/keyboards/fungo/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2022 bojiguard (@bojiguard) - * - * 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( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, L46, L52, R52, R46, R36, R35, R34, R33, R32, R31, R30, \ - L50, L51, L40, L41, L42, L43, L44, L45, R45, R44, R43, R42, R41, R40, R51, R50 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06}, \ - { L10, L11, L12, L13, L14, L15, L16}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { L30, L31, L32, L33, L34, L35, L36}, \ - { L40, L41, L42, L43, L44, L45, L46}, \ - { L50, L51, L52, KC_NO, KC_NO, KC_NO, KC_NO}, \ - { R06, R05, R04, R03, R02, R01, R00}, \ - { R16, R15, R14, R13, R12, R11, R10}, \ - { R26, R25, R24, R23, R22, R21, R20}, \ - { R36, R35, R34, R33, R32, R31, R30}, \ - { R46, R45, R44, R43, R42, R41, R40}, \ - { KC_NO, KC_NO, KC_NO, KC_NO, R52, R51, R50}, \ - } diff --git a/keyboards/funky40/funky40.h b/keyboards/funky40/funky40.h deleted file mode 100644 index f82a731b31e4..000000000000 --- a/keyboards/funky40/funky40.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} diff --git a/keyboards/funky40/info.json b/keyboards/funky40/info.json index 10d70d07a0de..66dbe4b0f232 100644 --- a/keyboards/funky40/info.json +++ b/keyboards/funky40/info.json @@ -17,7 +17,57 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back
Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "y":1}, {"label":"\"", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Shift", "x":11, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"x":3, "y":3, "w":2}, {"label":"Del", "x":5, "y":3}, {"x":6, "y":3, "w":2}, {"label":"Left", "x":8, "y":3}, {"label":"Up", "x":9, "y":3}, {"label":"Down", "x":10, "y":3}, {"label":"Right", "x":11, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 2}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 9, "y": 3}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 9], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/gami_studio/lex60/info.json b/keyboards/gami_studio/lex60/info.json index bd0c2240aa40..b5b59df7aacd 100644 --- a/keyboards/gami_studio/lex60/info.json +++ b/keyboards/gami_studio/lex60/info.json @@ -25,72 +25,76 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"\\", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"LCtl / Esc", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"ISO #", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"ISO \\", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"GUI", "x":1.5, "y":4, "w":1.5}, - {"label":"LAlt", "x":3, "y":4, "w":1.5}, - {"label":"Space", "x":4.5, "y":4, "w":2.25}, - {"label":"Fn / Enter", "x":6.75, "y":4, "w":2.75}, - {"label":"GUI", "x":9.5, "y":4, "w":1.5}, - {"label":"RAlt", "x":11, "y":4, "w":1.25}, - {"label":"Menu", "x":12.25, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/gami_studio/lex60/lex60.h b/keyboards/gami_studio/lex60/lex60.h deleted file mode 100644 index eea7a454b653..000000000000 --- a/keyboards/gami_studio/lex60/lex60.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k45, k46, k4a, k4b, k4c, k4d \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \ - {k40, k41, k42, XXX, XXX, k45, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \ -} diff --git a/keyboards/gboards/georgi/georgi.h b/keyboards/gboards/georgi/georgi.h index 47fb1831c892..e23fc264f49d 100644 --- a/keyboards/gboards/georgi/georgi.h +++ b/keyboards/gboards/georgi/georgi.h @@ -26,55 +26,3 @@ extern i2c_status_t mcp23018_status; void init_ergodox(void); uint8_t init_mcp23018(void); - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15, R10,R11,R12,R13,R14,R15, \ - L20,L21,L22, R20,R21,R22) \ - \ - { \ - { KC_NO, R00, R10, R21}, \ - { KC_NO, R01, R11, R20}, \ - { KC_NO, R02, R12, R22}, \ - { KC_NO, R03, R13, KC_NO}, \ - { KC_NO, R04, R14, KC_NO}, \ - { KC_NO, R05, R15, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO}, \ - \ - { KC_NO, L05, L15, L22}, \ - { KC_NO, L04, L14, L21}, \ - { KC_NO, L03, L13, L20}, \ - { KC_NO, L02, L12, KC_NO}, \ - { KC_NO, L01, L11, KC_NO}, \ - { KC_NO, L00, L10, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, KC_NO}, \ - \ -} - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- -#define LAYOUT_GERGO( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25,L26, R20,R21,R22,R23,R24,R25,R26, \ - L31,L32, R33,R34, \ - L30, R30, \ - L33,L34, R31,R32) \ - \ - { \ - { KC_NO, L16, L26, L30}, \ - { L05, L15, L25, L34}, \ - { L04, L14, L24, L33}, \ - { L03, L13, L23, L32}, \ - { L02, L12, L22, L31}, \ - { L01, L11, L21, KC_NO}, \ - { L00, L10, L20, KC_NO}, \ - \ - { KC_NO, R10, R20, R30}, \ - { R00, R11, R21, R31}, \ - { R01, R12, R22, R32}, \ - { R02, R13, R23, R33}, \ - { R03, R14, R24, R34}, \ - { R04, R15, R25, KC_NO}, \ - { R05, R16, R26, KC_NO}, \ -} */ diff --git a/keyboards/gboards/georgi/info.json b/keyboards/gboards/georgi/info.json index 3f1c69b7f557..7ede9d1f4324 100644 --- a/keyboards/gboards/georgi/info.json +++ b/keyboards/gboards/georgi/info.json @@ -16,41 +16,41 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.5}, - {"x": 1, "y": 0.5}, - {"x": 2, "y": 0.3}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.4}, - {"x": 5, "y": 0.5}, + {"matrix": [12, 1], "x": 0, "y": 0.5}, + {"matrix": [11, 1], "x": 1, "y": 0.5}, + {"matrix": [10, 1], "x": 2, "y": 0.3}, + {"matrix": [9, 1], "x": 3, "y": 0}, + {"matrix": [8, 1], "x": 4, "y": 0.4}, + {"matrix": [7, 1], "x": 5, "y": 0.5}, - {"x": 7, "y": 0.5}, - {"x": 8, "y": 0.4}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0.3}, - {"x": 11, "y": 0.5}, - {"x": 12, "y": 0.5}, + {"matrix": [0, 1], "x": 7, "y": 0.5}, + {"matrix": [1, 1], "x": 8, "y": 0.4}, + {"matrix": [2, 1], "x": 9, "y": 0}, + {"matrix": [3, 1], "x": 10, "y": 0.3}, + {"matrix": [4, 1], "x": 11, "y": 0.5}, + {"matrix": [5, 1], "x": 12, "y": 0.5}, - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.3}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.4}, - {"x": 5, "y": 1.5}, + {"matrix": [12, 2], "x": 0, "y": 1.5}, + {"matrix": [11, 2], "x": 1, "y": 1.5}, + {"matrix": [10, 2], "x": 2, "y": 1.3}, + {"matrix": [9, 2], "x": 3, "y": 1}, + {"matrix": [8, 2], "x": 4, "y": 1.4}, + {"matrix": [7, 2], "x": 5, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.4}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1.3}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, + {"matrix": [0, 2], "x": 7, "y": 1.5}, + {"matrix": [1, 2], "x": 8, "y": 1.4}, + {"matrix": [2, 2], "x": 9, "y": 1}, + {"matrix": [3, 2], "x": 10, "y": 1.3}, + {"matrix": [4, 2], "x": 11, "y": 1.5}, + {"matrix": [5, 2], "x": 12, "y": 1.5}, - {"x": 3, "y": 2.75}, - {"x": 4, "y": 2.75}, - {"x": 5, "y": 2.75}, + {"matrix": [9, 3], "x": 3, "y": 2.75}, + {"matrix": [8, 3], "x": 4, "y": 2.75}, + {"matrix": [7, 3], "x": 5, "y": 2.75}, - {"x": 7, "y": 2.75}, - {"x": 8, "y": 2.75}, - {"x": 9, "y": 2.75} + {"matrix": [1, 3], "x": 7, "y": 2.75}, + {"matrix": [0, 3], "x": 8, "y": 2.75}, + {"matrix": [2, 3], "x": 9, "y": 2.75} ] } } diff --git a/keyboards/gboards/gergo/gergo.h b/keyboards/gboards/gergo/gergo.h index 9044b374e3b2..ea6368e2f1cd 100644 --- a/keyboards/gboards/gergo/gergo.h +++ b/keyboards/gboards/gergo/gergo.h @@ -25,28 +25,3 @@ extern i2c_status_t mcp23018_status; #define OLATB 0x15 uint8_t init_mcp23018(void); - -/* ---------- LEFT HAND ----------- ---------- RIGHT HAND ---------- */ -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05, \ - L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16, \ - L20,L21,L22,L23,L24,L25,L26,L30, R30,R20,R21,R22,R23,R24,R25,R26, \ - L31,L32,L33,L34, R31,R32,R33,R34) \ - /* matrix positions */ \ - { \ - { KC_NO, L16, L26, L30}, \ - { L05, L15, L25, L34}, \ - { L04, L14, L24, L33}, \ - { L03, L13, L23, L32}, \ - { L02, L12, L22, L31}, \ - { L01, L11, L21, KC_NO}, \ - { L00, L10, L20, KC_NO}, \ - \ - { KC_NO, R10, R20, R30}, \ - { R00, R11, R21, R31}, \ - { R01, R12, R22, R32}, \ - { R02, R13, R23, R33}, \ - { R03, R14, R24, R34}, \ - { R04, R15, R25, KC_NO}, \ - { R05, R16, R26, KC_NO}, \ -} diff --git a/keyboards/gboards/gergo/info.json b/keyboards/gboards/gergo/info.json index 5aadadbaedf7..53711cb27151 100644 --- a/keyboards/gboards/gergo/info.json +++ b/keyboards/gboards/gergo/info.json @@ -19,270 +19,63 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "L00", - "w": 1.5, - "x": 0, - "y": 0.38 - }, - { - "label": "L01", - "x": 1.5, - "y": 0.38 - }, - { - "label": "L02", - "x": 2.5, - "y": 0.13 - }, - { - "label": "L03", - "x": 3.5, - "y": 0 - }, - { - "label": "L04", - "x": 4.5, - "y": 0.13 - }, - { - "label": "L05", - "x": 5.5, - "y": 0.25 - }, - { - "label": "R00", - "x": 13, - "y": 0.25 - }, - { - "label": "R01", - "x": 14, - "y": 0.13 - }, - { - "label": "R02", - "x": 15, - "y": 0 - }, - { - "label": "R03", - "x": 16, - "y": 0.13 - }, - { - "label": "R04", - "x": 17, - "y": 0.38 - }, - { - "label": "R05", - "w": 1.5, - "x": 18, - "y": 0.38 - }, - { - "label": "L10", - "w": 1.5, - "x": 0, - "y": 1.3800000000000001 - }, - { - "label": "L11", - "x": 1.5, - "y": 1.3800000000000001 - }, - { - "label": "L12", - "x": 2.5, - "y": 1.1300000000000001 - }, - { - "label": "L13", - "x": 3.5, - "y": 1 - }, - { - "label": "L14", - "x": 4.5, - "y": 1.1300000000000001 - }, - { - "label": "L15", - "x": 5.5, - "y": 1.25 - }, - { - "h": 1.5, - "label": "L16", - "x": 6.5, - "y": 0.25 - }, - { - "h": 1.5, - "label": "R10", - "x": 12, - "y": 0.25 - }, - { - "label": "R11", - "x": 13, - "y": 1.25 - }, - { - "label": "R12", - "x": 14, - "y": 1.1300000000000001 - }, - { - "label": "R13", - "x": 15, - "y": 1 - }, - { - "label": "R14", - "x": 16, - "y": 1.1300000000000001 - }, - { - "label": "R15", - "x": 17, - "y": 1.3800000000000001 - }, - { - "label": "R16", - "w": 1.5, - "x": 18, - "y": 1.3800000000000001 - }, - { - "label": "L20", - "w": 1.5, - "x": 0, - "y": 2.38 - }, - { - "label": "L21", - "x": 1.5, - "y": 2.38 - }, - { - "label": "L22", - "x": 2.5, - "y": 2.13 - }, - { - "label": "L23", - "x": 3.5, - "y": 2 - }, - { - "label": "L24", - "x": 4.5, - "y": 2.13 - }, - { - "label": "L25", - "x": 5.5, - "y": 2.25 - }, - { - "h": 1.5, - "label": "L26", - "x": 6.5, - "y": 1.75 - }, - { - "label": "L30", - "x": 8.25, - "y": 2.75 - }, - { - "label": "R30", - "x": 10.25, - "y": 2.75 - }, - { - "h": 1.5, - "label": "R20", - "x": 12, - "y": 1.75 - }, - { - "label": "R21", - "x": 13, - "y": 2.25 - }, - { - "label": "R22", - "x": 14, - "y": 2.13 - }, - { - "label": "R23", - "x": 15, - "y": 2 - }, - { - "label": "R24", - "x": 16, - "y": 2.13 - }, - { - "label": "R25", - "x": 17, - "y": 2.38 - }, - { - "label": "R26", - "w": 1.5, - "x": 18, - "y": 2.38 - }, - { - "label": "L31", - "x": 4.75, - "y": 3.25 - }, - { - "label": "L32", - "x": 6, - "y": 3.63 - }, - { - "h": 2, - "label": "L33", - "x": 7.25, - "y": 3.75 - }, - { - "h": 2, - "label": "L34", - "x": 8.25, - "y": 3.75 - }, - { - "h": 2, - "label": "R31", - "x": 10.25, - "y": 3.75 - }, - { - "h": 2, - "label": "R32", - "x": 11.25, - "y": 3.75 - }, - { - "label": "R33", - "x": 12.5, - "y": 3.63 - }, - { - "label": "R34", - "x": 13.75, - "y": 3.25 - } + {"matrix": [6, 0], "x": 0, "y": 0.38, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 0.38}, + {"matrix": [4, 0], "x": 2.5, "y": 0.13}, + {"matrix": [3, 0], "x": 3.5, "y": 0}, + {"matrix": [2, 0], "x": 4.5, "y": 0.13}, + {"matrix": [1, 0], "x": 5.5, "y": 0.25}, + + {"matrix": [8, 0], "x": 13, "y": 0.25}, + {"matrix": [9, 0], "x": 14, "y": 0.13}, + {"matrix": [10, 0], "x": 15, "y": 0}, + {"matrix": [11, 0], "x": 16, "y": 0.13}, + {"matrix": [12, 0], "x": 17, "y": 0.38}, + {"matrix": [13, 0], "x": 18, "y": 0.38, "w": 1.5}, + + {"matrix": [6, 1], "x": 0, "y": 1.38, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 1.38}, + {"matrix": [4, 1], "x": 2.5, "y": 1.13}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 1], "x": 4.5, "y": 1.13}, + {"matrix": [1, 1], "x": 5.5, "y": 1.25}, + {"matrix": [0, 1], "x": 6.5, "y": 0.25, "h": 1.5}, + + {"matrix": [7, 1], "x": 12, "y": 0.25, "h": 1.5}, + {"matrix": [8, 1], "x": 13, "y": 1.25}, + {"matrix": [9, 1], "x": 14, "y": 1.13}, + {"matrix": [10, 1], "x": 15, "y": 1}, + {"matrix": [11, 1], "x": 16, "y": 1.13}, + {"matrix": [12, 1], "x": 17, "y": 1.38}, + {"matrix": [13, 1], "x": 18, "y": 1.38, "w": 1.5}, + + {"matrix": [6, 2], "x": 0, "y": 2.38, "w": 1.5}, + {"matrix": [5, 2], "x": 1.5, "y": 2.38}, + {"matrix": [4, 2], "x": 2.5, "y": 2.13}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 2], "x": 4.5, "y": 2.13}, + {"matrix": [1, 2], "x": 5.5, "y": 2.25}, + {"matrix": [0, 2], "x": 6.5, "y": 1.75, "h": 1.5}, + {"matrix": [0, 3], "x": 8.25, "y": 2.75}, + + {"matrix": [7, 3], "x": 10.25, "y": 2.75}, + {"matrix": [7, 2], "x": 12, "y": 1.75, "h": 1.5}, + {"matrix": [8, 2], "x": 13, "y": 2.25}, + {"matrix": [9, 2], "x": 14, "y": 2.13}, + {"matrix": [10, 2], "x": 15, "y": 2}, + {"matrix": [11, 2], "x": 16, "y": 2.13}, + {"matrix": [12, 2], "x": 17, "y": 2.38}, + {"matrix": [13, 2], "x": 18, "y": 2.38, "w": 1.5}, + + {"matrix": [4, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 3], "x": 6, "y": 3.63}, + {"matrix": [2, 3], "x": 7.25, "y": 3.75, "h": 2}, + {"matrix": [1, 3], "x": 8.25, "y": 3.75, "h": 2}, + + {"matrix": [8, 3], "x": 10.25, "y": 3.75, "h": 2}, + {"matrix": [9, 3], "x": 11.25, "y": 3.75, "h": 2}, + {"matrix": [10, 3], "x": 12.5, "y": 3.63}, + {"matrix": [11, 3], "x": 13.75, "y": 3.25} ] } } diff --git a/keyboards/gl516/a52gl/a52gl.h b/keyboards/gl516/a52gl/a52gl.h deleted file mode 100644 index 6ff00c541f1d..000000000000 --- a/keyboards/gl516/a52gl/a52gl.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L34, L35, L36, R31, R33, R34, R35, R36 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, KC_NO, L34, L35, L36 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { KC_NO, R31, KC_NO, R33, R34, R35, R36 } \ - } diff --git a/keyboards/gl516/a52gl/info.json b/keyboards/gl516/a52gl/info.json index 033b1f846466..add8dc6c412f 100644 --- a/keyboards/gl516/a52gl/info.json +++ b/keyboards/gl516/a52gl/info.json @@ -13,58 +13,68 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"0,1", "x":1, "y":0}, - {"label":"0,2", "x":2.25, "y":0}, - {"label":"0,3", "x":3.25, "y":0}, - {"label":"0,4", "x":4.25, "y":0}, - {"label":"0,5", "x":5.25, "y":0}, - {"label":"0,6", "x":7.75, "y":0}, - {"label":"4,0", "x":8.75, "y":0}, - {"label":"4,1", "x":9.75, "y":0}, - {"label":"4,2", "x":10.75, "y":0}, - {"label":"4,3", "x":12, "y":0}, - {"label":"4,4", "x":13, "y":0}, - {"label":"4,5", "x":14, "y":0}, - {"label":"4,6", "x":15, "y":0, "w":1.5}, - {"label":"1,0", "x":0, "y":1, "w":1.25}, - {"label":"1,1", "x":1.25, "y":1}, - {"label":"1,2", "x":2.52, "y":1}, - {"label":"1,3", "x":3.52, "y":1}, - {"label":"1,4", "x":4.52, "y":1}, - {"label":"1,5", "x":5.52, "y":1}, - {"label":"1,6", "x":8, "y":1}, - {"label":"5,0", "x":9, "y":1}, - {"label":"5,1", "x":10, "y":1}, - {"label":"5,2", "x":11, "y":1}, - {"label":"5,3", "x":12.25, "y":1}, - {"label":"5,4", "x":13.25, "y":1}, - {"label":"5,5", "x":14.25, "y":1, "w":2.25}, - {"label":"2,0", "x":0, "y":2, "w":1.75}, - {"label":"2,1", "x":1.75, "y":2}, - {"label":"2,2", "x":3.05, "y":2}, - {"label":"2,3", "x":4.05, "y":2}, - {"label":"2,4", "x":5.05, "y":2}, - {"label":"2,5", "x":6.05, "y":2}, - {"label":"2,6", "x":7.5, "y":2}, - {"label":"6,0", "x":8.5, "y":2}, - {"label":"6,1", "x":9.5, "y":2}, - {"label":"6,2", "x":10.5, "y":2}, - {"label":"6,3", "x":12, "y":2}, - {"label":"6,4", "x":13, "y":2}, - {"label":"6,5", "x":14.25, "y":2.25}, - {"label":"6,6", "x":15.5, "y":2}, - {"label":"3,0", "x":0, "y":3, "w":1.25}, - {"label":"3,1", "x":1.25, "y":3, "w":1.25}, - {"label":"3,2", "x":3.05, "y":3}, - {"label":"3,4", "x":4.05, "y":3, "w":2}, - {"label":"3,5", "x":6.05, "y":3}, - {"label":"3,6", "x":7.5, "y":3, "w":2.25}, - {"label":"7,1", "x":9.75, "y":3, "w":1.25}, - {"label":"7,3", "x":12, "y":3}, - {"label":"7,4", "x":13.25, "y":3.25}, - {"label":"7,5", "x":14.25, "y":3.25}, - {"label":"7,6", "x":15.25, "y":3.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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.25, "y": 0}, + + {"matrix": [0, 6], "x": 7.75, "y": 0}, + {"matrix": [4, 0], "x": 8.75, "y": 0}, + {"matrix": [4, 1], "x": 9.75, "y": 0}, + {"matrix": [4, 2], "x": 10.75, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [4, 5], "x": 14, "y": 0}, + {"matrix": [4, 6], "x": 15, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.52, "y": 1}, + {"matrix": [1, 3], "x": 3.52, "y": 1}, + {"matrix": [1, 4], "x": 4.52, "y": 1}, + {"matrix": [1, 5], "x": 5.52, "y": 1}, + + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [5, 0], "x": 9, "y": 1}, + {"matrix": [5, 1], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12.25, "y": 1}, + {"matrix": [5, 4], "x": 13.25, "y": 1}, + {"matrix": [5, 5], "x": 14.25, "y": 1, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 3.05, "y": 2}, + {"matrix": [2, 3], "x": 4.05, "y": 2}, + {"matrix": [2, 4], "x": 5.05, "y": 2}, + {"matrix": [2, 5], "x": 6.05, "y": 2}, + + {"matrix": [2, 6], "x": 7.5, "y": 2}, + {"matrix": [6, 0], "x": 8.5, "y": 2}, + {"matrix": [6, 1], "x": 9.5, "y": 2}, + {"matrix": [6, 2], "x": 10.5, "y": 2}, + {"matrix": [6, 3], "x": 12, "y": 2}, + {"matrix": [6, 4], "x": 13, "y": 2}, + + {"matrix": [6, 5], "x": 14.25, "y": 2.25}, + + {"matrix": [6, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 3.05, "y": 3}, + {"matrix": [3, 4], "x": 4.05, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 6.05, "y": 3}, + + {"matrix": [3, 6], "x": 7.5, "y": 3, "w": 2.25}, + {"matrix": [7, 1], "x": 9.75, "y": 3, "w": 1.25}, + {"matrix": [7, 3], "x": 12, "y": 3}, + + {"matrix": [7, 4], "x": 13.25, "y": 3.25}, + {"matrix": [7, 5], "x": 14.25, "y": 3.25}, + {"matrix": [7, 6], "x": 15.25, "y": 3.25} ] } } diff --git a/keyboards/gl516/j73gl/info.json b/keyboards/gl516/j73gl/info.json index 56bb01dc845e..f74d45fd3cc2 100644 --- a/keyboards/gl516/j73gl/info.json +++ b/keyboards/gl516/j73gl/info.json @@ -16,79 +16,84 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"0,1", "x":1, "y":0}, - {"label":"0,2", "x":2, "y":0}, - {"label":"0,3", "x":3, "y":0}, - {"label":"0,4", "x":4, "y":0}, - {"label":"0,5", "x":5, "y":0}, - {"label":"0,6", "x":6, "y":0}, - {"label":"5,0", "x":7, "y":0}, - {"label":"5,1", "x":8, "y":0}, - {"label":"5,2", "x":9, "y":0}, - {"label":"5,3", "x":10, "y":0}, - {"label":"5,4", "x":11, "y":0}, - {"label":"5,5", "x":12, "y":0}, - {"label":"5,6", "x":13, "y":0}, - {"label":"6,6", "x":14, "y":0}, - {"label":"5,7", "x":15, "y":0}, - {"label":"1,0", "x":0, "y":1, "w":1.5}, - {"label":"1,1", "x":1.5, "y":1}, - {"label":"1,2", "x":2.5, "y":1}, - {"label":"1,3", "x":3.5, "y":1}, - {"label":"1,4", "x":4.5, "y":1}, - {"label":"1,5", "x":5.5, "y":1}, - {"label":"1,6", "x":6.5, "y":1}, - {"label":"6,0", "x":7.5, "y":1}, - {"label":"6,1", "x":8.5, "y":1}, - {"label":"6,2", "x":9.5, "y":1}, - {"label":"6,3", "x":10.5, "y":1}, - {"label":"6,4", "x":11.5, "y":1}, - {"label":"6,5", "x":12.5, "y":1}, - {"label":"6,7", "x":15, "y":1}, - {"label":"2,0", "x":0, "y":2, "w":1.75}, - {"label":"2,1", "x":1.75, "y":2}, - {"label":"2,2", "x":2.75, "y":2}, - {"label":"2,3", "x":3.75, "y":2}, - {"label":"2,4", "x":4.75, "y":2}, - {"label":"2,5", "x":5.75, "y":2}, - {"label":"2,6", "x":6.75, "y":2}, - {"label":"7,0", "x":7.75, "y":2}, - {"label":"7,1", "x":8.75, "y":2}, - {"label":"7,2", "x":9.75, "y":2}, - {"label":"7,3", "x":10.75, "y":2}, - {"label":"7,4", "x":11.75, "y":2}, - {"label":"7,5", "x":12.75, "y":2}, - {"label":"7,6", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"7,7", "x":15, "y":2}, - {"label":"3,0", "x":0, "y":3, "w":2.25}, - {"label":"3,1", "x":2.25, "y":3}, - {"label":"3,2", "x":3.25, "y":3}, - {"label":"3,3", "x":4.25, "y":3}, - {"label":"3,4", "x":5.25, "y":3}, - {"label":"3,5", "x":6.25, "y":3}, - {"label":"3,6", "x":7.25, "y":3}, - {"label":"8,0", "x":8.25, "y":3}, - {"label":"8,1", "x":9.25, "y":3}, - {"label":"8,2", "x":10.25, "y":3}, - {"label":"8,3", "x":11.25, "y":3}, - {"label":"8,5", "x":12.25, "y":3, "w":1.75}, - {"label":"8,6", "x":14, "y":3}, - {"label":"8,7", "x":15, "y":3}, - {"label":"4,0", "x":0, "y":4, "w":1.25}, - {"label":"4,1", "x":1.25, "y":4}, - {"label":"4,2", "x":2.25, "y":4, "w":1.25}, - {"label":"4,3", "x":3.5, "y":4}, - {"label":"4,4", "x":4.5, "y":4, "w":1.25}, - {"label":"4,5", "x":5.75, "y":4}, - {"label":"4,6", "x":6.75, "y":4}, - {"label":"9,0", "x":7.75, "y":4, "w":1.25}, - {"label":"9,1", "x":9, "y":4}, - {"label":"9,2", "x":10, "y":4, "w":1.25}, - {"label":"9,3", "x":11.25, "y":4, "w":1.25}, - {"label":"9,5", "x":13, "y":4}, - {"label":"9,6", "x":14, "y":4}, - {"label":"9,7", "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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + {"matrix": [6, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 7], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [7, 7], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 14, "y": 3}, + {"matrix": [8, 7], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4}, + {"matrix": [4, 6], "x": 6.75, "y": 4}, + {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 9, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [9, 5], "x": 13, "y": 4}, + {"matrix": [9, 6], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4} ] } } diff --git a/keyboards/gl516/j73gl/j73gl.c b/keyboards/gl516/j73gl/j73gl.c index 0e40f29b2abf..f705a0954540 100644 --- a/keyboards/gl516/j73gl/j73gl.c +++ b/keyboards/gl516/j73gl/j73gl.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 "j73gl.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/gl516/j73gl/j73gl.h b/keyboards/gl516/j73gl/j73gl.h deleted file mode 100644 index ad4821461ae0..000000000000 --- a/keyboards/gl516/j73gl/j73gl.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R16, R07, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R17, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R45, R46, R47 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, KC_NO, R35, R36, R37 }, \ - { R40, R41, R42, R43, KC_NO, R45, R46, R47 } \ - } diff --git a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h index b8897ac14ed0..04ef56503ff1 100644 --- a/keyboards/glenpickle/chimera_ergo/chimera_ergo.h +++ b/keyboards/glenpickle/chimera_ergo/chimera_ergo.h @@ -41,22 +41,3 @@ #define set_led_cyan PORTF = PORTF & ~(1<. */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p65/ansi/ansi.h b/keyboards/gmmk/gmmk2/p65/ansi/ansi.h deleted file mode 100644 index 2c25a72bef91..000000000000 --- a/keyboards/gmmk/gmmk2/p65/ansi/ansi.h +++ /dev/null @@ -1,47 +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 1 2 3 4 5 6 7 8 9 0 - = BS 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 Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, k71, k25,\ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k76, k26,\ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, k65,\ - k00, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k07, k35, k01,\ - k06, k15, k23, k31, k36, k33, k03, k73, k05 \ -)\ -{\ - { k00, k01, ___, k03, ___, k05, k06, k07},\ - { k10, k11, k12, k13, k14, k15, ___, k17},\ - { k20, k21, k22, k23, 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, ___, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, ___, k76, k77},\ - { k80, k81, k82, k83, k84, k85, k86, k87} \ -} diff --git a/keyboards/gmmk/gmmk2/p65/ansi/info.json b/keyboards/gmmk/gmmk2/p65/ansi/info.json index 4f72e818edf0..c22fe89f589d 100644 --- a/keyboards/gmmk/gmmk2/p65/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p65/ansi/info.json @@ -24,79 +24,78 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "`", "x": 0, "y": 0 }, - { "label": "1", "x": 1, "y": 0 }, - { "label": "2", "x": 2, "y": 0 }, - { "label": "3", "x": 3, "y": 0 }, - { "label": "4", "x": 4, "y": 0 }, - { "label": "5", "x": 5, "y": 0 }, - { "label": "6", "x": 6, "y": 0 }, - { "label": "7", "x": 7, "y": 0 }, - { "label": "8", "x": 8, "y": 0 }, - { "label": "9", "x": 9, "y": 0 }, - { "label": "0", "x": 10, "y": 0 }, - { "label": "-", "x": 11, "y": 0 }, - { "label": "=", "x": 12, "y": 0 }, - { "label": "Backspace", "x": 13, "y": 0, "w": 2.25}, - { "label": "PgUp", "x": 15.25, "y": 0 }, + {"matrix": [1, 3], "x": 0, "y": 0}, + {"matrix": [1, 7], "x": 1, "y": 0}, + {"matrix": [2, 7], "x": 2, "y": 0}, + {"matrix": [3, 7], "x": 3, "y": 0}, + {"matrix": [4, 7], "x": 4, "y": 0}, + {"matrix": [4, 6], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [6, 7], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [8, 7], "x": 10, "y": 0}, + {"matrix": [8, 6], "x": 11, "y": 0}, + {"matrix": [6, 6], "x": 12, "y": 0}, + {"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25}, + {"matrix": [2, 5], "x": 15.25, "y": 0}, + {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [3, 0], "x": 3.5, "y": 1}, + {"matrix": [4, 0], "x": 4.5, "y": 1}, + {"matrix": [4, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 1], "x": 6.5, "y": 1}, + {"matrix": [5, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 0], "x": 8.5, "y": 1}, + {"matrix": [7, 0], "x": 9.5, "y": 1}, + {"matrix": [8, 0], "x": 10.5, "y": 1}, + {"matrix": [8, 1], "x": 11.5, "y": 1}, + {"matrix": [6, 1], "x": 12.5, "y": 1}, + {"matrix": [7, 6], "x": 13.5, "y": 1, "w": 1.75}, + {"matrix": [2, 6], "x": 15.25, "y": 1}, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "[", "x": 11.5, "y": 1 }, - { "label": "]", "x": 12.5, "y": 1 }, - { "label": "\\", "x": 13.5, "y": 1 , "w": 1.75}, - { "label": "PgDn", "x": 15.25, "y": 1 }, + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 2], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [4, 3], "x": 5.75, "y": 2}, + {"matrix": [5, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 2], "x": 7.75, "y": 2}, + {"matrix": [6, 2], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [8, 2], "x": 10.75, "y": 2}, + {"matrix": [8, 3], "x": 11.75, "y": 2}, + {"matrix": [8, 4], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [6, 5], "x": 15.25, "y": 2}, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ";", "x": 10.75, "y": 2 }, - { "label": "'", "x": 11.75, "y": 2 }, - { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "HOME", "x": 15.25, "y": 2 }, + {"matrix": [0, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [1, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [4, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 5], "x": 7.25, "y": 3}, + {"matrix": [5, 4], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 5], "x": 11.25, "y": 3}, + {"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 14.25, "y": 3}, + {"matrix": [0, 1], "x": 15.25, "y": 3}, + {"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25}, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": ",", "x": 9.25, "y": 3 }, - { "label": ".", "x": 10.25, "y": 3 }, - { "label": "/", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 3 }, - { "label": "END", "x": 15.25, "y": 3 }, - - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 4, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 4, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 4, "w": 1.25}, - { "label": "FN", "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Left", "x": 13.25, "y": 4 }, - { "label": "Down", "x": 14.25, "y": 4 }, - { "label": "Right", "x": 15.25, "y": 4 } + {"matrix": [0, 3], "x": 13.25, "y": 4}, + {"matrix": [7, 3], "x": 14.25, "y": 4}, + {"matrix": [0, 5], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/gmmk/gmmk2/p65/iso/info.json b/keyboards/gmmk/gmmk2/p65/iso/info.json index 1572c34e5f8a..de078864cea4 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/info.json +++ b/keyboards/gmmk/gmmk2/p65/iso/info.json @@ -24,80 +24,79 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "`", "x": 0, "y": 0 }, - { "label": "1", "x": 1, "y": 0 }, - { "label": "2", "x": 2, "y": 0 }, - { "label": "3", "x": 3, "y": 0 }, - { "label": "4", "x": 4, "y": 0 }, - { "label": "5", "x": 5, "y": 0 }, - { "label": "6", "x": 6, "y": 0 }, - { "label": "7", "x": 7, "y": 0 }, - { "label": "8", "x": 8, "y": 0 }, - { "label": "9", "x": 9, "y": 0 }, - { "label": "0", "x": 10, "y": 0 }, - { "label": "-", "x": 11, "y": 0 }, - { "label": "=", "x": 12, "y": 0 }, - { "label": "Backspace", "x": 13, "y": 0, "w": 2.25}, - { "label": "PgUp", "x": 15.25, "y": 0 }, + {"matrix": [1, 3], "x": 0, "y": 0}, + {"matrix": [1, 7], "x": 1, "y": 0}, + {"matrix": [2, 7], "x": 2, "y": 0}, + {"matrix": [3, 7], "x": 3, "y": 0}, + {"matrix": [4, 7], "x": 4, "y": 0}, + {"matrix": [4, 6], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [6, 7], "x": 8, "y": 0}, + {"matrix": [7, 7], "x": 9, "y": 0}, + {"matrix": [8, 7], "x": 10, "y": 0}, + {"matrix": [8, 6], "x": 11, "y": 0}, + {"matrix": [6, 6], "x": 12, "y": 0}, + {"matrix": [7, 1], "x": 13, "y": 0, "w": 2.25}, + {"matrix": [2, 5], "x": 15.25, "y": 0}, + {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [3, 0], "x": 3.5, "y": 1}, + {"matrix": [4, 0], "x": 4.5, "y": 1}, + {"matrix": [4, 1], "x": 5.5, "y": 1}, + {"matrix": [5, 1], "x": 6.5, "y": 1}, + {"matrix": [5, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 0], "x": 8.5, "y": 1}, + {"matrix": [7, 0], "x": 9.5, "y": 1}, + {"matrix": [8, 0], "x": 10.5, "y": 1}, + {"matrix": [8, 1], "x": 11.5, "y": 1}, + {"matrix": [6, 1], "x": 12.5, "y": 1}, + {"matrix": [8, 4], "x": 13.5, "y": 1, "w": 1.75, "h": 2}, + {"matrix": [2, 6], "x": 15.25, "y": 1}, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "[", "x": 11.5, "y": 1 }, - { "label": "]", "x": 12.5, "y": 1 }, - { "label": "Enter", "x": 13.5, "y": 1 ,"h":2, "w": 1.75}, - { "label": "PgDn", "x": 15.25, "y": 1 }, + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [1, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 2], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [4, 3], "x": 5.75, "y": 2}, + {"matrix": [5, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 2], "x": 7.75, "y": 2}, + {"matrix": [6, 2], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [8, 2], "x": 10.75, "y": 2}, + {"matrix": [8, 3], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [6, 5], "x": 15.25, "y": 2}, - { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ";", "x": 10.75, "y": 2 }, - { "label": "'", "x": 11.75, "y": 2 }, - { "label": "#", "x": 12.75, "y": 2 }, - { "label": "HOME", "x": 15.25, "y": 2 }, + {"matrix": [0, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 2], "x": 1.25, "y": 3}, + {"matrix": [1, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [4, 4], "x": 5.25, "y": 3}, + {"matrix": [4, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 5], "x": 7.25, "y": 3}, + {"matrix": [5, 4], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [8, 5], "x": 11.25, "y": 3}, + {"matrix": [0, 7], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 14.25, "y": 3}, + {"matrix": [0, 1], "x": 15.25, "y": 3}, + {"matrix": [0, 6], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [2, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [3, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [3, 6], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [3, 3], "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Shift", "x": 0, "y": 3, "w": 1.25}, - { "label": "\\", "x": 1.25, "y": 3 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": ",", "x": 9.25, "y": 3 }, - { "label": ".", "x": 10.25, "y": 3 }, - { "label": "/", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 3 }, - { "label": "END", "x": 15.25, "y": 3 }, - - { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 4, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 4, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 4, "w": 1.25}, - { "label": "FN", "x": 11.25, "y": 4, "w": 1.25}, - { "label": "Left", "x": 13.25, "y": 4 }, - { "label": "Down", "x": 14.25, "y": 4 }, - { "label": "Right", "x": 15.25, "y": 4 } + {"matrix": [0, 3], "x": 13.25, "y": 4}, + {"matrix": [7, 3], "x": 14.25, "y": 4}, + {"matrix": [0, 5], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.c b/keyboards/gmmk/gmmk2/p65/iso/iso.c index 1a703538293c..a296844f4403 100644 --- a/keyboards/gmmk/gmmk2/p65/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p65/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p65/iso/iso.h b/keyboards/gmmk/gmmk2/p65/iso/iso.h deleted file mode 100644 index 206647cf7937..000000000000 --- a/keyboards/gmmk/gmmk2/p65/iso/iso.h +++ /dev/null @@ -1,47 +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 1 2 3 4 5 6 7 8 9 0 - = BS PgUp -// Tab Q W E R T Y U I O P [ ] Enter PgUp -// Caps A S D F G H J K L ; ' \ Enter HOME -// Sh_L \ Z X C V B N M , . / Sh_R Up END -// Ct_L Win_L Alt_L SPACE Alt_R FN Left Down Right - -// clang-format off -#define LAYOUT( \ - k13, k17, k27, k37, k47, k46, k56, k57, k67, k77, k87, k86, k66, k71, k25,\ - k11, k10, k20, k30, k40, k41, k51, k50, k60, k70, k80, k81, k61, k84, k26,\ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k75, k65,\ - k00, k02, k14, k24, k34, k44, k45, k55, k54, k64, k74, k85, k07, k35, k01,\ - k06, k15, k23, k31, k36, k33, k03, k73, k05 \ -)\ -{\ - { k00, k01, k02, k03, ___, k05, k06, k07},\ - { k10, k11, k12, k13, k14, k15, ___, k17},\ - { k20, k21, k22, k23, 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, ___, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, k75, ___, k77},\ - { k80, k81, k82, k83, k84, k85, k86, k87} \ -} diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c index 808b175555d0..467765e435e4 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.c +++ b/keyboards/gmmk/gmmk2/p96/ansi/ansi.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ansi.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p96/ansi/ansi.h b/keyboards/gmmk/gmmk2/p96/ansi/ansi.h deleted file mode 100644 index d449a198df63..000000000000 --- a/keyboards/gmmk/gmmk2/p96/ansi/ansi.h +++ /dev/null @@ -1,54 +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 Del Ins PgUp PgDn -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Num / * - -// Tab Q W E R T Y U I O P [ ] \\ 7 8 9 + -// Caps A S D F G H J K L ; ' Enter 4 5 6 + -// Sh_L Z X C V B N M , . / Sh_R Up 1 2 3 Enter -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right 0 . Enter - -// clang-format off -#define LAYOUT( \ - k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, k06, k16, k26, k36,\ - k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, k46, k56, k66, k76,\ - k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd2, k86, k96, ka6, kb6,\ - k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kd3, ka7, kb7, kc7, \ - k04, k24, k34, k44, k54, k64, k74, k84, k94, ka4, kb4, kd4, k17, k67, k77, k87, k97,\ - k05, k15, k25, k65, k95, ka5, kc5, k07, k27, k37, k47, k57 \ -)\ -{\ - { k00, k01, k02, k03, k04, k05, k06, k07},\ - { k10, k11, k12, k13, ___, k15, k16, k17},\ - { k20, k21, k22, k23, k24, k25, k26, k27},\ - { k30, k31, k32, k33, k34, ___, k36, k37},\ - { k40, k41, k42, k43, k44, ___, k46, k47},\ - { k50, k51, k52, k53, k54, ___, k56, k57},\ - { k60, k61, k62, k63, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, ___, k76, k77},\ - { k80, k81, k82, k83, k84, ___, k86, k87},\ - { k90, k91, k92, k93, k94, k95, k96, k97},\ - { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7},\ - { kb0, kb1, kb2, kb3, kb4, ___, kb6, kb7},\ - { kc0, kc1, kc2, ___, ___, kc5, ___, kc7},\ - { kd0, kd1, kd2, kd3, kd4, ___, ___, ___} \ -} diff --git a/keyboards/gmmk/gmmk2/p96/ansi/info.json b/keyboards/gmmk/gmmk2/p96/ansi/info.json index 4ed89902da10..482e52f5044a 100644 --- a/keyboards/gmmk/gmmk2/p96/ansi/info.json +++ b/keyboards/gmmk/gmmk2/p96/ansi/info.json @@ -21,114 +21,122 @@ "layouts": { "LAYOUT": { "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": "Printscreen", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.5, "y": 0 }, - { "label": "Insert", "x": 16.5, "y": 0 }, - { "label": "Page Up", "x": 17.5, "y": 0 }, - { "label": "Page Down", "x": 18.5, "y": 0 }, - - { "label": "`", "x": 0, "y": 1 }, - { "label": "1", "x": 1, "y": 1 }, - { "label": "2", "x": 2, "y": 1 }, - { "label": "3", "x": 3, "y": 1 }, - { "label": "4", "x": 4, "y": 1 }, - { "label": "5", "x": 5, "y": 1 }, - { "label": "6", "x": 6, "y": 1 }, - { "label": "7", "x": 7, "y": 1 }, - { "label": "8", "x": 8, "y": 1 }, - { "label": "9", "x": 9, "y": 1 }, - { "label": "0", "x": 10, "y": 1 }, - { "label": "-", "x": 11, "y": 1 }, - { "label": "=", "x": 12, "y": 1 }, - { "label": "Backspace", "x": 13, "y": 1, "w": 2}, - { "label": "Num Lock", "x": 15.5, "y": 1 }, - { "label": "/", "x": 16.5, "y": 1 }, - { "label": "*", "x": 17.5, "y": 1 }, - { "label": "-", "x": 18.5, "y": 1 }, - - { "label": "Tab", "x": 0, "y": 2, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 2 }, - { "label": "W", "x": 2.5, "y": 2 }, - { "label": "E", "x": 3.5, "y": 2 }, - { "label": "R", "x": 4.5, "y": 2 }, - { "label": "T", "x": 5.5, "y": 2 }, - { "label": "Y", "x": 6.5, "y": 2 }, - { "label": "U", "x": 7.5, "y": 2 }, - { "label": "I", "x": 8.5, "y": 2 }, - { "label": "O", "x": 9.5, "y": 2 }, - { "label": "P", "x": 10.5, "y": 2 }, - { "label": "[", "x": 11.5, "y": 2 }, - { "label": "]", "x": 12.5, "y": 2 }, - { "label": "\\", "x": 13.5, "y": 2 , "w": 1.25}, - { "label": "7", "x": 15.5, "y": 2 }, - { "label": "8", "x": 16.5, "y": 2 }, - { "label": "9", "x": 17.5, "y": 2, "w": 1.5}, - { "label": "+", "x": 18.5, "y": 2 ,"h":2}, - - { "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 3 }, - { "label": "S", "x": 2.75, "y": 3 }, - { "label": "D", "x": 3.75, "y": 3 }, - { "label": "F", "x": 4.75, "y": 3 }, - { "label": "G", "x": 5.75, "y": 3 }, - { "label": "H", "x": 6.75, "y": 3 }, - { "label": "J", "x": 7.75, "y": 3 }, - { "label": "K", "x": 8.75, "y": 3 }, - { "label": "L", "x": 9.75, "y": 3 }, - { "label": ";", "x": 10.75, "y": 3 }, - { "label": "'", "x": 11.75, "y": 3 }, - { "label": "Enter", "x": 12.75, "y": 3, "w": 2.25 }, - { "label": "4", "x": 15.5, "y": 3 }, - { "label": "5", "x": 16.5, "y": 3 }, - { "label": "6", "x": 17.5, "y": 3 }, - - { "label": "Shift", "x": 0, "y": 4, "w": 2.25}, - { "label": "Z", "x": 2.25, "y": 4 }, - { "label": "X", "x": 3.25, "y": 4 }, - { "label": "C", "x": 4.25, "y": 4 }, - { "label": "V", "x": 5.25, "y": 4 }, - { "label": "B", "x": 6.25, "y": 4 }, - { "label": "N", "x": 7.25, "y": 4 }, - { "label": "M", "x": 8.25, "y": 4 }, - { "label": ",", "x": 9.25, "y": 4 }, - { "label": ".", "x": 10.25, "y": 4 }, - { "label": "/", "x": 11.25, "y": 4 }, - { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 4 }, - { "label": "1", "x": 15.5, "y": 4 }, - { "label": "2", "x": 16.5, "y": 4 }, - { "label": "3", "x": 17.5, "y": 4 }, - { "label": "Enter", "x": 18.5, "y": 4 ,"h":2}, - - { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 5, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 5, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 5 }, - { "label": "FN", "x": 11, "y": 5 }, - { "label": "Ctrl", "x": 12, "y": 5 }, - { "label": "Left", "x": 13.25, "y": 5 }, - { "label": "Down", "x": 14.25, "y": 5 }, - { "label": "Right", "x": 15.25, "y": 5 }, - { "label": "0", "x": 16.5, "y": 5 }, - { "label": ".", "x": 17.5, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [2, 0], "x": 2.25, "y": 0}, + {"matrix": [3, 0], "x": 3.25, "y": 0}, + {"matrix": [4, 0], "x": 4.25, "y": 0}, + + {"matrix": [5, 0], "x": 5.5, "y": 0}, + {"matrix": [6, 0], "x": 6.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [8, 0], "x": 8.5, "y": 0}, + + {"matrix": [9, 0], "x": 9.75, "y": 0}, + {"matrix": [10, 0], "x": 10.75, "y": 0}, + {"matrix": [11, 0], "x": 11.75, "y": 0}, + {"matrix": [12, 0], "x": 12.75, "y": 0}, + + {"matrix": [13, 0], "x": 14, "y": 0}, + + {"matrix": [0, 6], "x": 15.5, "y": 0}, + {"matrix": [1, 6], "x": 16.5, "y": 0}, + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [3, 6], "x": 18.5, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [4, 1], "x": 4, "y": 1}, + {"matrix": [5, 1], "x": 5, "y": 1}, + {"matrix": [6, 1], "x": 6, "y": 1}, + {"matrix": [7, 1], "x": 7, "y": 1}, + {"matrix": [8, 1], "x": 8, "y": 1}, + {"matrix": [9, 1], "x": 9, "y": 1}, + {"matrix": [10, 1], "x": 10, "y": 1}, + {"matrix": [11, 1], "x": 11, "y": 1}, + {"matrix": [12, 1], "x": 12, "y": 1}, + {"matrix": [13, 1], "x": 13, "y": 1, "w": 2}, + + {"matrix": [4, 6], "x": 15.5, "y": 1}, + {"matrix": [5, 6], "x": 16.5, "y": 1}, + {"matrix": [6, 6], "x": 17.5, "y": 1}, + {"matrix": [7, 6], "x": 18.5, "y": 1}, + + {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2}, + {"matrix": [5, 2], "x": 5.5, "y": 2}, + {"matrix": [6, 2], "x": 6.5, "y": 2}, + {"matrix": [7, 2], "x": 7.5, "y": 2}, + {"matrix": [8, 2], "x": 8.5, "y": 2}, + {"matrix": [9, 2], "x": 9.5, "y": 2}, + {"matrix": [10, 2], "x": 10.5, "y": 2}, + {"matrix": [11, 2], "x": 11.5, "y": 2}, + {"matrix": [12, 2], "x": 12.5, "y": 2}, + {"matrix": [13, 2], "x": 13.5, "y": 2, "w": 1.25}, + + {"matrix": [8, 6], "x": 15.5, "y": 2}, + {"matrix": [9, 6], "x": 16.5, "y": 2}, + {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5}, + {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2}, + + {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [1, 3], "x": 1.75, "y": 3}, + {"matrix": [2, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [4, 3], "x": 4.75, "y": 3}, + {"matrix": [5, 3], "x": 5.75, "y": 3}, + {"matrix": [6, 3], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [8, 3], "x": 8.75, "y": 3}, + {"matrix": [9, 3], "x": 9.75, "y": 3}, + {"matrix": [10, 3], "x": 10.75, "y": 3}, + {"matrix": [11, 3], "x": 11.75, "y": 3}, + {"matrix": [13, 3], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [10, 7], "x": 15.5, "y": 3}, + {"matrix": [11, 7], "x": 16.5, "y": 3}, + {"matrix": [12, 7], "x": 17.5, "y": 3}, + + {"matrix": [0, 4], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [2, 4], "x": 2.25, "y": 4}, + {"matrix": [3, 4], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 4], "x": 5.25, "y": 4}, + {"matrix": [6, 4], "x": 6.25, "y": 4}, + {"matrix": [7, 4], "x": 7.25, "y": 4}, + {"matrix": [8, 4], "x": 8.25, "y": 4}, + {"matrix": [9, 4], "x": 9.25, "y": 4}, + {"matrix": [10, 4], "x": 10.25, "y": 4}, + {"matrix": [11, 4], "x": 11.25, "y": 4}, + {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [1, 7], "x": 14.25, "y": 4}, + + {"matrix": [6, 7], "x": 15.5, "y": 4}, + {"matrix": [7, 7], "x": 16.5, "y": 4}, + {"matrix": [8, 7], "x": 17.5, "y": 4}, + {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2}, + + {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5}, + {"matrix": [10, 5], "x": 11, "y": 5}, + {"matrix": [12, 5], "x": 12, "y": 5}, + + {"matrix": [0, 7], "x": 13.25, "y": 5}, + {"matrix": [2, 7], "x": 14.25, "y": 5}, + {"matrix": [3, 7], "x": 15.25, "y": 5}, + + {"matrix": [4, 7], "x": 16.5, "y": 5}, + {"matrix": [5, 7], "x": 17.5, "y": 5} ] } } diff --git a/keyboards/gmmk/gmmk2/p96/iso/info.json b/keyboards/gmmk/gmmk2/p96/iso/info.json index 192e274245c0..de9eb07edcf8 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/info.json +++ b/keyboards/gmmk/gmmk2/p96/iso/info.json @@ -21,115 +21,123 @@ "layouts": { "LAYOUT": { "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": "Printscreen", "x": 14, "y": 0 }, - { "label": "Delete", "x": 15.5, "y": 0 }, - { "label": "Insert", "x": 16.5, "y": 0 }, - { "label": "Page Up", "x": 17.5, "y": 0 }, - { "label": "Page Down", "x": 18.5, "y": 0 }, - - { "label": "`", "x": 0, "y": 1 }, - { "label": "1", "x": 1, "y": 1 }, - { "label": "2", "x": 2, "y": 1 }, - { "label": "3", "x": 3, "y": 1 }, - { "label": "4", "x": 4, "y": 1 }, - { "label": "5", "x": 5, "y": 1 }, - { "label": "6", "x": 6, "y": 1 }, - { "label": "7", "x": 7, "y": 1 }, - { "label": "8", "x": 8, "y": 1 }, - { "label": "9", "x": 9, "y": 1 }, - { "label": "0", "x": 10, "y": 1 }, - { "label": "-", "x": 11, "y": 1 }, - { "label": "=", "x": 12, "y": 1 }, - { "label": "Backspace", "x": 13, "y": 1, "w": 2}, - { "label": "Num Lock", "x": 15.5, "y": 1 }, - { "label": "/", "x": 16.5, "y": 1 }, - { "label": "*", "x": 17.5, "y": 1 }, - { "label": "-", "x": 18.5, "y": 1 }, - - { "label": "Tab", "x": 0, "y": 2, "w": 1.5}, - { "label": "Q", "x": 1.5, "y": 2 }, - { "label": "W", "x": 2.5, "y": 2 }, - { "label": "E", "x": 3.5, "y": 2 }, - { "label": "R", "x": 4.5, "y": 2 }, - { "label": "T", "x": 5.5, "y": 2 }, - { "label": "Y", "x": 6.5, "y": 2 }, - { "label": "U", "x": 7.5, "y": 2 }, - { "label": "I", "x": 8.5, "y": 2 }, - { "label": "O", "x": 9.5, "y": 2 }, - { "label": "P", "x": 10.5, "y": 2 }, - { "label": "[", "x": 11.5, "y": 2 }, - { "label": "]", "x": 12.5, "y": 2 }, - { "label": "Enter", "x": 13.5, "y": 2 ,"h":2, "w": 1.25}, - { "label": "7", "x": 15.5, "y": 2 }, - { "label": "8", "x": 16.5, "y": 2 }, - { "label": "9", "x": 17.5, "y": 2, "w": 1.5}, - { "label": "+", "x": 18.5, "y": 2 ,"h":2}, - - { "label": "Caps Lock", "x": 0, "y": 3, "w": 1.75}, - { "label": "A", "x": 1.75, "y": 3 }, - { "label": "S", "x": 2.75, "y": 3 }, - { "label": "D", "x": 3.75, "y": 3 }, - { "label": "F", "x": 4.75, "y": 3 }, - { "label": "G", "x": 5.75, "y": 3 }, - { "label": "H", "x": 6.75, "y": 3 }, - { "label": "J", "x": 7.75, "y": 3 }, - { "label": "K", "x": 8.75, "y": 3 }, - { "label": "L", "x": 9.75, "y": 3 }, - { "label": ";", "x": 10.75, "y": 3 }, - { "label": "'", "x": 11.75, "y": 3 }, - { "label": "#", "x": 12.75, "y": 3 }, - { "label": "4", "x": 15.5, "y": 3 }, - { "label": "5", "x": 16.5, "y": 3 }, - { "label": "6", "x": 17.5, "y": 3 }, - - { "label": "Shift", "x": 0, "y": 4, "w": 1.25}, - { "label": "\\", "x": 1.25, "y": 4 }, - { "label": "Z", "x": 2.25, "y": 4 }, - { "label": "X", "x": 3.25, "y": 4 }, - { "label": "C", "x": 4.25, "y": 4 }, - { "label": "V", "x": 5.25, "y": 4 }, - { "label": "B", "x": 6.25, "y": 4 }, - { "label": "N", "x": 7.25, "y": 4 }, - { "label": "M", "x": 8.25, "y": 4 }, - { "label": ",", "x": 9.25, "y": 4 }, - { "label": ".", "x": 10.25, "y": 4 }, - { "label": "/", "x": 11.25, "y": 4 }, - { "label": "Shift", "x": 12.25, "y": 4, "w": 1.75}, - { "label": "Up", "x": 14.25, "y": 4 }, - { "label": "1", "x": 15.5, "y": 4 }, - { "label": "2", "x": 16.5, "y": 4 }, - { "label": "3", "x": 17.5, "y": 4 }, - { "label": "Enter", "x": 18.5, "y": 4 ,"h":2}, - - { "label": "Ctrl", "x": 0, "y": 5, "w": 1.25}, - { "label": "Win", "x": 1.25, "y": 5, "w": 1.25}, - { "label": "Alt", "x": 2.5, "y": 5, "w": 1.25}, - { "label": "Space", "x": 3.75, "y": 5, "w": 6.25}, - { "label": "Alt", "x": 10, "y": 5 }, - { "label": "FN", "x": 11, "y": 5 }, - { "label": "Ctrl", "x": 12, "y": 5 }, - { "label": "Left", "x": 13.25, "y": 5 }, - { "label": "Down", "x": 14.25, "y": 5 }, - { "label": "Right", "x": 15.25, "y": 5 }, - { "label": "0", "x": 16.5, "y": 5 }, - { "label": ".", "x": 17.5, "y": 5 } + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [2, 0], "x": 2.25, "y": 0}, + {"matrix": [3, 0], "x": 3.25, "y": 0}, + {"matrix": [4, 0], "x": 4.25, "y": 0}, + + {"matrix": [5, 0], "x": 5.5, "y": 0}, + {"matrix": [6, 0], "x": 6.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [8, 0], "x": 8.5, "y": 0}, + + {"matrix": [9, 0], "x": 9.75, "y": 0}, + {"matrix": [10, 0], "x": 10.75, "y": 0}, + {"matrix": [11, 0], "x": 11.75, "y": 0}, + {"matrix": [12, 0], "x": 12.75, "y": 0}, + + {"matrix": [13, 0], "x": 14, "y": 0}, + + {"matrix": [0, 6], "x": 15.5, "y": 0}, + {"matrix": [1, 6], "x": 16.5, "y": 0}, + {"matrix": [2, 6], "x": 17.5, "y": 0}, + {"matrix": [3, 6], "x": 18.5, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [4, 1], "x": 4, "y": 1}, + {"matrix": [5, 1], "x": 5, "y": 1}, + {"matrix": [6, 1], "x": 6, "y": 1}, + {"matrix": [7, 1], "x": 7, "y": 1}, + {"matrix": [8, 1], "x": 8, "y": 1}, + {"matrix": [9, 1], "x": 9, "y": 1}, + {"matrix": [10, 1], "x": 10, "y": 1}, + {"matrix": [11, 1], "x": 11, "y": 1}, + {"matrix": [12, 1], "x": 12, "y": 1}, + {"matrix": [13, 1], "x": 13, "y": 1, "w": 2}, + + {"matrix": [4, 6], "x": 15.5, "y": 1}, + {"matrix": [5, 6], "x": 16.5, "y": 1}, + {"matrix": [6, 6], "x": 17.5, "y": 1}, + {"matrix": [7, 6], "x": 18.5, "y": 1}, + + {"matrix": [0, 2], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 2], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2}, + {"matrix": [5, 2], "x": 5.5, "y": 2}, + {"matrix": [6, 2], "x": 6.5, "y": 2}, + {"matrix": [7, 2], "x": 7.5, "y": 2}, + {"matrix": [8, 2], "x": 8.5, "y": 2}, + {"matrix": [9, 2], "x": 9.5, "y": 2}, + {"matrix": [10, 2], "x": 10.5, "y": 2}, + {"matrix": [11, 2], "x": 11.5, "y": 2}, + {"matrix": [12, 2], "x": 12.5, "y": 2}, + {"matrix": [13, 3], "x": 13.5, "y": 2, "w": 1.25, "h": 2}, + + {"matrix": [8, 6], "x": 15.5, "y": 2}, + {"matrix": [9, 6], "x": 16.5, "y": 2}, + {"matrix": [10, 6], "x": 17.5, "y": 2, "w": 1.5}, + {"matrix": [11, 6], "x": 18.5, "y": 2, "h": 2}, + + {"matrix": [0, 3], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [1, 3], "x": 1.75, "y": 3}, + {"matrix": [2, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [4, 3], "x": 4.75, "y": 3}, + {"matrix": [5, 3], "x": 5.75, "y": 3}, + {"matrix": [6, 3], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [8, 3], "x": 8.75, "y": 3}, + {"matrix": [9, 3], "x": 9.75, "y": 3}, + {"matrix": [10, 3], "x": 10.75, "y": 3}, + {"matrix": [11, 3], "x": 11.75, "y": 3}, + {"matrix": [12, 3], "x": 12.75, "y": 3}, + + {"matrix": [10, 7], "x": 15.5, "y": 3}, + {"matrix": [11, 7], "x": 16.5, "y": 3}, + {"matrix": [12, 7], "x": 17.5, "y": 3}, + + {"matrix": [0, 4], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 4], "x": 1.25, "y": 4}, + {"matrix": [2, 4], "x": 2.25, "y": 4}, + {"matrix": [3, 4], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [5, 4], "x": 5.25, "y": 4}, + {"matrix": [6, 4], "x": 6.25, "y": 4}, + {"matrix": [7, 4], "x": 7.25, "y": 4}, + {"matrix": [8, 4], "x": 8.25, "y": 4}, + {"matrix": [9, 4], "x": 9.25, "y": 4}, + {"matrix": [10, 4], "x": 10.25, "y": 4}, + {"matrix": [11, 4], "x": 11.25, "y": 4}, + {"matrix": [13, 4], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [1, 7], "x": 14.25, "y": 4}, + + {"matrix": [6, 7], "x": 15.5, "y": 4}, + {"matrix": [7, 7], "x": 16.5, "y": 4}, + {"matrix": [8, 7], "x": 17.5, "y": 4}, + {"matrix": [9, 7], "x": 18.5, "y": 4, "h": 2}, + + {"matrix": [0, 5], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [9, 5], "x": 10, "y": 5}, + {"matrix": [10, 5], "x": 11, "y": 5}, + {"matrix": [12, 5], "x": 12, "y": 5}, + + {"matrix": [0, 7], "x": 13.25, "y": 5}, + {"matrix": [2, 7], "x": 14.25, "y": 5}, + {"matrix": [3, 7], "x": 15.25, "y": 5}, + + {"matrix": [4, 7], "x": 16.5, "y": 5}, + {"matrix": [5, 7], "x": 17.5, "y": 5} ] } } diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.c b/keyboards/gmmk/gmmk2/p96/iso/iso.c index dc9f7be68290..40d28818b07c 100644 --- a/keyboards/gmmk/gmmk2/p96/iso/iso.c +++ b/keyboards/gmmk/gmmk2/p96/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/gmmk/gmmk2/p96/iso/iso.h b/keyboards/gmmk/gmmk2/p96/iso/iso.h deleted file mode 100644 index f575befdc133..000000000000 --- a/keyboards/gmmk/gmmk2/p96/iso/iso.h +++ /dev/null @@ -1,54 +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 Del Ins PgUp PgDn -// ` 1 2 3 4 5 6 7 8 9 0 - = BSpc Num / * - -// Tab Q W E R T Y U I O P [ ] Enter 7 8 9 + -// Caps A S D F G H J K L ; ' # Enter 4 5 6 + -// Sh_L \ Z X C V B N M , . / Sh_R Up 1 2 3 Enter -// Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right 0 . Enter - -// clang-format off -#define LAYOUT( \ - k00, k10, k20, k30, k40, k50, k60, k70, k80, k90, ka0, kb0, kc0, kd0, k06, k16, k26, k36,\ - k01, k11, k21, k31, k41, k51, k61, k71, k81, k91, ka1, kb1, kc1, kd1, k46, k56, k66, k76,\ - k02, k12, k22, k32, k42, k52, k62, k72, k82, k92, ka2, kb2, kc2, kd3, k86, k96, ka6, kb6,\ - k03, k13, k23, k33, k43, k53, k63, k73, k83, k93, ka3, kb3, kc3, ka7, kb7, kc7, \ - k04, k14, k24, k34, k44, k54, k64, k74, k84, k94, ka4, kb4, kd4, k17, k67, k77, k87, k97,\ - k05, k15, k25, k65, k95, ka5, kc5, k07, k27, k37, k47, k57 \ -)\ -{\ - { k00, k01, k02, k03, k04, k05, k06, k07},\ - { k10, k11, k12, k13, k14, k15, k16, k17},\ - { k20, k21, k22, k23, k24, k25, k26, k27},\ - { k30, k31, k32, k33, k34, ___, k36, k37},\ - { k40, k41, k42, k43, k44, ___, k46, k47},\ - { k50, k51, k52, k53, k54, ___, k56, k57},\ - { k60, k61, k62, k63, k64, k65, k66, k67},\ - { k70, k71, k72, k73, k74, ___, k76, k77},\ - { k80, k81, k82, k83, k84, ___, k86, k87},\ - { k90, k91, k92, k93, k94, k95, k96, k97},\ - { ka0, ka1, ka2, ka3, ka4, ka5, ka6, ka7},\ - { kb0, kb1, kb2, kb3, kb4, ___, kb6, kb7},\ - { kc0, kc1, kc2, kc3, ___, kc5, ___, kc7},\ - { kd0, kd1, ___, kd3, kd4, ___, ___, ___} \ -} diff --git a/keyboards/gmmk/pro/rev1/ansi/ansi.c b/keyboards/gmmk/pro/rev1/ansi/ansi.c index 3fc45d61d00a..9cd6a3739c3c 100644 --- a/keyboards/gmmk/pro/rev1/ansi/ansi.c +++ b/keyboards/gmmk/pro/rev1/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/rev1/ansi/ansi.h b/keyboards/gmmk/pro/rev1/ansi/ansi.h deleted file mode 100644 index 9a6ae0f49ed6..000000000000 --- a/keyboards/gmmk/pro/rev1/ansi/ansi.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Gigahawk - * - * 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/rev1/ansi/info.json b/keyboards/gmmk/pro/rev1/ansi/info.json index 749a2ef47d83..7a1532424bde 100644 --- a/keyboards/gmmk/pro/rev1/ansi/info.json +++ b/keyboards/gmmk/pro/rev1/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} ] } } diff --git a/keyboards/gmmk/pro/rev1/iso/info.json b/keyboards/gmmk/pro/rev1/iso/info.json index 45656419b983..7b78ca57163a 100644 --- a/keyboards/gmmk/pro/rev1/iso/info.json +++ b/keyboards/gmmk/pro/rev1/iso/info.json @@ -29,105 +29,106 @@ "layouts": { "LAYOUT": { "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":"Printscreen", "x":14, "y":0}, - {"label":"Rotary", "x":15.5, "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":"Delete", "x":15.5, "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":"Page Up", "x":15.5, "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":2.25, "w":1.25, "h":2}, - - {"label":"Page Down", "x":15.5, "y":3.25}, - - {"label":"Shift", "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":"Shift", "x":12.25, "y":4.25, "w":1.75}, - - {"label":"Up", "x":14.25, "y":4.5}, - - {"label":"End", "x":15.5, "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}, - {"label":"Fn", "x":11, "y":5.25}, - {"label":"Ctrl", "x":12, "y":5.25}, - - {"label":"Left", "x":13.25, "y":5.5}, - {"label":"Down", "x":14.25, "y":5.5}, - {"label":"Right", "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": [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": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [10, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [2, 3], "x": 1.25, "y": 4.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} ] } } diff --git a/keyboards/gmmk/pro/rev1/iso/iso.c b/keyboards/gmmk/pro/rev1/iso/iso.c index babb6bd6c73d..0ded23162f6c 100644 --- a/keyboards/gmmk/pro/rev1/iso/iso.c +++ b/keyboards/gmmk/pro/rev1/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev1/iso/iso.h b/keyboards/gmmk/pro/rev1/iso/iso.h deleted file mode 100644 index ad3b46cb97b4..000000000000 --- a/keyboards/gmmk/pro/rev1/iso/iso.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2021 Gigahawk - * - * 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, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, ka4, k25, \ - k00, k23, 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, k23, 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, k84, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gmmk/pro/rev2/ansi/ansi.c b/keyboards/gmmk/pro/rev2/ansi/ansi.c index c22fbc796d8d..ccdcd427268b 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 b4a67dfd18d9..000000000000 --- 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 44b68750be32..ff693e35739b 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} ] } } diff --git a/keyboards/gmmk/pro/rev2/iso/info.json b/keyboards/gmmk/pro/rev2/iso/info.json index 12f2365dc89a..972551ec4138 100644 --- a/keyboards/gmmk/pro/rev2/iso/info.json +++ b/keyboards/gmmk/pro/rev2/iso/info.json @@ -29,105 +29,106 @@ "layouts": { "LAYOUT": { "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":"Printscreen", "x":14, "y":0}, - {"label":"Rotary", "x":15.5, "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":"Delete", "x":15.5, "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":"Page Up", "x":15.5, "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":2.25, "w":1.25, "h":2}, - - {"label":"Page Down", "x":15.5, "y":3.25}, - - {"label":"Shift", "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":"Shift", "x":12.25, "y":4.25, "w":1.75}, - - {"label":"Up", "x":14.25, "y":4.5}, - - {"label":"End", "x":15.5, "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}, - {"label":"Fn", "x":11, "y":5.25}, - {"label":"Ctrl", "x":12, "y":5.25}, - - {"label":"Left", "x":13.25, "y":5.5}, - {"label":"Down", "x":14.25, "y":5.5}, - {"label":"Right", "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": [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": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [10, 4], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [2, 5], "x": 15.5, "y": 3.25}, + + {"matrix": [0, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [2, 3], "x": 1.25, "y": 4.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} ] } } diff --git a/keyboards/gmmk/pro/rev2/iso/iso.c b/keyboards/gmmk/pro/rev2/iso/iso.c index 20626ff9c5a8..e056ff6c12b1 100644 --- a/keyboards/gmmk/pro/rev2/iso/iso.c +++ b/keyboards/gmmk/pro/rev2/iso/iso.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // clang-format off diff --git a/keyboards/gmmk/pro/rev2/iso/iso.h b/keyboards/gmmk/pro/rev2/iso/iso.h deleted file mode 100644 index 3c1291ff1b7a..000000000000 --- a/keyboards/gmmk/pro/rev2/iso/iso.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, k15, \ - k21, k12, k22, k32, k42, k43, k53, k52, k62, k72, k82, k83, k84, ka4, k25, \ - k00, k23, 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, k23, 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, k84, k85, k86, k87}, \ - { k90, k91, k92, k93, k94, k95, ___, k97}, \ - { ___, ka1, ___, ka3, ka4, ka5, ka6, ka7} \ -} -// clang-format on diff --git a/keyboards/gray_studio/apollo80/apollo80.h b/keyboards/gray_studio/apollo80/apollo80.h deleted file mode 100644 index be3a3ee54d81..000000000000 --- a/keyboards/gray_studio/apollo80/apollo80.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 Demo Studio - * - * 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( \ - K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D,K06, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K3E, 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, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E, K5F, K5G \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, KC_NO, K3D, K3E, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, KC_NO }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, K5A, K5B, K5C, K5D, K5E, K5F, K5G }, \ -} - diff --git a/keyboards/gray_studio/apollo80/info.json b/keyboards/gray_studio/apollo80/info.json index c764ad658295..122c5890d412 100644 --- a/keyboards/gray_studio/apollo80/info.json +++ b/keyboards/gray_studio/apollo80/info.json @@ -25,98 +25,110 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,F0)", "x":0, "y":0}, - {"label":"K02 (D1,F4)", "x":2, "y":0}, - {"label":"K03 (D1,F5)", "x":3, "y":0}, - {"label":"K04 (D1,F6)", "x":4, "y":0}, - {"label":"K05 (D1,F7)", "x":5, "y":0}, - {"label":"K06 (D1,C7)", "x":6.5, "y":0}, - {"label":"K07 (D1,C6)", "x":7.5, "y":0}, - {"label":"K08 (D1,B6)", "x":8.5, "y":0}, - {"label":"K09 (D1,B5)", "x":9.5, "y":0}, - {"label":"K0A (D1,B4)", "x":11, "y":0}, - {"label":"K0B (D1,D7)", "x":12, "y":0}, - {"label":"K0C (D1,D4)", "x":13, "y":0}, - {"label":"K0D (D1,D6)", "x":14, "y":0}, - {"label":"K0E (D1,D2)", "x":15.25, "y":0}, - {"label":"K0F (D1,D3)", "x":16.25, "y":0}, - {"label":"K0G (D1,D5)", "x":17.25, "y":0}, - {"label":"K10 (D0,F0)", "x":0, "y":1.5}, - {"label":"K11 (D0,F1)", "x":1, "y":1.5}, - {"label":"K12 (D0,F4)", "x":2, "y":1.5}, - {"label":"K13 (D0,F5)", "x":3, "y":1.5}, - {"label":"K14 (D0,F6)", "x":4, "y":1.5}, - {"label":"K15 (D0,F7)", "x":5, "y":1.5}, - {"label":"K16 (D0,C7)", "x":6, "y":1.5}, - {"label":"K17 (D0,C6)", "x":7, "y":1.5}, - {"label":"K18 (D0,B6)", "x":8, "y":1.5}, - {"label":"K19 (D0,B5)", "x":9, "y":1.5}, - {"label":"K1A (D0,B4)", "x":10, "y":1.5}, - {"label":"K1B (D0,D7)", "x":11, "y":1.5}, - {"label":"K1C (D0,D4)", "x":12, "y":1.5}, - {"label":"K1D (D0,D6)", "x":13, "y":1.5}, - {"label":"K3E (B0,D2)", "x":14, "y":1.5}, - {"label":"K1E (D0,D2)", "x":15.25, "y":1.5}, - {"label":"K1F (D0,D3)", "x":16.25, "y":1.5}, - {"label":"K1G (D0,D5)", "x":17.25, "y":1.5}, - {"label":"K20 (B3,F0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B3,F1)", "x":1.5, "y":2.5}, - {"label":"K22 (B3,F4)", "x":2.5, "y":2.5}, - {"label":"K23 (B3,F5)", "x":3.5, "y":2.5}, - {"label":"K24 (B3,F6)", "x":4.5, "y":2.5}, - {"label":"K25 (B3,F7)", "x":5.5, "y":2.5}, - {"label":"K26 (B3,C7)", "x":6.5, "y":2.5}, - {"label":"K27 (B3,C6)", "x":7.5, "y":2.5}, - {"label":"K28 (B3,B6)", "x":8.5, "y":2.5}, - {"label":"K29 (B3,B5)", "x":9.5, "y":2.5}, - {"label":"K2A (B3,B4)", "x":10.5, "y":2.5}, - {"label":"K2B (B3,D7)", "x":11.5, "y":2.5}, - {"label":"K2C (B3,D4)", "x":12.5, "y":2.5}, - {"label":"K2D (B3,D6)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K2E (B3,D2)", "x":15.25, "y":2.5}, - {"label":"K2F (B3,D3)", "x":16.25, "y":2.5}, - {"label":"K2G (B3,D5)", "x":17.25, "y":2.5}, - {"label":"K30 (B0,F0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B0,F1)", "x":1.75, "y":3.5}, - {"label":"K32 (B0,F4)", "x":2.75, "y":3.5}, - {"label":"K33 (B0,F5)", "x":3.75, "y":3.5}, - {"label":"K34 (B0,F6)", "x":4.75, "y":3.5}, - {"label":"K35 (B0,F7)", "x":5.75, "y":3.5}, - {"label":"K36 (B0,C7)", "x":6.75, "y":3.5}, - {"label":"K37 (B0,C6)", "x":7.75, "y":3.5}, - {"label":"K38 (B0,B6)", "x":8.75, "y":3.5}, - {"label":"K39 (B0,B5)", "x":9.75, "y":3.5}, - {"label":"K3A (B0,B4)", "x":10.75, "y":3.5}, - {"label":"K3B (B0,D7)", "x":11.75, "y":3.5}, - {"label":"K3D (B0,D6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B2,F0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B2,F1)", "x":1.25, "y":4.5}, - {"label":"K42 (B2,F4)", "x":2.25, "y":4.5}, - {"label":"K43 (B2,F5)", "x":3.25, "y":4.5}, - {"label":"K44 (B2,F6)", "x":4.25, "y":4.5}, - {"label":"K45 (B2,F7)", "x":5.25, "y":4.5}, - {"label":"K46 (B2,C7)", "x":6.25, "y":4.5}, - {"label":"K47 (B2,C6)", "x":7.25, "y":4.5}, - {"label":"K48 (B2,B6)", "x":8.25, "y":4.5}, - {"label":"K49 (B2,B5)", "x":9.25, "y":4.5}, - {"label":"K4A (B2,B4)", "x":10.25, "y":4.5}, - {"label":"K4B (B2,D7)", "x":11.25, "y":4.5}, - {"label":"K4C (B2,D4)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K4D (B2,D6)", "x":14, "y":4.5}, - {"label":"K4F (B2,D3)", "x":16.25, "y":4.5}, - {"label":"K50 (B1,F0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B1,F1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B1,F4)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B1,C7)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K5A (B1,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K5B (B1,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K5C (B1,D4)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K5D (B1,D6)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (B1,D2)", "x":15.25, "y":5.5}, - {"label":"K5F (B1,D3)", "x":16.25, "y":5.5}, - {"label":"K5G (B1,D5)", "x":17.25, "y":5.5} + {"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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 6], "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.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [3, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } - } diff --git a/keyboards/gray_studio/cod67/cod67.h b/keyboards/gray_studio/cod67/cod67.h deleted file mode 100644 index 85ebbab61bc4..000000000000 --- a/keyboards/gray_studio/cod67/cod67.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k48, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ - k40, k41, k42, k43, k44, k45, k46, k47, k0D, k49, k4A, k4B, k4C, k4D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \ -} diff --git a/keyboards/gray_studio/cod67/info.json b/keyboards/gray_studio/cod67/info.json index 64f95a66a47f..fe6f1b186709 100644 --- a/keyboards/gray_studio/cod67/info.json +++ b/keyboards/gray_studio/cod67/info.json @@ -23,8 +23,83 @@ "processor": "atmega32u4", "bootloader": "lufa-ms", "layouts": { - "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"Shift", "x":11.25, "y":3, "w":1.75}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4}, {"label":"Win", "x":1, "y":4}, {"label":"Alt", "x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4, "w":2}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"label":"Alt", "x":11, "y":4}, {"label":"Win", "x":12, "y":4}, {"label":"Menu", "x":13, "y":4}, {"label":"Ctrl", "x":14, "y":4}] - } + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [4, 8], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, "w": 2}, + {"matrix": [4, 7], "x": 8, "y": 4}, + {"matrix": [0, 13], "x": 9, "y": 4}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} + ] + } } } diff --git a/keyboards/gvalchca/ga150/ga150.h b/keyboards/gvalchca/ga150/ga150.h deleted file mode 100644 index a569be829d18..000000000000 --- a/keyboards/gvalchca/ga150/ga150.h +++ /dev/null @@ -1,37 +0,0 @@ - /* Copyright 2021 Kirill Shkuretskiy - * - * 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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k46, k4a, k4b, k4c, k4d \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \ - {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX} \ -} diff --git a/keyboards/gvalchca/ga150/info.json b/keyboards/gvalchca/ga150/info.json index 53b4b69a42e3..e7df866444a2 100644 --- a/keyboards/gvalchca/ga150/info.json +++ b/keyboards/gvalchca/ga150/info.json @@ -22,75 +22,75 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, - {"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}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "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": 12.5, "y": 4, "w": 1.25}, - {"x": 13.75, "y": 4, "w": 1.25} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/hadron/hadron.h b/keyboards/hadron/hadron.h deleted file mode 100644 index 7cc3c9702c06..000000000000 --- a/keyboards/hadron/hadron.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, XXX, XXX, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/hadron/info.json b/keyboards/hadron/info.json index c5a19a2e14c3..e7ab72714ccf 100644 --- a/keyboards/hadron/info.json +++ b/keyboards/hadron/info.json @@ -9,7 +9,84 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K10", "x":0, "y":1}, {"label":"K11", "x":1, "y":1}, {"label":"K12", "x":2, "y":1}, {"label":"K13", "x":3, "y":1}, {"label":"K14", "x":4, "y":1}, {"label":"K15", "x":5, "y":1}, {"label":"K16", "x":6, "y":1}, {"label":"K17", "x":7, "y":1}, {"label":"K18", "x":8, "y":1}, {"label":"K19", "x":9, "y":1}, {"label":"K1A", "x":10, "y":1}, {"label":"K1B", "x":11, "y":1}, {"label":"K1C", "x":12, "y":1}, {"label":"K1D", "x":13, "y":1}, {"label":"K1E", "x":14, "y":1}, {"label":"K20", "x":0, "y":2}, {"label":"K21", "x":1, "y":2}, {"label":"K22", "x":2, "y":2}, {"label":"K23", "x":3, "y":2}, {"label":"K24", "x":4, "y":2}, {"label":"K25", "x":5, "y":2}, {"label":"K26", "x":6, "y":2}, {"label":"K27", "x":7, "y":2}, {"label":"K28", "x":8, "y":2}, {"label":"K29", "x":9, "y":2}, {"label":"K2A", "x":10, "y":2}, {"label":"K2B", "x":11, "y":2}, {"label":"K2C", "x":12, "y":2}, {"label":"K2D", "x":13, "y":2}, {"label":"K2E", "x":14, "y":2}, {"label":"K30", "x":0, "y":3}, {"label":"K31", "x":1, "y":3}, {"label":"K32", "x":2, "y":3}, {"label":"K33", "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":"K38", "x":8, "y":3}, {"label":"K39", "x":9, "y":3}, {"label":"K3A", "x":10, "y":3}, {"label":"K3B", "x":11, "y":3}, {"label":"K3C", "x":12, "y":3}, {"label":"K3D", "x":13, "y":3}, {"label":"K3E", "x":14, "y":3}, {"label":"K40", "x":0, "y":4}, {"label":"K41", "x":1, "y":4}, {"label":"K42", "x":2, "y":4}, {"label":"K43", "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":"K48", "x":8, "y":4}, {"label":"K49", "x":9, "y":4}, {"label":"K4A", "x":10, "y":4}, {"label":"K4B", "x":11, "y":4}, {"label":"K4C", "x":12, "y":4}, {"label":"K4D", "x":13, "y":4}, {"label":"K4E", "x":14, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} + ] } } } diff --git a/keyboards/halfcliff/halfcliff.c b/keyboards/halfcliff/halfcliff.c index 9e3f64d284b6..de636f22fe18 100644 --- a/keyboards/halfcliff/halfcliff.c +++ b/keyboards/halfcliff/halfcliff.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "halfcliff.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/halfcliff/halfcliff.h b/keyboards/halfcliff/halfcliff.h deleted file mode 100644 index 6e4c808641e5..000000000000 --- a/keyboards/halfcliff/halfcliff.h +++ /dev/null @@ -1,58 +0,0 @@ -/* Copyright 2021 n2 - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - l51,l50,l00,l01,l02,l03,l04,r04,r03,r02,r01,r00,r50,r51,r52,\ - l61,l60,l10,l11,l12,l13,l14,r14,r13,r12,r11,r10,r60,r61,r62,\ - l71,l70,l20,l21,l22,l23,l24,r24,r23,r22,r21,r20,r70,r71,r72,\ - l81,l80,l30,l31,l32,l33,l34,r34,r33,r32,r31,r30,r80,r81,r82,\ - l91,l90,l40,l41,l42,l43,l44,r44,r43,r42,r41,r40,r90,r91,r92\ -) \ -{ \ - {l00, l01, l02, l03, l04 }, \ - {l10, l11, l12, l13, l14 }, \ - {l20, l21, l22, l23, l24 }, \ - {l30, l31, l32, l33, l34 }, \ - {l40, l41, l42, l43, l44 }, \ - {l50, l51, KC_NO,KC_NO,KC_NO}, \ - {l60, l61, KC_NO,KC_NO,KC_NO}, \ - {l70, l71, KC_NO,KC_NO,KC_NO}, \ - {l80, l81, KC_NO,KC_NO,KC_NO}, \ - {l90, l91, KC_NO,KC_NO,KC_NO}, \ - {r00, r01, r02, r03, r04 }, \ - {r10, r11, r12, r13, r14 }, \ - {r20, r21, r22, r23, r24 }, \ - {r30, r31, r32, r33, r34 }, \ - {r40, r41, r42, r43, r44 }, \ - {r50, r51, r52, KC_NO,KC_NO}, \ - {r60, r61, r62, KC_NO,KC_NO}, \ - {r70, r71, r72, KC_NO,KC_NO}, \ - {r80, r81, r82, KC_NO,KC_NO}, \ - {r90, r91, r92, KC_NO,KC_NO}, \ -} diff --git a/keyboards/halfcliff/info.json b/keyboards/halfcliff/info.json index 6b86e69a1f19..820babd432a5 100644 --- a/keyboards/halfcliff/info.json +++ b/keyboards/halfcliff/info.json @@ -24,82 +24,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.75,"y":0}, - {"x":1.75,"y":0}, - {"x":2.75,"y":0}, - {"x":3.75,"y":0}, - {"x":4.75,"y":0}, - {"x":5.75,"y":0}, - {"x":6.75,"y":0}, - {"x":8.25,"y":0}, - {"x":9.25,"y":0}, - {"x":10.25,"y":0}, - {"x":11.25,"y":0}, - {"x":12.25,"y":0}, - {"x":13.25,"y":0}, - {"x":14.25,"y":0}, - {"x":15.25,"y":0}, - {"x":0.25,"y":1,"w":1.5}, - {"x":1.75,"y":1}, - {"x":2.75,"y":1}, - {"x":3.75,"y":1}, - {"x":4.75,"y":1}, - {"x":5.75,"y":1}, - {"x":6.75,"y":1}, - {"x":8.25,"y":1}, - {"x":9.25,"y":1}, - {"x":10.25,"y":1}, - {"x":11.25,"y":1}, - {"x":12.25,"y":1}, - {"x":13.25,"y":1}, - {"x":14.25,"y":1}, - {"x":16.25,"y":0}, - {"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":8.25,"y":2}, - {"x":9.25,"y":2}, - {"x":10.25,"y":2}, - {"x":11.25,"y":2}, - {"x":12.25,"y":2}, - {"x":13.25,"y":2}, - {"x":14.25,"y":2}, - {"x":15.5,"y":1,"w":1.25,"h":2}, - {"x":0,"y":3,"w":1.75}, - {"x":1.75,"y":3}, - {"x":2.75,"y":3}, - {"x":3.75,"y":3}, - {"x":4.75,"y":3}, - {"x":5.75,"y":3}, - {"x":6.75,"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}, - {"x":13.25,"y":3}, - {"x":14.25,"y":3}, - {"x":15.25,"y":3,"w":2}, - {"x":0.5,"y":4,"w":1.25}, - {"x":1.75,"y":4}, - {"x":2.75,"y":4}, - {"x":3.75,"y":4}, - {"x":4.75,"y":4}, - {"x":5.75,"y":4}, - {"x":6.75,"y":4}, - {"x":8.25,"y":4}, - {"x":9.25,"y":4}, - {"x":10.25,"y":4}, - {"x":11.25,"y":4}, - {"x":12.25,"y":4}, - {"x":13.25,"y":4}, - {"x":14.25,"y":4}, - {"x":15.25,"y":4} - ] + {"matrix": [5, 1], "x": 0.75, "y": 0}, + {"matrix": [5, 0], "x": 1.75, "y": 0}, + {"matrix": [0, 0], "x": 2.75, "y": 0}, + {"matrix": [0, 1], "x": 3.75, "y": 0}, + {"matrix": [0, 2], "x": 4.75, "y": 0}, + {"matrix": [0, 3], "x": 5.75, "y": 0}, + {"matrix": [0, 4], "x": 6.75, "y": 0}, + + {"matrix": [10, 4], "x": 8.25, "y": 0}, + {"matrix": [10, 3], "x": 9.25, "y": 0}, + {"matrix": [10, 2], "x": 10.25, "y": 0}, + {"matrix": [10, 1], "x": 11.25, "y": 0}, + {"matrix": [10, 0], "x": 12.25, "y": 0}, + {"matrix": [15, 0], "x": 13.25, "y": 0}, + {"matrix": [15, 1], "x": 14.25, "y": 0}, + {"matrix": [15, 2], "x": 15.25, "y": 0}, + + {"matrix": [6, 1], "x": 0.25, "y": 1, "w": 1.5}, + {"matrix": [6, 0], "x": 1.75, "y": 1}, + {"matrix": [1, 0], "x": 2.75, "y": 1}, + {"matrix": [1, 1], "x": 3.75, "y": 1}, + {"matrix": [1, 2], "x": 4.75, "y": 1}, + {"matrix": [1, 3], "x": 5.75, "y": 1}, + {"matrix": [1, 4], "x": 6.75, "y": 1}, + + {"matrix": [11, 4], "x": 8.25, "y": 1}, + {"matrix": [11, 3], "x": 9.25, "y": 1}, + {"matrix": [11, 2], "x": 10.25, "y": 1}, + {"matrix": [11, 1], "x": 11.25, "y": 1}, + {"matrix": [11, 0], "x": 12.25, "y": 1}, + {"matrix": [16, 0], "x": 13.25, "y": 1}, + {"matrix": [16, 1], "x": 14.25, "y": 1}, + {"matrix": [16, 2], "x": 16.25, "y": 0}, + + {"matrix": [7, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 2}, + {"matrix": [2, 0], "x": 2.75, "y": 2}, + {"matrix": [2, 1], "x": 3.75, "y": 2}, + {"matrix": [2, 2], "x": 4.75, "y": 2}, + {"matrix": [2, 3], "x": 5.75, "y": 2}, + {"matrix": [2, 4], "x": 6.75, "y": 2}, + + {"matrix": [12, 4], "x": 8.25, "y": 2}, + {"matrix": [12, 3], "x": 9.25, "y": 2}, + {"matrix": [12, 2], "x": 10.25, "y": 2}, + {"matrix": [12, 1], "x": 11.25, "y": 2}, + {"matrix": [12, 0], "x": 12.25, "y": 2}, + {"matrix": [17, 0], "x": 13.25, "y": 2}, + {"matrix": [17, 1], "x": 14.25, "y": 2}, + {"matrix": [17, 2], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [8, 1], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [8, 0], "x": 1.75, "y": 3}, + {"matrix": [3, 0], "x": 2.75, "y": 3}, + {"matrix": [3, 1], "x": 3.75, "y": 3}, + {"matrix": [3, 2], "x": 4.75, "y": 3}, + {"matrix": [3, 3], "x": 5.75, "y": 3}, + {"matrix": [3, 4], "x": 6.75, "y": 3}, + + {"matrix": [13, 4], "x": 8.25, "y": 3}, + {"matrix": [13, 3], "x": 9.25, "y": 3}, + {"matrix": [13, 2], "x": 10.25, "y": 3}, + {"matrix": [13, 1], "x": 11.25, "y": 3}, + {"matrix": [13, 0], "x": 12.25, "y": 3}, + {"matrix": [18, 0], "x": 13.25, "y": 3}, + {"matrix": [18, 1], "x": 14.25, "y": 3}, + {"matrix": [18, 2], "x": 15.25, "y": 3, "w": 2}, + + {"matrix": [9, 1], "x": 0.5, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.75, "y": 4}, + {"matrix": [4, 0], "x": 2.75, "y": 4}, + {"matrix": [4, 1], "x": 3.75, "y": 4}, + {"matrix": [4, 2], "x": 4.75, "y": 4}, + {"matrix": [4, 3], "x": 5.75, "y": 4}, + {"matrix": [4, 4], "x": 6.75, "y": 4}, + + {"matrix": [14, 4], "x": 8.25, "y": 4}, + {"matrix": [14, 3], "x": 9.25, "y": 4}, + {"matrix": [14, 2], "x": 10.25, "y": 4}, + {"matrix": [14, 1], "x": 11.25, "y": 4}, + {"matrix": [14, 0], "x": 12.25, "y": 4}, + {"matrix": [19, 0], "x": 13.25, "y": 4}, + {"matrix": [19, 1], "x": 14.25, "y": 4}, + {"matrix": [19, 2], "x": 15.25, "y": 4} + ] } } } diff --git a/keyboards/halokeys/elemental75/elemental75.c b/keyboards/halokeys/elemental75/elemental75.c index 2b5dc1ca2e86..457e1efbaa36 100644 --- a/keyboards/halokeys/elemental75/elemental75.c +++ b/keyboards/halokeys/elemental75/elemental75.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "elemental75.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/halokeys/elemental75/elemental75.h b/keyboards/halokeys/elemental75/elemental75.h deleted file mode 100644 index 265d1c94370f..000000000000 --- a/keyboards/halokeys/elemental75/elemental75.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 Halokeys -* -* 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K59, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K54, K56, K58, K5A, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, KC_NO, K54, KC_NO, K56, KC_NO, K58, K59, K5A, K5B, K5C, K5D, K5E }, \ -} diff --git a/keyboards/halokeys/elemental75/info.json b/keyboards/halokeys/elemental75/info.json index d2434896d71e..a97731b125b5 100644 --- a/keyboards/halokeys/elemental75/info.json +++ b/keyboards/halokeys/elemental75/info.json @@ -27,92 +27,108 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (A2,B2)", "x":0, "y":0}, - {"label":"K01 (A2,B1)", "x":1.25, "y":0}, - {"label":"K02 (A2,B0)", "x":2.25, "y":0}, - {"label":"K03 (A2,B10)", "x":3.25, "y":0}, - {"label":"K04 (A2,B11)", "x":4.25, "y":0}, - {"label":"K05 (A2,B13)", "x":5.5, "y":0}, - {"label":"K06 (A2,B14)", "x":6.5, "y":0}, - {"label":"K07 (A2,B15)", "x":7.5, "y":0}, - {"label":"K08 (A2,A8)", "x":8.5, "y":0}, - {"label":"K09 (A2,A9)", "x":9.75, "y":0}, - {"label":"K0A (A2,A14)", "x":10.75, "y":0}, - {"label":"K0B (A2,A15)", "x":11.75, "y":0}, - {"label":"K0C (A2,B3)", "x":12.75, "y":0}, - {"label":"K0D (A2,B4)", "x":14, "y":0}, - {"label":"K0E (A2,B7)", "x":15.25, "y":0}, - {"label":"K10 (A3,B2)", "x":0, "y":1.25}, - {"label":"K11 (A3,B1)", "x":1, "y":1.25}, - {"label":"K12 (A3,B0)", "x":2, "y":1.25}, - {"label":"K13 (A3,B10)", "x":3, "y":1.25}, - {"label":"K14 (A3,B11)", "x":4, "y":1.25}, - {"label":"K15 (A3,B13)", "x":5, "y":1.25}, - {"label":"K16 (A3,B14)", "x":6, "y":1.25}, - {"label":"K17 (A3,B15)", "x":7, "y":1.25}, - {"label":"K18 (A3,A8)", "x":8, "y":1.25}, - {"label":"K19 (A3,A9)", "x":9, "y":1.25}, - {"label":"K1A (A3,A14)", "x":10, "y":1.25}, - {"label":"K1B (A3,A15)", "x":11, "y":1.25}, - {"label":"K1C (A3,B3)", "x":12, "y":1.25}, - {"label":"K1D (A3,B4)", "x":13, "y":1.25}, - {"label":"K59 (A7,A9)", "x":14, "y":1.25}, - {"label":"K1E (A3,B7)", "x":15.25, "y":1.25}, - {"label":"K20 (A4,B2)", "x":0, "y":2.25, "w":1.5}, - {"label":"K21 (A4,B1)", "x":1.5, "y":2.25}, - {"label":"K22 (A4,B0)", "x":2.5, "y":2.25}, - {"label":"K23 (A4,B10)", "x":3.5, "y":2.25}, - {"label":"K24 (A4,B11)", "x":4.5, "y":2.25}, - {"label":"K25 (A4,B13)", "x":5.5, "y":2.25}, - {"label":"K26 (A4,B14)", "x":6.5, "y":2.25}, - {"label":"K27 (A4,B15)", "x":7.5, "y":2.25}, - {"label":"K28 (A4,A8)", "x":8.5, "y":2.25}, - {"label":"K29 (A4,A9)", "x":9.5, "y":2.25}, - {"label":"K2A (A4,A14)", "x":10.5, "y":2.25}, - {"label":"K2B (A4,A15)", "x":11.5, "y":2.25}, - {"label":"K2C (A4,B3)", "x":12.5, "y":2.25}, - {"label":"K2D (A4,B4)", "x":13.5, "y":2.25, "w":1.5}, - {"label":"K2E (A4,B7)", "x":15.25, "y":2.25}, - {"label":"K30 (A5,B2)", "x":0, "y":3.25, "w":1.75}, - {"label":"K31 (A5,B1)", "x":1.75, "y":3.25}, - {"label":"K32 (A5,B0)", "x":2.75, "y":3.25}, - {"label":"K33 (A5,B10)", "x":3.75, "y":3.25}, - {"label":"K34 (A5,B11)", "x":4.75, "y":3.25}, - {"label":"K35 (A5,B13)", "x":5.75, "y":3.25}, - {"label":"K36 (A5,B14)", "x":6.75, "y":3.25}, - {"label":"K37 (A5,B15)", "x":7.75, "y":3.25}, - {"label":"K38 (A5,A8)", "x":8.75, "y":3.25}, - {"label":"K39 (A5,A9)", "x":9.75, "y":3.25}, - {"label":"K3A (A5,A14)", "x":10.75, "y":3.25}, - {"label":"K3B (A5,A15)", "x":11.75, "y":3.25}, - {"label":"K3C (A5,B3)", "x":12.75, "y":3.25, "w":2.25}, - {"label":"K3E (A5,B7)", "x":15.25, "y":3.25}, - {"label":"K40 (A6,B2)", "x":0, "y":4.25, "w":1.25}, - {"label":"K41 (A6,B1)", "x":1.25, "y":4.25}, - {"label":"K42 (A6,B0)", "x":2.25, "y":4.25}, - {"label":"K43 (A6,B10)", "x":3.25, "y":4.25}, - {"label":"K44 (A6,B11)", "x":4.25, "y":4.25}, - {"label":"K45 (A6,B13)", "x":5.25, "y":4.25}, - {"label":"K46 (A6,B14)", "x":6.25, "y":4.25}, - {"label":"K47 (A6,B15)", "x":7.25, "y":4.25}, - {"label":"K48 (A6,A8)", "x":8.25, "y":4.25}, - {"label":"K49 (A6,A9)", "x":9.25, "y":4.25}, - {"label":"K4A (A6,A14)", "x":10.25, "y":4.25}, - {"label":"K4B (A6,A15)", "x":11.25, "y":4.25}, - {"label":"K4C (A6,B3)", "x":12.25, "y":4.25, "w":1.5}, - {"label":"K4D (A6,B4)", "x":14, "y":4.5}, - {"label":"K4E (A6,B7)", "x":15.25, "y":4.25}, - {"label":"K50 (A7,B2)", "x":0, "y":5.25, "w":1.5}, - {"label":"K51 (A7,B1)", "x":1.5, "y":5.25}, - {"label":"K52 (A7,B0)", "x":2.5, "y":5.25, "w":1.5}, - {"label":"K54 (A7,B11)", "x":4, "y":5.25, "w":2.25}, - {"label":"K56 (A7,B14)", "x":6.25, "y":5.25, "w":1.25}, - {"label":"K58 (A7,A8)", "x":7.5, "y":5.25, "w":2.75}, - {"label":"K5A (A7,A14)", "x":10.25, "y":5.25, "w":1.25}, - {"label":"K5B (A7,A15)", "x":11.5, "y":5.25, "w":1.25}, - {"label":"K5C (A7,B3)", "x":13, "y":5.5}, - {"label":"K5D (A7,B4)", "x":14, "y":5.5}, - {"label":"K5E (A7,B7)", "x":15, "y":5.5} + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.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}, + {"matrix": [5, 9], "x": 14, "y": 1.25}, + + {"matrix": [1, 14], "x": 15.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": [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": [3, 14], "x": 15.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": 1.5}, + + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [4, 14], "x": 15.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, 4], "x": 4, "y": 5.25, "w": 2.25}, + {"matrix": [5, 6], "x": 6.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 8], "x": 7.5, "y": 5.25, "w": 2.75}, + {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.5, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5}, + {"matrix": [5, 14], "x": 15, "y": 5.5} ] } } diff --git a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h b/keyboards/handwired/108key_trackpoint/108key_trackpoint.h deleted file mode 100644 index 100f4cb93284..000000000000 --- a/keyboards/handwired/108key_trackpoint/108key_trackpoint.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K019, K020, K021, K022, \ - \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, K215, K216, K217, K219, K220, K221, K222, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K319, K320, K321, \ - K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K419, K420, K421, K422, \ - K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K513, K516, K519, K520, K521, \ - K600, K601, K603, K606, K610, K611, K613, K614, K615, K616, K617, K619, K621, K622, \ - K705, K706, K707 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, KC_NO, K019, K020, K021, K022 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214, K215, K216, K217, KC_NO, K219, K220, K221, K222 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, KC_NO, K319, K320, K321, KC_NO }, \ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K419, K420, K421, K422 }, \ - { KC_NO, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, KC_NO, K513, KC_NO, KC_NO, K516, KC_NO, KC_NO, K519, K520, K521, KC_NO }, \ - { K600, K601, KC_NO, K603, KC_NO, KC_NO, K606, KC_NO, KC_NO, KC_NO, K610, K611, KC_NO, K613, K614, K615, K616, K617, KC_NO, K619, KC_NO, K621, K622 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/108key_trackpoint/info.json b/keyboards/handwired/108key_trackpoint/info.json index e771c4b8aadf..605c77875d25 100644 --- a/keyboards/handwired/108key_trackpoint/info.json +++ b/keyboards/handwired/108key_trackpoint/info.json @@ -18,117 +18,137 @@ "layouts": { "LAYOUT": { "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":"Print Screen", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"Mute", "x":18.5, "y":0}, - {"label":"Previous", "x":19.5, "y":0}, - {"label":"Next", "x":20.5, "y":0}, - {"label":"Play", "x":21.5, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Page Up", "x":17.25, "y":1.5}, - {"label":"Num Lock", "x":18.5, "y":1.5}, - {"label":"/", "x":19.5, "y":1.5}, - {"label":"*", "x":20.5, "y":1.5}, - {"label":"-", "x":21.5, "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":"Page Down", "x":17.25, "y":2.5}, - {"label":"7", "x":18.5, "y":2.5}, - {"label":"8", "x":19.5, "y":2.5}, - {"label":"9", "x":20.5, "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":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"4", "x":18.5, "y":3.5}, - {"label":"5", "x":19.5, "y":3.5}, - {"label":"6", "x":20.5, "y":3.5}, - {"label":"+", "x":21.5, "y":2.5, "h":2}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"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":"Shift", "x":12.25, "y":4.5, "w":2.75}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"1", "x":18.5, "y":4.5}, - {"label":"2", "x":19.5, "y":4.5}, - {"label":"3", "x":20.5, "y":4.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"LGUI", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"RGUI", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Ctrl", "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}, - {"label":"0", "x":18.5, "y":5.5, "w":2}, - {"label":".", "x":20.5, "y":5.5}, - {"label":"Enter", "x":21.5, "y":4.5, "h":2}, - {"label":"Mouse1", "x":5.25, "y":6.5}, - {"label":"Mouse3", "x":6.25, "y":6.5}, - {"label":"Mouse2", "x":7.25, "y":6.5} + {"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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [0, 19], "x": 18.5, "y": 0}, + {"matrix": [0, 20], "x": 19.5, "y": 0}, + {"matrix": [0, 21], "x": 20.5, "y": 0}, + {"matrix": [0, 22], "x": 21.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [2, 1], "x": 1, "y": 1.5}, + {"matrix": [2, 2], "x": 2, "y": 1.5}, + {"matrix": [2, 3], "x": 3, "y": 1.5}, + {"matrix": [2, 4], "x": 4, "y": 1.5}, + {"matrix": [2, 5], "x": 5, "y": 1.5}, + {"matrix": [2, 6], "x": 6, "y": 1.5}, + {"matrix": [2, 7], "x": 7, "y": 1.5}, + {"matrix": [2, 8], "x": 8, "y": 1.5}, + {"matrix": [2, 9], "x": 9, "y": 1.5}, + {"matrix": [2, 10], "x": 10, "y": 1.5}, + {"matrix": [2, 11], "x": 11, "y": 1.5}, + {"matrix": [2, 12], "x": 12, "y": 1.5}, + {"matrix": [2, 14], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [2, 15], "x": 15.25, "y": 1.5}, + {"matrix": [2, 16], "x": 16.25, "y": 1.5}, + {"matrix": [2, 17], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 19], "x": 18.5, "y": 1.5}, + {"matrix": [2, 20], "x": 19.5, "y": 1.5}, + {"matrix": [2, 21], "x": 20.5, "y": 1.5}, + {"matrix": [2, 22], "x": 21.5, "y": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.5}, + {"matrix": [3, 3], "x": 2.5, "y": 2.5}, + {"matrix": [3, 4], "x": 3.5, "y": 2.5}, + {"matrix": [3, 5], "x": 4.5, "y": 2.5}, + {"matrix": [3, 6], "x": 5.5, "y": 2.5}, + {"matrix": [3, 7], "x": 6.5, "y": 2.5}, + {"matrix": [3, 8], "x": 7.5, "y": 2.5}, + {"matrix": [3, 9], "x": 8.5, "y": 2.5}, + {"matrix": [3, 10], "x": 9.5, "y": 2.5}, + {"matrix": [3, 11], "x": 10.5, "y": 2.5}, + {"matrix": [3, 12], "x": 11.5, "y": 2.5}, + {"matrix": [3, 13], "x": 12.5, "y": 2.5}, + {"matrix": [3, 14], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [3, 15], "x": 15.25, "y": 2.5}, + {"matrix": [3, 16], "x": 16.25, "y": 2.5}, + {"matrix": [3, 17], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 19], "x": 18.5, "y": 2.5}, + {"matrix": [3, 20], "x": 19.5, "y": 2.5}, + {"matrix": [3, 21], "x": 20.5, "y": 2.5}, + + {"matrix": [4, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 3.5}, + {"matrix": [4, 3], "x": 2.75, "y": 3.5}, + {"matrix": [4, 4], "x": 3.75, "y": 3.5}, + {"matrix": [4, 5], "x": 4.75, "y": 3.5}, + {"matrix": [4, 6], "x": 5.75, "y": 3.5}, + {"matrix": [4, 7], "x": 6.75, "y": 3.5}, + {"matrix": [4, 8], "x": 7.75, "y": 3.5}, + {"matrix": [4, 9], "x": 8.75, "y": 3.5}, + {"matrix": [4, 10], "x": 9.75, "y": 3.5}, + {"matrix": [4, 11], "x": 10.75, "y": 3.5}, + {"matrix": [4, 12], "x": 11.75, "y": 3.5}, + {"matrix": [4, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 19], "x": 18.5, "y": 3.5}, + {"matrix": [4, 20], "x": 19.5, "y": 3.5}, + {"matrix": [4, 21], "x": 20.5, "y": 3.5}, + {"matrix": [4, 22], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [5, 2], "x": 2.25, "y": 4.5}, + {"matrix": [5, 3], "x": 3.25, "y": 4.5}, + {"matrix": [5, 4], "x": 4.25, "y": 4.5}, + {"matrix": [5, 5], "x": 5.25, "y": 4.5}, + {"matrix": [5, 6], "x": 6.25, "y": 4.5}, + {"matrix": [5, 7], "x": 7.25, "y": 4.5}, + {"matrix": [5, 8], "x": 8.25, "y": 4.5}, + {"matrix": [5, 9], "x": 9.25, "y": 4.5}, + {"matrix": [5, 10], "x": 10.25, "y": 4.5}, + {"matrix": [5, 11], "x": 11.25, "y": 4.5}, + {"matrix": [5, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [5, 16], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 19], "x": 18.5, "y": 4.5}, + {"matrix": [5, 20], "x": 19.5, "y": 4.5}, + {"matrix": [5, 21], "x": 20.5, "y": 4.5}, + + {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [6, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [6, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 13], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 14], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [6, 15], "x": 15.25, "y": 5.5}, + {"matrix": [6, 16], "x": 16.25, "y": 5.5}, + {"matrix": [6, 17], "x": 17.25, "y": 5.5}, + + {"matrix": [6, 19], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [6, 21], "x": 20.5, "y": 5.5}, + {"matrix": [6, 22], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [7, 5], "x": 5.25, "y": 6.5}, + {"matrix": [7, 6], "x": 6.25, "y": 6.5}, + {"matrix": [7, 7], "x": 7.25, "y": 6.5} ] } } diff --git a/keyboards/handwired/3dfoxc/3dfoxc.h b/keyboards/handwired/3dfoxc/3dfoxc.h deleted file mode 100644 index b632cff2ced4..000000000000 --- a/keyboards/handwired/3dfoxc/3dfoxc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 david l goodrich - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, XXX, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, XXX, K2F }, \ - { XXX, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \ - { K40, K41, XXX, K43, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, XXX, K4D, K4E, K4F }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/3dfoxc/info.json b/keyboards/handwired/3dfoxc/info.json index bafce6ccbf09..6974199846df 100644 --- a/keyboards/handwired/3dfoxc/info.json +++ b/keyboards/handwired/3dfoxc/info.json @@ -18,358 +18,79 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "K00 (B0,B5)", - "x": 0, - "y": 0 - }, - { - "label": "K01 (B0,B6)", - "x": 1, - "y": 0 - }, - { - "label": "K02 (B0,B7)", - "x": 2, - "y": 0 - }, - { - "label": "K03 (B0,C0)", - "x": 3, - "y": 0 - }, - { - "label": "K04 (B0,C1)", - "x": 4, - "y": 0 - }, - { - "label": "K05 (B0,C2)", - "x": 5, - "y": 0 - }, - { - "label": "K06 (B0,C3)", - "x": 6, - "y": 0 - }, - { - "label": "K07 (B0,C4)", - "x": 7, - "y": 0 - }, - { - "label": "K08 (B0,C5)", - "x": 8, - "y": 0 - }, - { - "label": "K09 (B0,C6)", - "x": 9, - "y": 0 - }, - { - "label": "K0A (B0,C7)", - "x": 10, - "y": 0 - }, - { - "label": "K0B (B0,D0)", - "x": 11, - "y": 0 - }, - { - "label": "K0C (B0,D1)", - "x": 12, - "y": 0 - }, - { - "label": "K0D (B0,D2)", - "x": 13, - "y": 0 - }, - { - "label": "K0E (B0,D3)", - "x": 14, - "y": 0 - }, - { - "label": "K0F (B0,D4)", - "x": 15, - "y": 0 - }, - { - "label": "K10 (B1,B5)", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "K12 (B1,B7)", - "x": 1.5, - "y": 1 - }, - { - "label": "K13 (B1,C0)", - "x": 2.5, - "y": 1 - }, - { - "label": "K14 (B1,C1)", - "x": 3.5, - "y": 1 - }, - { - "label": "K15 (B1,C2)", - "x": 4.5, - "y": 1 - }, - { - "label": "K16 (B1,C3)", - "x": 5.5, - "y": 1 - }, - { - "label": "K17 (B1,C4)", - "x": 6.5, - "y": 1 - }, - { - "label": "K18 (B1,C5)", - "x": 7.5, - "y": 1 - }, - { - "label": "K19 (B1,C6)", - "x": 8.5, - "y": 1 - }, - { - "label": "K1A (B1,C7)", - "x": 9.5, - "y": 1 - }, - { - "label": "K1B (B1,D0)", - "x": 10.5, - "y": 1 - }, - { - "label": "K1C (B1,D1)", - "x": 11.5, - "y": 1 - }, - { - "label": "K1D (B1,D2)", - "x": 12.5, - "y": 1 - }, - { - "label": "K1E (B1,D3)", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "K1F (B1,D4)", - "x": 15, - "y": 1 - }, - { - "label": "K20 (B2,B5)", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "K22 (B2,B7)", - "x": 1.75, - "y": 2 - }, - { - "label": "K23 (B2,C0)", - "x": 2.75, - "y": 2 - }, - { - "label": "K24 (B2,C1)", - "x": 3.75, - "y": 2 - }, - { - "label": "K25 (B2,C2)", - "x": 4.75, - "y": 2 - }, - { - "label": "K26 (B2,C3)", - "x": 5.75, - "y": 2 - }, - { - "label": "K27 (B2,C4)", - "x": 6.75, - "y": 2 - }, - { - "label": "K28 (B2,C5)", - "x": 7.75, - "y": 2 - }, - { - "label": "K29 (B2,C6)", - "x": 8.75, - "y": 2 - }, - { - "label": "K2A (B2,C7)", - "x": 9.75, - "y": 2 - }, - { - "label": "K2B (B2,D0)", - "x": 10.75, - "y": 2 - }, - { - "label": "K2C (B2,D1)", - "x": 11.75, - "y": 2 - }, - { - "label": "K2D (B2,D2)", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "K2F (B2,D4)", - "x": 15, - "y": 2 - }, - { - "label": "K31 (B3,B6)", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "K32 (B3,B7)", - "x": 2.25, - "y": 3 - }, - { - "label": "K33 (B3,C0)", - "x": 3.25, - "y": 3 - }, - { - "label": "K34 (B3,C1)", - "x": 4.25, - "y": 3 - }, - { - "label": "K35 (B3,C2)", - "x": 5.25, - "y": 3 - }, - { - "label": "K36 (B3,C3)", - "x": 6.25, - "y": 3 - }, - { - "label": "K37 (B3,C4)", - "x": 7.25, - "y": 3 - }, - { - "label": "K38 (B3,C5)", - "x": 8.25, - "y": 3 - }, - { - "label": "K39 (B3,C6)", - "x": 9.25, - "y": 3 - }, - { - "label": "K3A (B3,C7)", - "x": 10.25, - "y": 3 - }, - { - "label": "K3B (B3,D0)", - "x": 11.25, - "y": 3 - }, - { - "label": "K3D (B3,D2)", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "K3E (B3,D3)", - "x": 14, - "y": 3 - }, - { - "label": "K3F (B3,D4)", - "x": 15, - "y": 3 - }, - { - "label": "K40 (B4,B5)", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "K41 (B4,B6)", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "K43 (B4,C0)", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "K46 (B4,C3)", - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "K4A (B4,C7)", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "K4B (B4,D0)", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "K4D (B4,D2)", - "x": 13, - "y": 4 - }, - { - "label": "K4E (B4,D3)", - "x": 14, - "y": 4 - }, - { - "label": "K4F (B4,D4)", - "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } }, diff --git a/keyboards/handwired/42/42.h b/keyboards/handwired/42/42.h deleted file mode 100644 index 5be29bf25264..000000000000 --- a/keyboards/handwired/42/42.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Angelo Gazzola (nglgzz) - * - * 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( \ - 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, \ - K33, K34, K35, K36, K37, K38 \ -) { \ - { 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 }, \ - { ___, ___, ___, K33, K34, K35, K36, K37, K38, ___, ___, ___ } \ -} diff --git a/keyboards/handwired/42/info.json b/keyboards/handwired/42/info.json index f887edea52a7..dccafc6d86ad 100644 --- a/keyboards/handwired/42/info.json +++ b/keyboards/handwired/42/info.json @@ -18,51 +18,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.625}, - {"x":1, "y":0.417}, - {"x":2, "y":0.208}, - {"x":3, "y":0}, - {"x":4, "y":0.208}, - {"x":5, "y":0.417}, - {"x":8.5, "y":0.417}, - {"x":9.5, "y":0.208}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0.208}, - {"x":12.5, "y":0.417}, - {"x":13.5, "y":0.625}, + {"matrix": [0, 0], "x": 0, "y": 0.625}, + {"matrix": [0, 1], "x": 1, "y": 0.417}, + {"matrix": [0, 2], "x": 2, "y": 0.208}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.208}, + {"matrix": [0, 5], "x": 5, "y": 0.417}, - {"x":0, "y":1.625}, - {"x":1, "y":1.417}, - {"x":2, "y":1.208}, - {"x":3, "y":1}, - {"x":4, "y":1.208}, - {"x":5, "y":1.417}, - {"x":8.5, "y":1.417}, - {"x":9.5, "y":1.208}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1.208}, - {"x":12.5, "y":1.417}, - {"x":13.5, "y":1.625}, + {"matrix": [0, 6], "x": 8.5, "y": 0.417}, + {"matrix": [0, 7], "x": 9.5, "y": 0.208}, + {"matrix": [0, 8], "x": 10.5, "y": 0}, + {"matrix": [0, 9], "x": 11.5, "y": 0.208}, + {"matrix": [0, 10], "x": 12.5, "y": 0.417}, + {"matrix": [0, 11], "x": 13.5, "y": 0.625}, - {"x":0, "y":2.625}, - {"x":1, "y":2.417}, - {"x":2, "y":2.208}, - {"x":3, "y":2}, - {"x":4, "y":2.208}, - {"x":5, "y":2.417}, - {"x":8.5, "y":2.417}, - {"x":9.5, "y":2.208}, - {"x":10.5, "y":2}, - {"x":11.5, "y":2.208}, - {"x":12.5, "y":2.417}, - {"x":13.5, "y":2.625}, + {"matrix": [1, 0], "x": 0, "y": 1.625}, + {"matrix": [1, 1], "x": 1, "y": 1.417}, + {"matrix": [1, 2], "x": 2, "y": 1.208}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.208}, + {"matrix": [1, 5], "x": 5, "y": 1.417}, - {"x":4, "y":3.208}, - {"x":5, "y":3.417}, - {"x":5.75, "y":4.417}, - {"x":7.75, "y":4.417}, - {"x":8.5, "y":3.417}, - {"x":9.5, "y":3.208} + {"matrix": [1, 6], "x": 8.5, "y": 1.417}, + {"matrix": [1, 7], "x": 9.5, "y": 1.208}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1.208}, + {"matrix": [1, 10], "x": 12.5, "y": 1.417}, + {"matrix": [1, 11], "x": 13.5, "y": 1.625}, + + {"matrix": [2, 0], "x": 0, "y": 2.625}, + {"matrix": [2, 1], "x": 1, "y": 2.417}, + {"matrix": [2, 2], "x": 2, "y": 2.208}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.208}, + {"matrix": [2, 5], "x": 5, "y": 2.417}, + + {"matrix": [2, 6], "x": 8.5, "y": 2.417}, + {"matrix": [2, 7], "x": 9.5, "y": 2.208}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 11.5, "y": 2.208}, + {"matrix": [2, 10], "x": 12.5, "y": 2.417}, + {"matrix": [2, 11], "x": 13.5, "y": 2.625}, + + {"matrix": [3, 3], "x": 4, "y": 3.208}, + {"matrix": [3, 4], "x": 5, "y": 3.417}, + {"matrix": [3, 5], "x": 5.75, "y": 4.417}, + + {"matrix": [3, 6], "x": 7.75, "y": 4.417}, + {"matrix": [3, 7], "x": 8.5, "y": 3.417}, + {"matrix": [3, 8], "x": 9.5, "y": 3.208} ] } } diff --git a/keyboards/handwired/acacia/acacia.h b/keyboards/handwired/acacia/acacia.h deleted file mode 100644 index 060caa6adc41..000000000000 --- a/keyboards/handwired/acacia/acacia.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2022 Jens Peter Secher - * - * 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" - -/* - * ┌───┐ ┌───┐ - * ┌───┤02 ├───┐ ┌───┤07 ├───┐ - * ┌───┤01 ├───┤03 ├───┐ ┌───┤06 ├───┤08 ├───┐ - * ┌───┤00 ├───┤12 ├───┤33 │ │36 ├───┤17 ├───┤09 ├───┐ - * │30 ├───┤11 ├───┤13 ├───┤ ├───┤16 ├───┤18 ├───┤39 │ - * ├───┤10 ├───┤22 ├───┤43 │ │46 ├───┤27 ├───┤19 ├───┤ - * │40 ├───┤21 ├───┤23 ├───┘ └───┤26 ├───┤28 ├───┤49 │ - * └───┤20 ├───┘ └───┘ └───┘ └───┤29 ├───┘ - * └───┘ ┌───┐ ┌───┬───┐ ┌───┬───┐ ┌───┐ └───┘ - * │04 │ │14 │24 ├───┐ ┌───┤25 │15 │ │05 │ - * └───┘ └───┤ │34 ├───┐ ┌───┤35 │ ├───┘ └───┘ ┌───┐ - * └───┤ │44 │ │45 │ ├───┘ │38+│ - * └───┤ │ │ ├───┘ └───┘ - * └───┘ └───┘ - * + K38 is hidden. - */ -#define LAYOUT( \ - K30, K00, K01, K02, K03, K33, K36, K06, K07, K08, K09, K39, \ - K40, K10, K11, K12, K13, K43, K46, K16, K17, K18, K19, K49, \ - K20, K21, K22, K23, K26, K27, K28, K29, \ - K04, K14, K24, K34, K44, K45, K35, K25, K15, K05, K38 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, KC_NO, KC_NO, K33, K34, K35, K36, KC_NO, K38, K39 }, \ - { K40, KC_NO, KC_NO, K43, K44, K45, K46, KC_NO, KC_NO, K49 }, \ -} diff --git a/keyboards/handwired/acacia/info.json b/keyboards/handwired/acacia/info.json index 8054fff3ac89..65a4b49a6968 100644 --- a/keyboards/handwired/acacia/info.json +++ b/keyboards/handwired/acacia/info.json @@ -20,57 +20,56 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"B", "x":0, "y":0.5}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0.5}, + {"matrix": [3, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [3, 3], "x": 5, "y": 0.5}, - {"label":"H", "x":10.5, "y":0.5}, - {"label":"U", "x":11.5, "y":0}, - {"label":"I", "x":12.5, "y":0}, - {"label":"O", "x":13.5, "y":0}, - {"label":"P", "x":14.5, "y":0}, - {"label":"Y", "x":15.5, "y":0.5}, + {"matrix": [3, 6], "x": 10.5, "y": 0.5}, + {"matrix": [0, 6], "x": 11.5, "y": 0}, + {"matrix": [0, 7], "x": 12.5, "y": 0}, + {"matrix": [0, 8], "x": 13.5, "y": 0}, + {"matrix": [0, 9], "x": 14.5, "y": 0}, + {"matrix": [3, 9], "x": 15.5, "y": 0.5}, - {"label":"Tab", "x":0, "y":1.5}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1.5}, + {"matrix": [4, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [4, 3], "x": 5, "y": 1.5}, - {"label":"N", "x":10.5, "y":1.5}, - {"label":"J", "x":11.5, "y":1}, - {"label":"K", "x":12.5, "y":1}, - {"label":"L", "x":13.5, "y":1}, - {"label":":", "x":14.5, "y":1}, - {"label":"Enter", "x":15.5, "y":1.5}, + {"matrix": [4, 6], "x": 10.5, "y": 1.5}, + {"matrix": [1, 6], "x": 11.5, "y": 1}, + {"matrix": [1, 7], "x": 12.5, "y": 1}, + {"matrix": [1, 8], "x": 13.5, "y": 1}, + {"matrix": [1, 9], "x": 14.5, "y": 1}, + {"matrix": [4, 9], "x": 15.5, "y": 1.5}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "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}, - {"label":"M", "x":11.5, "y":2}, - {"label":"<", "x":12.5, "y":2}, - {"label":">", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, + {"matrix": [2, 6], "x": 11.5, "y": 2}, + {"matrix": [2, 7], "x": 12.5, "y": 2}, + {"matrix": [2, 8], "x": 13.5, "y": 2}, + {"matrix": [2, 9], "x": 14.5, "y": 2}, - {"label":"Next", "x":2.25, "y":3}, - {"label":"Alt", "x":3.5, "y":3}, - {"label":"BS", "x":4.5, "y":3}, - {"label":"Esc", "x":5.5, "y":3}, - {"label":"Shift", "x":6.5, "y":3}, + {"matrix": [0, 4], "x": 2.25, "y": 3}, + {"matrix": [1, 4], "x": 3.5, "y": 3}, + {"matrix": [2, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [4, 4], "x": 6.5, "y": 3}, + {"matrix": [4, 5], "x": 9.25, "y": 3}, - {"label":"RAlt", "x":9.25, "y":3}, - {"label":"Space", "x":10.25, "y":3}, - {"label":"Del", "x":11.25, "y":3}, - {"label":"Alt", "x":12.25, "y":3}, - {"label":"Play", "x":13.5, "y":3}, - - {"label":"Debug", "x":8, "y":1} + {"matrix": [3, 5], "x": 10.25, "y": 3}, + {"matrix": [2, 5], "x": 11.25, "y": 3}, + {"matrix": [1, 5], "x": 12.25, "y": 3}, + {"matrix": [0, 5], "x": 13.5, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 1} ] } } diff --git a/keyboards/handwired/aek64/aek64.h b/keyboards/handwired/aek64/aek64.h deleted file mode 100644 index 63784487601e..000000000000 --- a/keyboards/handwired/aek64/aek64.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2012,2013 Jun Wako <4sStylZ@protonmail.ch> - -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" - -/* Alps64 physical definition macro */ -#define LAYOUT( \ - k00, k01, k02, k03 , k04 , k05 , k06, k07 , k08 , k09 , k010 , k011, k012, k013 , \ - k10, k11, k12, k13 , k14 , k15 , k16, k17 , k18 , k19 , k110 , k111, k112, \ - k20, k21, k22, k23 , k24 , k25 , k26, k27 , k28 , k29 , k210 , k211, k212, k213 , \ - k30, k31, k32, k33 , k34 , k35 , k36, k37 , k38 , k39 , k310 , k311, k312, \ - k40, k41, k42, k46, k411, k412, k413 \ -) { \ - { k00, k01, k02, k03 , k04 , k05 , k06, k07 , k08 , k09 , k010 , k011, k012, k013 }, \ - { k10, k11, k12, k13 , k14 , k15 , k16, k17 , k18 , k19 , k110 , k111, k112, KC_NO }, \ - { k20, k21, k22, k23 , k24 , k25 , k26, k27 , k28 , k29 , k210 , k211, k212, k213 }, \ - { k30, k31, k32, k33 , k34 , k35 , k36, k37 , k38 , k39 , k310 , k311, k312, KC_NO }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, KC_NO, k411, k412, k413 }, \ -} diff --git a/keyboards/handwired/aek64/info.json b/keyboards/handwired/aek64/info.json index 4c71a69358a1..dfa762ce817e 100644 --- a/keyboards/handwired/aek64/info.json +++ b/keyboards/handwired/aek64/info.json @@ -21,8 +21,74 @@ "processor": "at90usb1286", "bootloader": "halfkay", "layouts": { - "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0, "w":1.25}, {"label":"1", "x":1.25, "y":0}, {"label":"2", "x":2.25, "y":0}, {"label":"3", "x":3.25, "y":0}, {"label":"4", "x":4.25, "y":0}, {"label":"5", "x":5.25, "y":0}, {"label":"6", "x":6.25, "y":0}, {"label":"7", "x":7.25, "y":0}, {"label":"8", "x":8.25, "y":0}, {"label":"9", "x":9.25, "y":0}, {"label":"0", "x":10.25, "y":0}, {"label":"\u00b0", "x":11.25, "y":0}, {"label":"+", "x":12.25, "y":0}, {"label":"Backspace", "x":13.25, "y":0, "w":1.75}, {"label":"Tab", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"Z", "x":2.75, "y":1}, {"label":"E", "x":3.75, "y":1}, {"label":"R", "x":4.75, "y":1}, {"label":"T", "x":5.75, "y":1}, {"label":"Y", "x":6.75, "y":1}, {"label":"U", "x":7.75, "y":1}, {"label":"I", "x":8.75, "y":1}, {"label":"O", "x":9.75, "y":1}, {"label":"P", "x":10.75, "y":1}, {"label":"{", "x":11.75, "y":1}, {"label":"}", "x":12.75, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":2}, {"label":"Q", "x":2, "y":2}, {"label":"S", "x":3, "y":2}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"H", "x":7, "y":2}, {"label":"J", "x":8, "y":2}, {"label":"K", "x":9, "y":2}, {"label":"L", "x":10, "y":2}, {"label":"M", "x":11, "y":2}, {"label":"%", "x":12, "y":2}, {"label":"µ", "x":13, "y":2}, {"label":"Enter", "x":14, "y":1, "h":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":">", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"X", "x":3.5, "y":3}, {"label":"C", "x":4.5, "y":3}, {"label":"V", "x":5.5, "y":3}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"?", "x":8.5, "y":3}, {"label":".", "x":9.5, "y":3}, {"label":"/", "x":10.5, "y":3}, {"label":"§", "x":11.5, "y":3}, {"label":"Shift", "x":12.5, "y":3, "w":2.5}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Opt", "x":1.5, "y":4, "w":1.25}, {"label":"Cmd", "x":2.75, "y":4, "w":1.5}, {"label":"Space", "x":4.25, "y":4, "w":6.5}, {"label":"Cmd", "x":10.75, "y":4, "w":1.5}, {"label":"Opt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] - } + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 1, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3, "w": 2.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4.25, "y": 4, "w": 6.5}, + {"matrix": [4, 11], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] + } } } diff --git a/keyboards/handwired/aim65/aim65.h b/keyboards/handwired/aim65/aim65.h deleted file mode 100644 index cce4a603af7b..000000000000 --- a/keyboards/handwired/aim65/aim65.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Matteo Bonora - * - * 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( \ - K62, K71, K61, K74, K64, K75, K65, K76, K66, K77, K67, K72, K53, \ - K52, K42, K51, K41, K54, K44, K55, K45, K56, K46, K57, K47, K22, K40, \ - K60, K31, K21, K34, K24, K35, K25, K36, K26, K37, K27, K33, K12, K23,\ - K70, K01, K11, K04, K14, K05, K15, K06, K16, K07, K17, K20, \ - K00 \ -) { \ - { K00, K01, KC_NO, KC_NO, K04, K05, K06, K07 }, \ - { KC_NO, K11, K12, KC_NO, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { KC_NO, K31, KC_NO, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, KC_NO, K44, K45, K46, K47 }, \ - { KC_NO, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, KC_NO, K64, K65, K66, K67 }, \ - { K70, K71, K72, KC_NO, K74, K75, K76, K77 }, \ -} diff --git a/keyboards/handwired/aim65/info.json b/keyboards/handwired/aim65/info.json index 9439a11c765c..e7c363794fe9 100644 --- a/keyboards/handwired/aim65/info.json +++ b/keyboards/handwired/aim65/info.json @@ -22,60 +22,64 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K62 (B3,B6)", "x":1, "y":0}, - {"label":"K71 (B1,C6)", "x":2, "y":0}, - {"label":"K61 (B3,C6)", "x":3, "y":0}, - {"label":"K74 (B1,F7)", "x":4, "y":0}, - {"label":"K64 (B3,F7)", "x":5, "y":0}, - {"label":"K75 (B1,F6)", "x":6, "y":0}, - {"label":"K65 (B3,F6)", "x":7, "y":0}, - {"label":"K76 (B1,F5)", "x":8, "y":0}, - {"label":"K66 (B3,F5)", "x":9, "y":0}, - {"label":"K77 (B1,F4)", "x":10, "y":0}, - {"label":"K67 (B3,F4)", "x":11, "y":0}, - {"label":"K72 (B1,B6)", "x":12, "y":0}, - {"label":"K53 (B5,B2)", "x":13, "y":0}, - {"label":"K52 (B5,B6)", "x":0, "y":1, "w":1.5}, - {"label":"K42 (B4,B6)", "x":1.5, "y":1}, - {"label":"K51 (B5,C6)", "x":2.5, "y":1}, - {"label":"K41 (B4,C6)", "x":3.5, "y":1}, - {"label":"K54 (B5,F7)", "x":4.5, "y":1}, - {"label":"K44 (B4,F7)", "x":5.5, "y":1}, - {"label":"K55 (B5,F6)", "x":6.5, "y":1}, - {"label":"K45 (B4,F6)", "x":7.5, "y":1}, - {"label":"K56 (B5,F5)", "x":8.5, "y":1}, - {"label":"K46 (B4,F5)", "x":9.5, "y":1}, - {"label":"K57 (B5,F4)", "x":10.5, "y":1}, - {"label":"K47 (B4,F4)", "x":11.5, "y":1}, - {"label":"K22 (D7,B6)", "x":12.5, "y":1}, - {"label":"K40 (B4,D1)", "x":13.5, "y":1}, - {"label":"K60 (B3,D1)", "x":0.75, "y":2}, - {"label":"K31 (E6,C6)", "x":1.75, "y":2}, - {"label":"K21 (D7,C6)", "x":2.75, "y":2}, - {"label":"K34 (E6,F7)", "x":3.75, "y":2}, - {"label":"K24 (D7,F7)", "x":4.75, "y":2}, - {"label":"K35 (E6,F6)", "x":5.75, "y":2}, - {"label":"K25 (D7,F6)", "x":6.75, "y":2}, - {"label":"K36 (E6,F5)", "x":7.75, "y":2}, - {"label":"K26 (D7,F5)", "x":8.75, "y":2}, - {"label":"K37 (E6,F4)", "x":9.75, "y":2}, - {"label":"K27 (D7,F4)", "x":10.75, "y":2}, - {"label":"K33 (E6,B2)", "x":11.75, "y":2}, - {"label":"K12 (D4,B6)", "x":12.75, "y":2}, - {"label":"K23 (D7,B2)", "x":13.75, "y":2, "w":1.5}, - {"label":"K70 (B1,D1)", "x":0.75, "y":3, "w":1.5}, - {"label":"K01 (D0,C6)", "x":2.25, "y":3}, - {"label":"K11 (D4,C6)", "x":3.25, "y":3}, - {"label":"K04 (D0,F7)", "x":4.25, "y":3}, - {"label":"K14 (D4,F7)", "x":5.25, "y":3}, - {"label":"K05 (D0,F6)", "x":6.25, "y":3}, - {"label":"K15 (D4,F6)", "x":7.25, "y":3}, - {"label":"K06 (D0,F5)", "x":8.25, "y":3}, - {"label":"K16 (D4,F5)", "x":9.25, "y":3}, - {"label":"K07 (D0,F4)", "x":10.25, "y":3}, - {"label":"K17 (D4,F4)", "x":11.25, "y":3}, - {"label":"K20 (D7,D1)", "x":12.25, "y":3, "w":1.5}, - {"label":"K00 (D0,D1)", "x":3.25, "y":4, "w":8} + {"matrix": [6, 2], "x": 1, "y": 0}, + {"matrix": [7, 1], "x": 2, "y": 0}, + {"matrix": [6, 1], "x": 3, "y": 0}, + {"matrix": [7, 4], "x": 4, "y": 0}, + {"matrix": [6, 4], "x": 5, "y": 0}, + {"matrix": [7, 5], "x": 6, "y": 0}, + {"matrix": [6, 5], "x": 7, "y": 0}, + {"matrix": [7, 6], "x": 8, "y": 0}, + {"matrix": [6, 6], "x": 9, "y": 0}, + {"matrix": [7, 7], "x": 10, "y": 0}, + {"matrix": [6, 7], "x": 11, "y": 0}, + {"matrix": [7, 2], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + + {"matrix": [5, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 1}, + {"matrix": [5, 1], "x": 2.5, "y": 1}, + {"matrix": [4, 1], "x": 3.5, "y": 1}, + {"matrix": [5, 4], "x": 4.5, "y": 1}, + {"matrix": [4, 4], "x": 5.5, "y": 1}, + {"matrix": [5, 5], "x": 6.5, "y": 1}, + {"matrix": [4, 5], "x": 7.5, "y": 1}, + {"matrix": [5, 6], "x": 8.5, "y": 1}, + {"matrix": [4, 6], "x": 9.5, "y": 1}, + {"matrix": [5, 7], "x": 10.5, "y": 1}, + {"matrix": [4, 7], "x": 11.5, "y": 1}, + {"matrix": [2, 2], "x": 12.5, "y": 1}, + {"matrix": [4, 0], "x": 13.5, "y": 1}, + + {"matrix": [6, 0], "x": 0.75, "y": 2}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 1], "x": 2.75, "y": 2}, + {"matrix": [3, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [3, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 6], "x": 8.75, "y": 2}, + {"matrix": [3, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [3, 3], "x": 11.75, "y": 2}, + {"matrix": [1, 2], "x": 12.75, "y": 2}, + {"matrix": [2, 3], "x": 13.75, "y": 2, "w": 1.5}, + + {"matrix": [7, 0], "x": 0.75, "y": 3, "w": 1.5}, + {"matrix": [0, 1], "x": 2.25, "y": 3}, + {"matrix": [1, 1], "x": 3.25, "y": 3}, + {"matrix": [0, 4], "x": 4.25, "y": 3}, + {"matrix": [1, 4], "x": 5.25, "y": 3}, + {"matrix": [0, 5], "x": 6.25, "y": 3}, + {"matrix": [1, 5], "x": 7.25, "y": 3}, + {"matrix": [0, 6], "x": 8.25, "y": 3}, + {"matrix": [1, 6], "x": 9.25, "y": 3}, + {"matrix": [0, 7], "x": 10.25, "y": 3}, + {"matrix": [1, 7], "x": 11.25, "y": 3}, + {"matrix": [2, 0], "x": 12.25, "y": 3, "w": 1.5}, + + {"matrix": [0, 0], "x": 3.25, "y": 4, "w": 8} ] } } diff --git a/keyboards/handwired/amigopunk/amigopunk.h b/keyboards/handwired/amigopunk/amigopunk.h deleted file mode 100644 index 273cd09e3fe1..000000000000 --- a/keyboards/handwired/amigopunk/amigopunk.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (c) 2021 Christiano Haesbaert - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4F, \ - K51, K53, K57, K5B, K5D, K5E, K5F, K5G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, KC_NO, K0G }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F, KC_NO }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, KC_NO }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, KC_NO, K4F, KC_NO }, \ - { KC_NO, K51, KC_NO, K53, KC_NO, KC_NO, KC_NO, K57, KC_NO, KC_NO, KC_NO, K5B, KC_NO, K5D, K5E, K5F, K5G }, \ -} diff --git a/keyboards/handwired/amigopunk/info.json b/keyboards/handwired/amigopunk/info.json index c3d96e0771b8..301c358140d8 100644 --- a/keyboards/handwired/amigopunk/info.json +++ b/keyboards/handwired/amigopunk/info.json @@ -23,92 +23,92 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, - {"x":16, "y":0}, + {"matrix": [0, 16], "x": 16, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1, "w":2}, - {"x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, - {"x":0, "y":2, "w":1.5}, - {"x":1.5, "y":2}, - {"x":2.5, "y":2}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, - {"x":8.5, "y":2}, - {"x":9.5, "y":2}, - {"x":10.5, "y":2}, - {"x":11.5, "y":2}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2, "w":1.5}, - {"x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, - {"x":8.75, "y":3}, - {"x":9.75, "y":3}, - {"x":10.75, "y":3}, - {"x":11.75, "y":3}, - {"x":12.75, "y":3, "w":2.25}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, - {"x":0, "y":4, "w":2.25}, - {"x":2.25, "y":4}, - {"x":3.25, "y":4}, - {"x":4.25, "y":4}, - {"x":5.25, "y":4}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4}, - {"x":8.25, "y":4}, - {"x":9.25, "y":4}, - {"x":10.25, "y":4}, - {"x":11.25, "y":4}, - {"x":12.25, "y":4, "w":2.75}, - {"x":15, "y":4}, + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75}, + {"matrix": [4, 15], "x": 15, "y": 4}, - {"x":1, "y":5, "w":1.5}, - {"x":2.5, "y":5, "w":1.5}, - {"x":4, "y":5, "w":7}, - {"x":11, "y":5, "w":1.5}, - {"x":12.5, "y":5, "w":1.5}, - {"x":14, "y":5}, - {"x":15, "y":5}, - {"x":16, "y":5} + {"matrix": [5, 1], "x": 1, "y": 5, "w": 1.5}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5}, + {"matrix": [5, 16], "x": 16, "y": 5} ] } } diff --git a/keyboards/handwired/angel/angel.h b/keyboards/handwired/angel/angel.h deleted file mode 100644 index f39fac97d6d8..000000000000 --- a/keyboards/handwired/angel/angel.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 James Sa - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k11 , k12 , k13 , k14 , k15 , k16 , k17 , k18 , k19 , k1a , k1b ,\ - k21 , k22 , k23 , k24 , k25 , k26 , k27 , k28 , k29 , k2a , k2b , k2c ,\ - k31 , k32 , k33 , k34 , k35 , k36 , k37 , k38 , k39 , k3a , k3b , k3c , k3d ,\ - k41 , k42 , k43 , k44 , k45 , k46 , k47 , k48 , k49 , k4a , k4b \ -) \ -{ \ - { k11, k12, k13, k14, k15,KC_NO,KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k21, k22, k23, k24, k25, k26, KC_NO, k27, k28, k29, k2a, k2b, k2c }, \ - { k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \ - { KC_NO,k41,k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, KC_NO} \ -} diff --git a/keyboards/handwired/angel/info.json b/keyboards/handwired/angel/info.json index 3bf7d8317893..10916016cfc7 100644 --- a/keyboards/handwired/angel/info.json +++ b/keyboards/handwired/angel/info.json @@ -17,7 +17,58 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"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":0.5, "y":1}, {"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":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.25}, {"x":5.75, "y":3, "w":1.5}, {"x":7.25, "y":3, "w":1.25}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 1, "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, 7], "x": 6, "y": 0}, + {"matrix": [0, 8], "x": 7, "y": 0}, + {"matrix": [0, 9], "x": 8, "y": 0}, + {"matrix": [0, 10], "x": 9, "y": 0}, + {"matrix": [0, 11], "x": 10, "y": 0}, + {"matrix": [0, 12], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + + {"matrix": [3, 1], "x": 0.5, "y": 3}, + {"matrix": [3, 2], "x": 1.5, "y": 3}, + {"matrix": [3, 3], "x": 2.5, "y": 3}, + {"matrix": [3, 4], "x": 3.5, "y": 3}, + {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3, "w": 1.5}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3} + ] } } } diff --git a/keyboards/handwired/atreus50/atreus50.c b/keyboards/handwired/atreus50/atreus50.c index 225a51bccea7..7b4e6f95868f 100644 --- a/keyboards/handwired/atreus50/atreus50.c +++ b/keyboards/handwired/atreus50/atreus50.c @@ -1,4 +1,4 @@ -#include "atreus50.h" +#include "quantum.h" void matrix_init_kb(void) { diff --git a/keyboards/handwired/atreus50/atreus50.h b/keyboards/handwired/atreus50/atreus50.h deleted file mode 100644 index 710292a1872c..000000000000 --- a/keyboards/handwired/atreus50/atreus50.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - 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, kM0, kM1, k36, k37, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, XXX, k16, k17, k18, k19, k1A, k1B }, \ - { k20, k21, k22, k23, k24, k25, kM0, k26, k27, k28, k29, k2A, k2B }, \ - { k30, k31, k32, k33, k34, k35, kM1, k36, k37, k38, k39, k3A, k3B } \ -} - -#define KC_ KC_TRNS diff --git a/keyboards/handwired/atreus50/info.json b/keyboards/handwired/atreus50/info.json index 70cb5aa1f2b9..cb1d6f6f0a6b 100644 --- a/keyboards/handwired/atreus50/info.json +++ b/keyboards/handwired/atreus50/info.json @@ -21,63 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0.5}, - {"label":"Q", "x":1, "y":0.5}, - {"label":"W", "x":2, "y":0.25}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.25}, - {"label":"T", "x":5, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"label":"Y", "x":9, "y":0.5}, - {"label":"U", "x":10, "y":0.25}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.25}, - {"label":"P", "x":13, "y":0.5}, - {"label":"-", "x":14, "y":0.5}, + {"matrix": [0, 7], "x": 9, "y": 0.5}, + {"matrix": [0, 8], "x": 10, "y": 0.25}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.25}, + {"matrix": [0, 11], "x": 13, "y": 0.5}, + {"matrix": [0, 12], "x": 14, "y": 0.5}, - {"label":"Ctrl/Esc", "x":0, "y":1.5}, - {"label":"A", "x":1, "y":1.5}, - {"label":"S", "x":2, "y":1.25}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.25}, - {"label":"G", "x":5, "y":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"label":"H", "x":9, "y":1.5}, - {"label":"J", "x":10, "y":1.25}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.25}, - {"label":";", "x":13, "y":1.5}, - {"label":"'", "x":14, "y":1.5}, + {"matrix": [1, 7], "x": 9, "y": 1.5}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.25}, + {"matrix": [1, 11], "x": 13, "y": 1.5}, + {"matrix": [1, 12], "x": 14, "y": 1.5}, - {"label":"LShift", "x":0, "y":2.5}, - {"label":"Z", "x":1, "y":2.5}, - {"label":"X", "x":2, "y":2.25}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.25}, - {"label":"B", "x":5, "y":2.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, - {"label":"N", "x":9, "y":2.5}, - {"label":"M", "x":10, "y":2.25}, - {"label":",", "x":11, "y":2}, - {"label":".", "x":12, "y":2.25}, - {"label":"/", "x":13, "y":2.5}, - {"label":"Shift/Enter", "x":14, "y":2.5}, + {"matrix": [2, 7], "x": 9, "y": 2.5}, + {"matrix": [2, 8], "x": 10, "y": 2.25}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.25}, + {"matrix": [2, 11], "x": 13, "y": 2.5}, + {"matrix": [2, 12], "x": 14, "y": 2.5}, - {"label":"`", "x":0, "y":3.5}, - {"label":"LCtrl", "x":1, "y":3.5}, - {"label":"LAlt", "x":2, "y":3.25}, - {"label":"LGUI", "x":3, "y":3}, - {"label":"Lower", "x":4, "y":3.25}, - {"label":"Space", "x":5, "y":3.5}, - {"label":"Fn", "x":6, "y":2.75, "h":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + {"matrix": [2, 6], "x": 6, "y": 2.75, "h": 1.5}, - {"label":"RShift", "x":8, "y":2.75, "h":1.5}, - {"label":"Back Space", "x":9, "y":3.5}, - {"label":"Raise", "x":10, "y":3.25}, - {"label":"Left", "x":11, "y":3}, - {"label":"Down", "x":12, "y":3.25}, - {"label":"Up", "x":13, "y":3.5}, - {"label":"Right", "x":14, "y":3.5} + {"matrix": [3, 6], "x": 8, "y": 2.75, "h": 1.5}, + {"matrix": [3, 7], "x": 9, "y": 3.5}, + {"matrix": [3, 8], "x": 10, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.25}, + {"matrix": [3, 11], "x": 13, "y": 3.5}, + {"matrix": [3, 12], "x": 14, "y": 3.5} ] } } diff --git a/keyboards/handwired/bigmac/bigmac.h b/keyboards/handwired/bigmac/bigmac.h deleted file mode 100644 index 43ba78d311fc..000000000000 --- a/keyboards/handwired/bigmac/bigmac.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Taylore101 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, K3D, K3E, K3F, K3G, \ - K40, K41, K43, K45, K46, K47, K48, K49, K4B, K4D, K4E, K4F, K4G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, K3D, K3E, K3F, K3G }, \ - { K40, K41, KC_NO, K43, KC_NO, K45, K46, K47, K48, K49, KC_NO, K4B, KC_NO, K4D, K4E, K4F, K4G }, \ -} diff --git a/keyboards/handwired/bigmac/info.json b/keyboards/handwired/bigmac/info.json index 13c523245cfc..b9377ae6c423 100644 --- a/keyboards/handwired/bigmac/info.json +++ b/keyboards/handwired/bigmac/info.json @@ -18,88 +18,104 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (F0,B6)", "x":0, "y":0, "w":1.5}, - {"label":"K01 (F0,B2)", "x":1.5, "y":0}, - {"label":"K02 (F0,B3)", "x":2.5, "y":0}, - {"label":"K03 (F0,B1)", "x":3.5, "y":0}, - {"label":"K04 (F0,F7)", "x":4.5, "y":0}, - {"label":"K05 (F0,F6)", "x":5.5, "y":0}, - {"label":"K06 (F0,F5)", "x":7, "y":0}, - {"label":"K07 (F0,F4)", "x":8, "y":0}, - {"label":"K08 (F0,D3)", "x":9, "y":0}, - {"label":"K09 (F0,D2)", "x":10.5, "y":0}, - {"label":"K0A (F0,D1)", "x":11.5, "y":0}, - {"label":"K0B (F0,D0)", "x":12.5, "y":0}, - {"label":"K0C (F0,D4)", "x":13.5, "y":0}, - {"label":"K0D (F0,C6)", "x":14.5, "y":0}, - {"label":"K0E (F0,D7)", "x":15.5, "y":0}, - {"label":"K0F (F0,E6)", "x":16.5, "y":0}, - {"label":"K0G (F0,B4)", "x":17.5, "y":0, "w":1.5}, - {"label":"K10 (F1,B6)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (F1,B2)", "x":1.5, "y":1}, - {"label":"K12 (F1,B3)", "x":2.5, "y":1}, - {"label":"K13 (F1,B1)", "x":3.5, "y":1}, - {"label":"K14 (F1,F7)", "x":4.5, "y":1}, - {"label":"K15 (F1,F6)", "x":5.5, "y":1}, - {"label":"K16 (F1,F5)", "x":7, "y":1}, - {"label":"K17 (F1,F4)", "x":8, "y":1}, - {"label":"K18 (F1,D3)", "x":9, "y":1}, - {"label":"K19 (F1,D2)", "x":10.5, "y":1}, - {"label":"K1A (F1,D1)", "x":11.5, "y":1}, - {"label":"K1B (F1,D0)", "x":12.5, "y":1}, - {"label":"K1C (F1,D4)", "x":13.5, "y":1}, - {"label":"K1D (F1,C6)", "x":14.5, "y":1}, - {"label":"K1E (F1,D7)", "x":15.5, "y":1}, - {"label":"K1F (F1,E6)", "x":16.5, "y":1}, - {"label":"K1G (F1,B4)", "x":17.5, "y":1, "w":1.5}, - {"label":"K20 (C7,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (C7,B2)", "x":1.5, "y":2}, - {"label":"K22 (C7,B3)", "x":2.5, "y":2}, - {"label":"K23 (C7,B1)", "x":3.5, "y":2}, - {"label":"K24 (C7,F7)", "x":4.5, "y":2}, - {"label":"K25 (C7,F6)", "x":5.5, "y":2}, - {"label":"K26 (C7,F5)", "x":7, "y":2}, - {"label":"K27 (C7,F4)", "x":8, "y":2}, - {"label":"K28 (C7,D3)", "x":9, "y":2}, - {"label":"K29 (C7,D2)", "x":10.5, "y":2}, - {"label":"K2A (C7,D1)", "x":11.5, "y":2}, - {"label":"K2B (C7,D0)", "x":12.5, "y":2}, - {"label":"K2C (C7,D4)", "x":13.5, "y":2}, - {"label":"K2D (C7,C6)", "x":14.5, "y":2}, - {"label":"K2E (C7,D7)", "x":15.5, "y":2}, - {"label":"K2F (C7,E6)", "x":16.5, "y":2, "w":1.5}, - {"label":"K2G (C7,B4)", "x":18, "y":2}, - {"label":"K30 (D5,B6)", "x":0, "y":3, "w":1.5}, - {"label":"K31 (D5,B2)", "x":1.5, "y":3}, - {"label":"K32 (D5,B3)", "x":2.5, "y":3}, - {"label":"K33 (D5,B1)", "x":3.5, "y":3}, - {"label":"K34 (D5,F7)", "x":4.5, "y":3}, - {"label":"K35 (D5,F6)", "x":5.5, "y":3}, - {"label":"K36 (D5,F5)", "x":7, "y":3}, - {"label":"K37 (D5,F4)", "x":8, "y":3}, - {"label":"K38 (D5,D3)", "x":9, "y":3}, - {"label":"K39 (D5,D2)", "x":10.5, "y":3}, - {"label":"K3A (D5,D1)", "x":11.5, "y":3}, - {"label":"K3B (D5,D0)", "x":12.5, "y":3}, - {"label":"K3C (D5,D4)", "x":13.5, "y":3}, - {"label":"K3D (D5,C6)", "x":14.5, "y":3}, - {"label":"K3E (D5,D7)", "x":15.5, "y":3, "w":1.5}, - {"label":"K3F (D5,E6)", "x":17, "y":3}, - {"label":"K3G (D5,B4)", "x":18, "y":3}, - {"label":"K40 (B7,B6)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B7,B2)", "x":1.5, "y":4, "w":1.5}, - {"label":"K43 (B7,B1)", "x":3, "y":4, "w":1.5}, - {"label":"K45 (B7,F6)", "x":4.5, "y":4, "w":2}, - {"label":"K46 (B7,F5)", "x":7, "y":4}, - {"label":"K47 (B7,F4)", "x":8, "y":4}, - {"label":"K48 (B7,D3)", "x":9, "y":4}, - {"label":"K49 (B7,D2)", "x":10.5, "y":4, "w":2}, - {"label":"K4B (B7,D0)", "x":12.5, "y":4, "w":1.5}, - {"label":"K4D (B7,C6)", "x":14, "y":4, "w":1.5}, - {"label":"K4E (B7,D7)", "x":16, "y":4}, - {"label":"K4F (B7,E6)", "x":17, "y":4}, - {"label":"K4G (B7,B4)", "x":18, "y":4} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + {"matrix": [1, 16], "x": 17.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "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.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2}, + {"matrix": [2, 13], "x": 14.5, "y": 2}, + {"matrix": [2, 14], "x": 15.5, "y": 2}, + {"matrix": [2, 15], "x": 16.5, "y": 2, "w": 1.5}, + {"matrix": [2, 16], "x": 18, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3}, + {"matrix": [3, 12], "x": 13.5, "y": 3}, + {"matrix": [3, 13], "x": 14.5, "y": 3}, + {"matrix": [3, 14], "x": 15.5, "y": 3, "w": 1.5}, + {"matrix": [3, 15], "x": 17, "y": 3}, + {"matrix": [3, 16], "x": 18, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2}, + + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 7], "x": 8, "y": 4}, + {"matrix": [4, 8], "x": 9, "y": 4}, + + {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 2}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 14, "y": 4, "w": 1.5}, + + {"matrix": [4, 14], "x": 16, "y": 4}, + {"matrix": [4, 15], "x": 17, "y": 4}, + {"matrix": [4, 16], "x": 18, "y": 4} ] } } + } diff --git a/keyboards/handwired/bolek/bolek.h b/keyboards/handwired/bolek/bolek.h deleted file mode 100644 index 4fc0f5a2fdc3..000000000000 --- a/keyboards/handwired/bolek/bolek.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 Mikołaj Biel - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K405, K406, K407, K408, K409, \ - K100, K101, K102, K103, K104, K505, K506, K507, K508, K509, \ - K200, K201, K202, K203, K204, K605, K606, K607, K608, K609, \ - K302, K303, K304, K705, K706, K707 \ -) { \ - { K000, K001, K002, K003, K004, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K100, K101, K102, K103, K104, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K200, K201, K202, K203, K204, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, K302, K303, K304, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K405, K406, K407, K408, K409 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K505, K506, K507, K508, K509 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K605, K606, K607, K608, K609 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K705, K706, K707, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/bolek/info.json b/keyboards/handwired/bolek/info.json index e72d4f45fb59..43e306932f73 100644 --- a/keyboards/handwired/bolek/info.json +++ b/keyboards/handwired/bolek/info.json @@ -18,42 +18,49 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Q", "x": 0, "y": 0.25 }, - { "label": "W", "x": 1, "y": 0 }, - { "label": "E", "x": 2, "y": 0 }, - { "label": "R", "x": 3, "y": 0.25 }, - { "label": "T", "x": 4, "y": 0.5 }, - { "label": "Y", "x": 7.75, "y": 0.5 }, - { "label": "U", "x": 8.75, "y": 0.25 }, - { "label": "I", "x": 9.75, "y": 0 }, - { "label": "O", "x": 10.75, "y": 0 }, - { "label": "P", "x": 11.75, "y": 0.25 }, - { "label": "A", "x": 0, "y": 1.25 }, - { "label": "S", "x": 1, "y": 1 }, - { "label": "D", "x": 2, "y": 1 }, - { "label": "F", "x": 3, "y": 1.25 }, - { "label": "G", "x": 4, "y": 1.5 }, - { "label": "H", "x": 7.75, "y": 1.5 }, - { "label": "J", "x": 8.75, "y": 1.25 }, - { "label": "K", "x": 9.75, "y": 1 }, - { "label": "L", "x": 10.75, "y": 1 }, - { "label": ";", "x": 11.75, "y": 1.25 }, - { "label": "Z", "x": 0, "y": 2.25 }, - { "label": "X", "x": 1, "y": 2 }, - { "label": "C", "x": 2, "y": 2 }, - { "label": "V", "x": 3, "y": 2.25 }, - { "label": "B", "x": 4, "y": 2.5 }, - { "label": "N", "x": 7.75, "y": 2.5 }, - { "label": "M", "x": 8.75, "y": 2.25 }, - { "label": ",", "x": 9.75, "y": 2 }, - { "label": ".", "x": 10.75, "y": 2 }, - { "label": "'", "x": 11.75, "y": 2.25 }, - { "label": "ESC", "x": 3.25, "y": 3.75 }, - { "label": "SPC", "x": 4.25, "y": 4 }, - { "label": "TAB", "x": 5.25, "y": 4.25 }, - { "label": "RET", "x": 6.5, "y": 4.25 }, - { "label": "BSPC", "x": 7.5, "y": 4 }, - { "label": "RESET", "x": 8.5, "y": 3.75 } + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + + {"matrix": [4, 5], "x": 7.75, "y": 0.5}, + {"matrix": [4, 6], "x": 8.75, "y": 0.25}, + {"matrix": [4, 7], "x": 9.75, "y": 0}, + {"matrix": [4, 8], "x": 10.75, "y": 0}, + {"matrix": [4, 9], "x": 11.75, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + + {"matrix": [5, 5], "x": 7.75, "y": 1.5}, + {"matrix": [5, 6], "x": 8.75, "y": 1.25}, + {"matrix": [5, 7], "x": 9.75, "y": 1}, + {"matrix": [5, 8], "x": 10.75, "y": 1}, + {"matrix": [5, 9], "x": 11.75, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 5], "x": 7.75, "y": 2.5}, + {"matrix": [6, 6], "x": 8.75, "y": 2.25}, + {"matrix": [6, 7], "x": 9.75, "y": 2}, + {"matrix": [6, 8], "x": 10.75, "y": 2}, + {"matrix": [6, 9], "x": 11.75, "y": 2.25}, + + {"matrix": [3, 2], "x": 3.25, "y": 3.75}, + {"matrix": [3, 3], "x": 4.25, "y": 4}, + {"matrix": [3, 4], "x": 5.25, "y": 4.25}, + + {"matrix": [7, 5], "x": 6.5, "y": 4.25}, + {"matrix": [7, 6], "x": 7.5, "y": 4}, + {"matrix": [7, 7], "x": 8.5, "y": 3.75} ] } } diff --git a/keyboards/handwired/brain/brain.h b/keyboards/handwired/brain/brain.h deleted file mode 100644 index a0f2ad6848d7..000000000000 --- a/keyboards/handwired/brain/brain.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "quantum.h" - - - - - -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, \ - L43, L44, L45, R41, R42, R43 \ - ) \ - { \ - { KC_NO, L01, L02, L03, L04, L05, L06}, \ - { L10, L11, L12, L13, L14, L15, L16}, \ - { L20, L21, L22, L23, L24, L25, L26}, \ - { KC_NO, L31, L32, L33, L34, L35, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, L43, L44, L45, KC_NO}, \ -\ - { R00, R01, R02, R03, R04, R05, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { KC_NO, R31, R32, R33, R34, R35, KC_NO }, \ - { KC_NO, R41, R42, R43, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/handwired/brain/info.json b/keyboards/handwired/brain/info.json index 042d38046b2e..77506e874681 100644 --- a/keyboards/handwired/brain/info.json +++ b/keyboards/handwired/brain/info.json @@ -35,66 +35,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":1, "y":1}, - {"x":2, "y":0.5}, - {"x":3, "y":0}, - {"x":4, "y":0.5}, - {"x":5, "y":0.75}, - {"x":6, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":0.75}, - {"x":10, "y":0.5}, - {"x":11, "y":0}, - {"x":12, "y":0.5}, - {"x":13, "y":1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.75}, + {"matrix": [0, 6], "x": 6, "y": 1}, - {"x":0, "y":2.25}, - {"x":1, "y":2}, - {"x":2, "y":1.5}, - {"x":3, "y":1}, - {"x":4, "y":1.5}, - {"x":5, "y":1.75}, - {"x":6, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":1.75}, - {"x":10, "y":1.5}, - {"x":11, "y":1}, - {"x":12, "y":1.5}, - {"x":13, "y":2}, - {"x":14, "y":2.25}, + {"matrix": [5, 0], "x": 8, "y": 1}, + {"matrix": [5, 1], "x": 9, "y": 0.75}, + {"matrix": [5, 2], "x": 10, "y": 0.5}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.5}, + {"matrix": [5, 5], "x": 13, "y": 1}, - {"x":0, "y":3.25}, - {"x":1, "y":3}, - {"x":2, "y":2.5}, - {"x":3, "y":2}, - {"x":4, "y":2.5}, - {"x":5, "y":2.75}, - {"x":6, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":2.75}, - {"x":10, "y":2.5}, - {"x":11, "y":2}, - {"x":12, "y":2.5}, - {"x":13, "y":3}, - {"x":14, "y":3.25}, + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.75}, + {"matrix": [1, 6], "x": 6, "y": 2}, - {"x":1, "y":4}, - {"x":2, "y":3.5}, - {"x":3.5, "y":4.25}, - {"x":4.5, "y":4.25}, - {"x":5.5, "y":4.25}, - {"x":8.5, "y":4.25}, - {"x":9.5, "y":4.25}, - {"x":10.5, "y":4.25}, - {"x":12, "y":3.5}, - {"x":13, "y":4}, + {"matrix": [6, 0], "x": 8, "y": 2}, + {"matrix": [6, 1], "x": 9, "y": 1.75}, + {"matrix": [6, 2], "x": 10, "y": 1.5}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.5}, + {"matrix": [6, 5], "x": 13, "y": 2}, + {"matrix": [6, 6], "x": 14, "y": 2.25}, - {"x":3.5, "y":5.25}, - {"x":4.5, "y":5.25}, - {"x":5.5, "y":5.25}, - {"x":8.5, "y":5.25}, - {"x":9.5, "y":5.25}, - {"x":10.5, "y":5.25} + {"matrix": [2, 0], "x": 0, "y": 3.25}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.75}, + {"matrix": [2, 6], "x": 6, "y": 3}, + + {"matrix": [7, 0], "x": 8, "y": 3}, + {"matrix": [7, 1], "x": 9, "y": 2.75}, + {"matrix": [7, 2], "x": 10, "y": 2.5}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.5}, + {"matrix": [7, 5], "x": 13, "y": 3}, + {"matrix": [7, 6], "x": 14, "y": 3.25}, + + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 4.25}, + {"matrix": [3, 4], "x": 4.5, "y": 4.25}, + {"matrix": [3, 5], "x": 5.5, "y": 4.25}, + + {"matrix": [8, 1], "x": 8.5, "y": 4.25}, + {"matrix": [8, 2], "x": 9.5, "y": 4.25}, + {"matrix": [8, 3], "x": 10.5, "y": 4.25}, + {"matrix": [8, 4], "x": 12, "y": 3.5}, + {"matrix": [8, 5], "x": 13, "y": 4}, + + {"matrix": [4, 3], "x": 3.5, "y": 5.25}, + {"matrix": [4, 4], "x": 4.5, "y": 5.25}, + {"matrix": [4, 5], "x": 5.5, "y": 5.25}, + + {"matrix": [9, 1], "x": 8.5, "y": 5.25}, + {"matrix": [9, 2], "x": 9.5, "y": 5.25}, + {"matrix": [9, 3], "x": 10.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/carpolly/carpolly.h b/keyboards/handwired/carpolly/carpolly.h deleted file mode 100644 index ddcf98fcdbfc..000000000000 --- a/keyboards/handwired/carpolly/carpolly.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2021 Paul Enrico N. Viola - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1C, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K36, K3A, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \ - { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, XXX, XXX, XXX, K36, XXX, XXX, XXX, K3A, K3B, K3C }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/carpolly/info.json b/keyboards/handwired/carpolly/info.json index 3cac934d6e6c..a0f28d3eebbe 100644 --- a/keyboards/handwired/carpolly/info.json +++ b/keyboards/handwired/carpolly/info.json @@ -18,49 +18,52 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (B0,F0)", "x": 0, "y": 0 }, - { "label": "K01 (B0,F1)", "x": 1, "y": 0 }, - { "label": "K02 (B0,F4)", "x": 2, "y": 0 }, - { "label": "K03 (B0,F5)", "x": 3, "y": 0 }, - { "label": "K04 (B0,F6)", "x": 4, "y": 0 }, - { "label": "K05 (B0,B6)", "x": 5, "y": 0 }, - { "label": "K06 (B0,B5)", "x": 6, "y": 0 }, - { "label": "K07 (B0,B4)", "x": 7, "y": 0 }, - { "label": "K08 (B0,D7)", "x": 8, "y": 0 }, - { "label": "K09 (B0,D6)", "x": 9, "y": 0 }, - { "label": "K0A (B0,D4)", "x": 10, "y": 0 }, - { "label": "K0B (B0,D5)", "x": 11, "y": 0, "w": 1.75 }, - { "label": "K10 (B1,F0)", "x": 0, "y": 1, "w": 1.25 }, - { "label": "K11 (B1,F1)", "x": 1.25, "y": 1 }, - { "label": "K12 (B1,F4)", "x": 2.25, "y": 1 }, - { "label": "K13 (B1,F5)", "x": 3.25, "y": 1 }, - { "label": "K14 (B1,F6)", "x": 4.25, "y": 1 }, - { "label": "K15 (B1,B6)", "x": 5.25, "y": 1 }, - { "label": "K16 (B1,B5)", "x": 6.25, "y": 1 }, - { "label": "K17 (B1,B4)", "x": 7.25, "y": 1 }, - { "label": "K18 (B1,D7)", "x": 8.25, "y": 1 }, - { "label": "K19 (B1,D6)", "x": 9.25, "y": 1 }, - { "label": "K1A (B1,D4)", "x": 10.25, "y": 1 }, - { "label": "K1C (B1,C7)", "x": 11.25, "y": 1, "w": 1.5 }, - { "label": "K20 (B2,F0)", "x": 0, "y": 2, "w": 1.75 }, - { "label": "K22 (B2,F4)", "x": 1.75, "y": 2 }, - { "label": "K23 (B2,F5)", "x": 2.75, "y": 2 }, - { "label": "K24 (B2,F6)", "x": 3.75, "y": 2 }, - { "label": "K25 (B2,B6)", "x": 4.75, "y": 2 }, - { "label": "K26 (B2,B5)", "x": 5.75, "y": 2 }, - { "label": "K27 (B2,B4)", "x": 6.75, "y": 2 }, - { "label": "K28 (B2,D7)", "x": 7.75, "y": 2 }, - { "label": "K29 (B2,D6)", "x": 8.75, "y": 2 }, - { "label": "K2A (B2,D4)", "x": 9.75, "y": 2 }, - { "label": "K2B (B2,D5)", "x": 10.75, "y": 2 }, - { "label": "K2C (B2,C7)", "x": 11.75, "y": 2 }, - { "label": "K30 (B3,F0)", "x": 0, "y": 3, "w": 1.25 }, - { "label": "K31 (B3,F1)", "x": 1.25, "y": 3 }, - { "label": "K32 (B3,F4)", "x": 2.25, "y": 3, "w": 1.25 }, - { "label": "K36 (B3,B5)", "x": 3.5, "y": 3, "w": 6.25 }, - { "label": "K3A (B3,D4)", "x": 9.75, "y": 3 }, - { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 }, - { "label": "K3C (B3,C7)", "x": 11.75, "y": 3 } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 3.5, "y": 3, "w": 6.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/handwired/chiron/chiron.h b/keyboards/handwired/chiron/chiron.h deleted file mode 100644 index 9d1ab385a523..000000000000 --- a/keyboards/handwired/chiron/chiron.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 Mike Hix - * - * 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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - /* Left Half */ \ - { L06, L05, L04, L03, L02, L01, L00 }, \ - { L16, L15, L14, L13, L12, L11, L10 }, \ - { L26, L25, L24, L23, L22, L21, L20 }, \ - { L36, L35, L34, L33, L32, L31, L30 }, \ - { L45, L44, L43, KC_NO, L42, L41, L40 }, \ - /* Right Half */ \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, KC_NO, R42, R41, R40 } \ - } - -#define LAYOUT_chiron LAYOUT diff --git a/keyboards/handwired/chiron/info.json b/keyboards/handwired/chiron/info.json index e5c076a77cd6..2cb9a7a4d94b 100644 --- a/keyboards/handwired/chiron/info.json +++ b/keyboards/handwired/chiron/info.json @@ -25,77 +25,89 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT_chiron": "LAYOUT" + }, "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - {"label":"R00", "x":8, "y":0}, - {"label":"R01", "x":9, "y":0}, - {"label":"R02", "x":10, "y":0}, - {"label":"R03", "x":11, "y":0}, - {"label":"R04", "x":12, "y":0}, - {"label":"R05", "x":13, "y":0}, - {"label":"R06", "x":14, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"L16", "x":6, "y":1}, - {"label":"R10", "x":8, "y":1}, - {"label":"R11", "x":9, "y":1}, - {"label":"R12", "x":10, "y":1}, - {"label":"R13", "x":11, "y":1}, - {"label":"R14", "x":12, "y":1}, - {"label":"R15", "x":13, "y":1}, - {"label":"R16", "x":14, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"L26", "x":6, "y":2}, - {"label":"R20", "x":8, "y":2}, - {"label":"R21", "x":9, "y":2}, - {"label":"R22", "x":10, "y":2}, - {"label":"R23", "x":11, "y":2}, - {"label":"R24", "x":12, "y":2}, - {"label":"R25", "x":13, "y":2}, - {"label":"R26", "x":14, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"L36", "x":6, "y":3}, - {"label":"R30", "x":8, "y":3}, - {"label":"R31", "x":9, "y":3}, - {"label":"R32", "x":10, "y":3}, - {"label":"R33", "x":11, "y":3}, - {"label":"R34", "x":12, "y":3}, - {"label":"R35", "x":13, "y":3}, - {"label":"R36", "x":14, "y":3}, - {"label":"L40", "x":0, "y":4}, - {"label":"L41", "x":1, "y":4}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":4, "y":4, "h":1.25}, - {"label":"L44", "x":5, "y":4, "h":1.25}, - {"label":"L45", "x":6, "y":4, "h":1.25}, - {"label":"R40", "x":8, "y":4, "h":1.25}, - {"label":"R41", "x":9, "y":4, "h":1.25}, - {"label":"R42", "x":10, "y":4, "h":1.25}, - {"label":"R43", "x":12, "y":4}, - {"label":"R44", "x":13, "y":4}, - {"label":"R45", "x":14, "y":4} + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 5], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 0], "x": 6, "y": 0}, + + {"matrix": [5, 6], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 5], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 1], "x": 5, "y": 1}, + {"matrix": [1, 0], "x": 6, "y": 1}, + + {"matrix": [6, 6], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [2, 6], "x": 0, "y": 2}, + {"matrix": [2, 5], "x": 1, "y": 2}, + {"matrix": [2, 4], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 1], "x": 5, "y": 2}, + {"matrix": [2, 0], "x": 6, "y": 2}, + + {"matrix": [7, 6], "x": 8, "y": 2}, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3}, + {"matrix": [3, 5], "x": 1, "y": 3}, + {"matrix": [3, 4], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3}, + {"matrix": [3, 1], "x": 5, "y": 3}, + {"matrix": [3, 0], "x": 6, "y": 3}, + + {"matrix": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 6], "x": 0, "y": 4}, + {"matrix": [4, 5], "x": 1, "y": 4}, + {"matrix": [4, 4], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4, "h": 1.25}, + {"matrix": [4, 1], "x": 5, "y": 4, "h": 1.25}, + {"matrix": [4, 0], "x": 6, "y": 4, "h": 1.25}, + + {"matrix": [9, 6], "x": 8, "y": 4, "h": 1.25}, + {"matrix": [9, 5], "x": 9, "y": 4, "h": 1.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "h": 1.25}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/handwired/cmd60/cmd60.h b/keyboards/handwired/cmd60/cmd60.h deleted file mode 100644 index 5c196e899f10..000000000000 --- a/keyboards/handwired/cmd60/cmd60.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3D, \ - k40, k41, k42, k45, k4A, k4B, k4C, k4D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, XXX, k3D }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \ -} diff --git a/keyboards/handwired/cmd60/info.json b/keyboards/handwired/cmd60/info.json index f3db2960f52a..7236fc796156 100644 --- a/keyboards/handwired/cmd60/info.json +++ b/keyboards/handwired/cmd60/info.json @@ -18,67 +18,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/consolekeyboard/18key/18key.h b/keyboards/handwired/consolekeyboard/18key/18key.h deleted file mode 100644 index 9625d9806c4e..000000000000 --- a/keyboards/handwired/consolekeyboard/18key/18key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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( \ - K000, K001, K002, K004, K005, K006, K008, K009, K010, \ - K100, K101, K102, K104, K105, K106, K108, K109, K110 \ -) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/18key/info.json b/keyboards/handwired/consolekeyboard/18key/info.json index f4b99ed3f725..3a37174f3646 100644 --- a/keyboards/handwired/consolekeyboard/18key/info.json +++ b/keyboards/handwired/consolekeyboard/18key/info.json @@ -21,27 +21,30 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K08 (D1,E6)", "x":8, "y":0}, - {"label":"K09 (D1,C4)", "x":9, "y":0}, - {"label":"K0A (D1,C5)", "x":10, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K18 (D0,E6)", "x":8, "y":1}, - {"label":"K19 (D0,C4)", "x":9, "y":1}, - {"label":"K1A (D0,C5)", "x":10, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1} ] } } - } diff --git a/keyboards/handwired/consolekeyboard/20key/20key.h b/keyboards/handwired/consolekeyboard/20key/20key.h deleted file mode 100644 index bd109caf3658..000000000000 --- a/keyboards/handwired/consolekeyboard/20key/20key.h +++ /dev/null @@ -1,26 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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( \ - K000, K001, K002, K004, K005, K006, K007, K009, K010, K011, \ - K100, K101, K102, K104, K105, K106, K107, K109, K110, K111 \ -) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/20key/info.json b/keyboards/handwired/consolekeyboard/20key/info.json index c62b02259c4b..1dc5a331e161 100644 --- a/keyboards/handwired/consolekeyboard/20key/info.json +++ b/keyboards/handwired/consolekeyboard/20key/info.json @@ -21,28 +21,32 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K07 (D1,E6)", "x":7, "y":0}, - {"label":"K09 (D1,B5)", "x":9, "y":0}, - {"label":"K0A (D1,C4)", "x":10, "y":0}, - {"label":"K0B (D1,C5)", "x":11, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K17 (D0,E6)", "x":7, "y":1}, - {"label":"K19 (D0,B5)", "x":9, "y":1}, - {"label":"K1A (D0,C4)", "x":10, "y":1}, - {"label":"K1B (D0,C5)", "x":11, "y":1} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1} ] } } - } diff --git a/keyboards/handwired/consolekeyboard/27key/27key.h b/keyboards/handwired/consolekeyboard/27key/27key.h deleted file mode 100644 index 2c68f1f03b25..000000000000 --- a/keyboards/handwired/consolekeyboard/27key/27key.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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( \ - K000, K001, K002, K004, K005, K006, K008, K009, K010, \ - K100, K101, K102, K104, K105, K106, K108, K109, K110, \ - K200, K201, K202, K204, K205, K206, K208, K209, K210 \ - ) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, K008, K009, K010 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, KC_NO, K108, K109, K110 }, \ - { K200, K201, K202, KC_NO, K204, K205, K206, KC_NO, K208, K209, K210 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/27key/info.json b/keyboards/handwired/consolekeyboard/27key/info.json index 854fe37e30f6..86682eb0f4d0 100644 --- a/keyboards/handwired/consolekeyboard/27key/info.json +++ b/keyboards/handwired/consolekeyboard/27key/info.json @@ -21,36 +21,42 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K08 (D1,E6)", "x":8, "y":0}, - {"label":"K09 (D1,C4)", "x":9, "y":0}, - {"label":"K0A (D1,C5)", "x":10, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K18 (D0,E6)", "x":8, "y":1}, - {"label":"K19 (D0,C4)", "x":9, "y":1}, - {"label":"K1A (D0,C5)", "x":10, "y":1}, - {"label":"K20 (F7,D4)", "x":0, "y":2}, - {"label":"K21 (F7,C6)", "x":1, "y":2}, - {"label":"K22 (F7,D7)", "x":2, "y":2}, - {"label":"K24 (F7,B3)", "x":4, "y":2}, - {"label":"K25 (F7,B2)", "x":5, "y":2}, - {"label":"K26 (F7,B6)", "x":6, "y":2}, - {"label":"K27 (F7,E6)", "x":8, "y":2}, - {"label":"K29 (F7,C4)", "x":9, "y":2}, - {"label":"K2A (F7,C5)", "x":10, "y":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2} ] } } - } diff --git a/keyboards/handwired/consolekeyboard/30key/30key.h b/keyboards/handwired/consolekeyboard/30key/30key.h deleted file mode 100644 index 34008dcb00b9..000000000000 --- a/keyboards/handwired/consolekeyboard/30key/30key.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2021 Gareth Edwards - * - * 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( \ - K000, K001, K002, K004, K005, K006, K007, K009, K010, K011, \ - K100, K101, K102, K104, K105, K106, K107, K109, K110, K111, \ - K200, K201, K202, K204, K205, K206, K207, K209, K210, K211 \ - ) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, K007, KC_NO, K009, K010, K011 }, \ - { K100, K101, K102, KC_NO, K104, K105, K106, K107, KC_NO, K109, K110, K111 }, \ - { K200, K201, K202, KC_NO, K204, K205, K206, K207, KC_NO, K209, K210, K211 }, \ -} diff --git a/keyboards/handwired/consolekeyboard/30key/info.json b/keyboards/handwired/consolekeyboard/30key/info.json index fe08b20b287f..e2bac91ab1a7 100644 --- a/keyboards/handwired/consolekeyboard/30key/info.json +++ b/keyboards/handwired/consolekeyboard/30key/info.json @@ -21,38 +21,45 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,D4)", "x":0, "y":0}, - {"label":"K01 (D1,C6)", "x":1, "y":0}, - {"label":"K02 (D1,D7)", "x":2, "y":0}, - {"label":"K04 (D1,B3)", "x":4, "y":0}, - {"label":"K05 (D1,B2)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K07 (D1,E6)", "x":7, "y":0}, - {"label":"K09 (D1,B5)", "x":9, "y":0}, - {"label":"K0A (D1,C4)", "x":10, "y":0}, - {"label":"K0B (D1,C5)", "x":11, "y":0}, - {"label":"K10 (D0,D4)", "x":0, "y":1}, - {"label":"K11 (D0,C6)", "x":1, "y":1}, - {"label":"K12 (D0,D7)", "x":2, "y":1}, - {"label":"K14 (D0,B3)", "x":4, "y":1}, - {"label":"K15 (D0,B2)", "x":5, "y":1}, - {"label":"K16 (D0,B6)", "x":6, "y":1}, - {"label":"K17 (D0,E6)", "x":7, "y":1}, - {"label":"K19 (D0,B5)", "x":9, "y":1}, - {"label":"K1A (D0,C4)", "x":10, "y":1}, - {"label":"K1B (D0,C5)", "x":11, "y":1}, - {"label":"K20 (F7,D4)", "x":0, "y":2}, - {"label":"K21 (F7,C6)", "x":1, "y":2}, - {"label":"K22 (F7,D7)", "x":2, "y":2}, - {"label":"K24 (F7,B3)", "x":4, "y":2}, - {"label":"K25 (F7,B2)", "x":5, "y":2}, - {"label":"K26 (F7,B6)", "x":6, "y":2}, - {"label":"K27 (F7,E6)", "x":7, "y":2}, - {"label":"K29 (F7,B5)", "x":9, "y":2}, - {"label":"K2A (F7,C4)", "x":10, "y":2}, - {"label":"K2B (F7,C5)", "x":11, "y":2} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "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": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2} ] } } - } diff --git a/keyboards/handwired/croxsplit44/croxsplit44.h b/keyboards/handwired/croxsplit44/croxsplit44.h deleted file mode 100644 index c94124f9eec3..000000000000 --- a/keyboards/handwired/croxsplit44/croxsplit44.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 Samux6146 - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K302, K303, K304, K305, K306, K307, K308, K309 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { KC_NO, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/croxsplit44/info.json b/keyboards/handwired/croxsplit44/info.json index 817f2fe85a46..399dae6c33aa 100644 --- a/keyboards/handwired/croxsplit44/info.json +++ b/keyboards/handwired/croxsplit44/info.json @@ -21,57 +21,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"x":7, "y":0.25}, - {"x":8, "y":0.125}, - {"x":9, "y":0}, - {"x":10, "y":0.125}, - {"x":11, "y":0.375}, - {"x":12, "y":0.375}, + {"matrix": [0, 6], "x": 7, "y": 0.25}, + {"matrix": [0, 7], "x": 8, "y": 0.125}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0.125}, + {"matrix": [0, 10], "x": 11, "y": 0.375}, + {"matrix": [0, 11], "x": 12, "y": 0.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"x":7, "y":1.25}, - {"x":8, "y":1.125}, - {"x":9, "y":1}, - {"x":10, "y":1.125}, - {"x":11, "y":1.375}, - {"x":12, "y":1.375}, + {"matrix": [1, 6], "x": 7, "y": 1.25}, + {"matrix": [1, 7], "x": 8, "y": 1.125}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1.125}, + {"matrix": [1, 10], "x": 11, "y": 1.375}, + {"matrix": [1, 11], "x": 12, "y": 1.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.375}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"x":7, "y":2.25}, - {"x":8, "y":2.125}, - {"x":9, "y":2}, - {"x":10, "y":2.125}, - {"x":11, "y":2.375}, - {"x":12, "y":2.375}, + {"matrix": [2, 6], "x": 7, "y": 2.25}, + {"matrix": [2, 7], "x": 8, "y": 2.125}, + {"matrix": [2, 8], "x": 9, "y": 2}, + {"matrix": [2, 9], "x": 10, "y": 2.125}, + {"matrix": [2, 10], "x": 11, "y": 2.375}, + {"matrix": [2, 11], "x": 12, "y": 2.375}, - {"x":2, "y":3.125}, - {"x":3, "y":3}, - {"x":4, "y":3.5}, - {"x":5, "y":3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.5}, + {"matrix": [3, 5], "x": 5, "y": 3.75}, - {"x":7, "y":3.75}, - {"x":8, "y":3.5}, - {"x":9, "y":3}, - {"x":10, "y":3.125} + {"matrix": [3, 6], "x": 7, "y": 3.75}, + {"matrix": [3, 7], "x": 8, "y": 3.5}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3.125} ] } } diff --git a/keyboards/handwired/d48/d48.h b/keyboards/handwired/d48/d48.h deleted file mode 100644 index b698ca187f0f..000000000000 --- a/keyboards/handwired/d48/d48.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT( \ - K08, 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 \ -) { \ - { ___, ___, ___, ___, ___, ___, ___, ___, K08, ___, ___, 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 } \ -} diff --git a/keyboards/handwired/d48/info.json b/keyboards/handwired/d48/info.json index 2c426cd9a560..db3f2bbacc15 100644 --- a/keyboards/handwired/d48/info.json +++ b/keyboards/handwired/d48/info.json @@ -28,60 +28,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":8, "y":0}, - {"x":11, "y":0}, + {"matrix": [0, 8], "x": 8, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/handwired/dactyl_left/dactyl_left.h b/keyboards/handwired/dactyl_left/dactyl_left.h deleted file mode 100644 index 1babf3fe47f3..000000000000 --- a/keyboards/handwired/dactyl_left/dactyl_left.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 RedForty - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT(\ - k00, k01, k02, k03, k04, k05, \ - k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, \ - k30, k31, k32, k33, k34, k35, \ - k40, k41, k42, k43, k44, \ - k50, k51, k52, k53, k54, k55 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, KC_NO }, \ - { k50, k51, k52, k53, k54, k55 } \ -} diff --git a/keyboards/handwired/dactyl_left/info.json b/keyboards/handwired/dactyl_left/info.json index e8ce55e00142..69d9e9e24fc3 100644 --- a/keyboards/handwired/dactyl_left/info.json +++ b/keyboards/handwired/dactyl_left/info.json @@ -17,7 +17,48 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.375, "w":1.5}, {"x":1.5, "y":0.375}, {"x":2.5, "y":0.125}, {"x":3.5, "y":0}, {"x":4.5, "y":0.125}, {"x":5.5, "y":0.25}, {"x":0, "y":1.375, "w":1.5}, {"x":1.5, "y":1.375}, {"x":2.5, "y":1.125}, {"x":3.5, "y":1}, {"x":4.5, "y":1.125}, {"x":5.5, "y":1.25}, {"x":0, "y":2.375, "w":1.5}, {"x":1.5, "y":2.375}, {"x":2.5, "y":2.125}, {"x":3.5, "y":2}, {"x":4.5, "y":2.125}, {"x":5.5, "y":2.25}, {"x":0, "y":3.375, "w":1.5}, {"x":1.5, "y":3.375}, {"x":2.5, "y":3.125}, {"x":3.5, "y":3}, {"x":4.5, "y":3.125}, {"x":5.5, "y":3.25}, {"x":0.5, "y":4.375}, {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4}, {"x":4.5, "y":4.125}, {"x":6, "y":4.75}, {"x":7, "y":4.75}, {"x":5, "y":5.75, "h":2}, {"x":6, "y":5.75, "h":2}, {"x":7, "y":5.75}, {"x":7, "y":6.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0.375}, + {"matrix": [0, 2], "x": 2.5, "y": 0.125}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0.125}, + {"matrix": [0, 5], "x": 5.5, "y": 0.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.375}, + {"matrix": [1, 2], "x": 2.5, "y": 1.125}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1.125}, + {"matrix": [1, 5], "x": 5.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.375}, + {"matrix": [2, 2], "x": 2.5, "y": 2.125}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2.125}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.375}, + {"matrix": [3, 2], "x": 2.5, "y": 3.125}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3.125}, + {"matrix": [3, 5], "x": 5.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0.5, "y": 4.375}, + {"matrix": [4, 1], "x": 1.5, "y": 4.375}, + {"matrix": [4, 2], "x": 2.5, "y": 4.125}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4.125}, + + {"matrix": [5, 0], "x": 6, "y": 4.75}, + {"matrix": [5, 1], "x": 7, "y": 4.75}, + {"matrix": [5, 2], "x": 5, "y": 5.75, "h": 2}, + {"matrix": [5, 3], "x": 6, "y": 5.75, "h": 2}, + {"matrix": [5, 4], "x": 7, "y": 5.75}, + {"matrix": [5, 5], "x": 7, "y": 6.75} + ] } } } diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h b/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h deleted file mode 100644 index d2790473b50f..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x5_5/4x5_5.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2022 Shem Sedrick (@ssedrick) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L31, L32, R32, R33, \ - L33, R31, \ - L34, L44, R40, R30, \ - L42, L43, R41, R42 \ -) { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { XXX, L31, L32, L33, L34 }, \ - { XXX, XXX, L42, L43, L44 }, \ -\ - { R00, R01, R02, R03, R04 }, \ - { R10, R11, R12, R13, R14 }, \ - { R20, R21, R22, R23, R24 }, \ - { R30, R31, R32, R33, XXX }, \ - { R40, R41, R42, XXX, XXX }, \ -} diff --git a/keyboards/handwired/dactyl_manuform/4x5_5/info.json b/keyboards/handwired/dactyl_manuform/4x5_5/info.json index e1f8ed4ccd38..00bcdff99052 100644 --- a/keyboards/handwired/dactyl_manuform/4x5_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x5_5/info.json @@ -21,63 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, + {"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}, - {"x": 6, "y": 0}, - {"x": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, + {"matrix": [5, 0], "x": 6, "y": 0}, + {"matrix": [5, 1], "x": 7, "y": 0}, + {"matrix": [5, 2], "x": 8, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, + {"matrix": [6, 0], "x": 6, "y": 1}, + {"matrix": [6, 1], "x": 7, "y": 1}, + {"matrix": [6, 2], "x": 8, "y": 1}, + {"matrix": [6, 3], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, + {"matrix": [7, 0], "x": 6, "y": 2}, + {"matrix": [7, 1], "x": 7, "y": 2}, + {"matrix": [7, 2], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, + {"matrix": [8, 2], "x": 8, "y": 3}, + {"matrix": [8, 3], "x": 9, "y": 3}, - {"x": 3, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4}, - {"x": 7, "y": 4}, + {"matrix": [8, 1], "x": 7, "y": 4}, - {"x": 3, "y": 5}, - {"x": 4, "y": 5}, + {"matrix": [3, 4], "x": 3, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [9, 0], "x": 6, "y": 5}, + {"matrix": [8, 0], "x": 7, "y": 5}, - {"x": 3, "y": 6}, - {"x": 4, "y": 6}, + {"matrix": [4, 2], "x": 3, "y": 6}, + {"matrix": [4, 3], "x": 4, "y": 6}, - {"x": 6, "y": 6}, - {"x": 7, "y": 6} + {"matrix": [9, 1], "x": 6, "y": 6}, + {"matrix": [9, 2], "x": 7, "y": 6} ] } } diff --git a/keyboards/handwired/dactyl_manuform/4x6/4x6.h b/keyboards/handwired/dactyl_manuform/4x6/4x6.h deleted file mode 100644 index 99b11a712a4c..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x6/4x6.h +++ /dev/null @@ -1,27 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L32, L33, R32, R33, \ - L34, L35, R30, R31, \ - L44, L45, R40, R41, \ - L42, L43, R42, R43 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { XXX, XXX, L32, L33, L34, L35 }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, XXX, XXX }, \ - { R40, R41, R42, R43, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/4x6/info.json b/keyboards/handwired/dactyl_manuform/4x6/info.json index 61d420c3a504..849d8b4e4eda 100644 --- a/keyboards/handwired/dactyl_manuform/4x6/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6/info.json @@ -24,72 +24,73 @@ "layouts": { "LAYOUT": { "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}, + {"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}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [5, 0], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 5], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 0], "x": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 15, "y": 1}, + {"matrix": [6, 5], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 0], "x": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 15, "y": 2}, + {"matrix": [7, 5], "x": 16, "y": 2}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, + {"matrix": [8, 0], "x": 11, "y": 4}, + {"matrix": [8, 1], "x": 12, "y": 4}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, + {"matrix": [4, 4], "x": 6, "y": 5}, + {"matrix": [4, 5], "x": 7, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5}, + {"matrix": [9, 0], "x": 9, "y": 5}, + {"matrix": [9, 1], "x": 10, "y": 5}, - {"x": 6, "y": 6}, - {"x": 7, "y": 6}, + {"matrix": [4, 2], "x": 6, "y": 6}, + {"matrix": [4, 3], "x": 7, "y": 6}, - {"x": 9, "y": 6}, - {"x": 10, "y": 6} - ] + {"matrix": [9, 2], "x": 9, "y": 6}, + {"matrix": [9, 3], "x": 10, "y": 6} + ] } } + } diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h b/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h deleted file mode 100644 index df639cbf2273..000000000000 --- a/keyboards/handwired/dactyl_manuform/4x6_5/4x6_5.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L32, L33, R32, R33, \ - L34, L45, L43, R42, R40, R31, \ - L44, L42, R43, R41 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { XXX, XXX, L32, L33, L34, XXX }, \ - { XXX, XXX, L42, L43, L44, L45 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { XXX, R31, R32, R33, XXX, XXX }, \ - { R40, R41, R42, R43, XXX, XXX } \ -} diff --git a/keyboards/handwired/dactyl_manuform/4x6_5/info.json b/keyboards/handwired/dactyl_manuform/4x6_5/info.json index 871572c142a6..63edf390aeb9 100644 --- a/keyboards/handwired/dactyl_manuform/4x6_5/info.json +++ b/keyboards/handwired/dactyl_manuform/4x6_5/info.json @@ -24,67 +24,67 @@ "layouts": { "LAYOUT": { "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}, + {"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}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "y": 0}, - {"x": 16, "y": 0}, + {"matrix": [5, 0], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 3], "x": 14, "y": 0}, + {"matrix": [5, 4], "x": 15, "y": 0}, + {"matrix": [5, 5], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 0], "x": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1}, + {"matrix": [6, 3], "x": 14, "y": 1}, + {"matrix": [6, 4], "x": 15, "y": 1}, + {"matrix": [6, 5], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 0], "x": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2}, + {"matrix": [7, 3], "x": 14, "y": 2}, + {"matrix": [7, 4], "x": 15, "y": 2}, + {"matrix": [7, 5], "x": 16, "y": 2}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 3], "x": 14, "y": 3}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 3], "x": 6, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [9, 0], "x": 11, "y": 4}, + {"matrix": [8, 1], "x": 12, "y": 4}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 2], "x": 6, "y": 5}, - {"x": 10, "y": 5}, - {"x": 11, "y": 5} + {"matrix": [9, 3], "x": 10, "y": 5}, + {"matrix": [9, 1], "x": 11, "y": 5} ] } } diff --git a/keyboards/handwired/daishi/daishi.h b/keyboards/handwired/daishi/daishi.h deleted file mode 100644 index 0d0c57ab202f..000000000000 --- a/keyboards/handwired/daishi/daishi.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4E, K4F, K4G, K4H, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5D, K5E, K5F, K5G, K5H, \ - K60, K61, K62, K65, K69, K6A, K6C, K6D, K6E, K6F, K6G \ -){ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, KC_NO, K4E, K4F, K4G, K4H }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, KC_NO, K5D, K5E, K5F, K5G, K5H }, \ - { K60, K61, K62, KC_NO, KC_NO, K65, KC_NO, KC_NO, KC_NO, K69, K6A, KC_NO, K6C, K6D, K6E, K6F, K6G, KC_NO } \ -} diff --git a/keyboards/handwired/daishi/info.json b/keyboards/handwired/daishi/info.json index 7bd1c6dd8d59..37d80633a79f 100644 --- a/keyboards/handwired/daishi/info.json +++ b/keyboards/handwired/daishi/info.json @@ -23,129 +23,148 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.25, "y":0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":9.75, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":16.25, "y":0}, - {"x":17.25, "y":0}, - {"x":18.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.33, "y":1.25}, - {"x":5.33, "y":1.25}, - {"x":6.33, "y":1.25}, - {"x":7.33, "y":1.25}, - {"x":8.67, "y":1.25}, - {"x":9.67, "y":1.25}, - {"x":10.67, "y":1.25}, - {"x":11.67, "y":1.25}, - {"x":13, "y":1.25}, - {"x":14.25, "y":1.25}, - {"x":15.25, "y":1.25}, - {"x":16.25, "y":1.25}, - {"x":17.5, "y":1.25}, - {"x":18.5, "y":1.25}, - - {"x":0, "y":2.5}, - {"x":1, "y":2.5}, - {"x":2, "y":2.5}, - {"x":3, "y":2.5}, - {"x":4, "y":2.5}, - {"x":5, "y":2.5}, - {"x":6, "y":2.5}, - {"x":7, "y":2.5}, - {"x":8, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.5}, - {"x":11, "y":2.5}, - {"x":12, "y":2.5}, - {"x":13, "y":2.5, "w":2}, - {"x":15.25, "y":2.25}, - {"x":16.5, "y":2.5}, - {"x":17.5, "y":2.5}, - {"x":18.5, "y":2.5}, - - {"x":0, "y":3.5, "w":1.5}, - {"x":1.5, "y":3.5}, - {"x":2.5, "y":3.5}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.5}, - {"x":5.5, "y":3.5}, - {"x":6.5, "y":3.5}, - {"x":7.5, "y":3.5}, - {"x":8.5, "y":3.5}, - {"x":9.5, "y":3.5}, - {"x":10.5, "y":3.5}, - {"x":11.5, "y":3.5}, - {"x":12.5, "y":3.5}, - {"x":13.5, "y":3.5, "w":1.5}, - {"x":15.5, "y":3.5}, - {"x":16.5, "y":3.5}, - {"x":17.5, "y":3.5}, - {"x":18.5, "y":3.5}, - - {"x":0, "y":4.5, "w":1.75}, - {"x":1.75, "y":4.5}, - {"x":2.75, "y":4.5}, - {"x":3.75, "y":4.5}, - {"x":4.75, "y":4.5}, - {"x":5.75, "y":4.5}, - {"x":6.75, "y":4.5}, - {"x":7.75, "y":4.5}, - {"x":8.75, "y":4.5}, - {"x":9.75, "y":4.5}, - {"x":10.75, "y":4.5}, - {"x":11.75, "y":4.5}, - {"x":12.75, "y":4.5, "w":2.25}, - {"x":15.5, "y":4.5}, - {"x":16.5, "y":4.5}, - {"x":17.5, "y":4.5}, - {"x":18.5, "y":4.5}, - - {"x":0, "y":5.5, "w":2.25}, - {"x":2.25, "y":5.5}, - {"x":3.25, "y":5.5}, - {"x":4.25, "y":5.5}, - {"x":5.25, "y":5.5}, - {"x":6.25, "y":5.5}, - {"x":7.25, "y":5.5}, - {"x":8.25, "y":5.5}, - {"x":9.25, "y":5.5}, - {"x":10.25, "y":5.5}, - {"x":11.25, "y":5.5}, - {"x":12.25, "y":5.5, "w":1.75}, - {"x":14.25, "y":5.75}, - {"x":15.5, "y":5.5}, - {"x":16.5, "y":5.5}, - {"x":17.5, "y":5.5}, - {"x":18.5, "y":5.5, "h":2}, - - {"x":0, "y":6.5, "w":1.25}, - {"x":1.25, "y":6.5, "w":1.25}, - {"x":2.5, "y":6.5, "w":1.25}, - {"x":3.75, "y":6.5, "w":6.25}, - {"x":10, "y":6.5, "w":1.5}, - {"x":11.5, "y":6.5, "w":1.5}, - {"x":13.25, "y":6.75}, - {"x":14.25, "y":6.75}, - {"x":15.25, "y":6.75}, - {"x":16.5, "y":6.5}, - {"x":17.5, "y":6.5} + {"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.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "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.25, "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": [0, 17], "x": 18.5, "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.33, "y": 1.25}, + {"matrix": [1, 5], "x": 5.33, "y": 1.25}, + {"matrix": [1, 6], "x": 6.33, "y": 1.25}, + {"matrix": [1, 7], "x": 7.33, "y": 1.25}, + + {"matrix": [1, 8], "x": 8.67, "y": 1.25}, + {"matrix": [1, 9], "x": 9.67, "y": 1.25}, + {"matrix": [1, 10], "x": 10.67, "y": 1.25}, + {"matrix": [1, 11], "x": 11.67, "y": 1.25}, + + {"matrix": [1, 12], "x": 13, "y": 1.25}, + + {"matrix": [1, 13], "x": 14.25, "y": 1.25}, + {"matrix": [1, 14], "x": 15.25, "y": 1.25}, + {"matrix": [1, 15], "x": 16.25, "y": 1.25}, + + {"matrix": [1, 16], "x": 17.5, "y": 1.25}, + {"matrix": [1, 17], "x": 18.5, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + {"matrix": [2, 7], "x": 7, "y": 2.5}, + {"matrix": [2, 8], "x": 8, "y": 2.5}, + {"matrix": [2, 9], "x": 9, "y": 2.5}, + {"matrix": [2, 10], "x": 10, "y": 2.5}, + {"matrix": [2, 11], "x": 11, "y": 2.5}, + {"matrix": [2, 12], "x": 12, "y": 2.5}, + {"matrix": [2, 13], "x": 13, "y": 2.5, "w": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.25}, + + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + {"matrix": [3, 9], "x": 9.5, "y": 3.5}, + {"matrix": [3, 10], "x": 10.5, "y": 3.5}, + {"matrix": [3, 11], "x": 11.5, "y": 3.5}, + {"matrix": [3, 12], "x": 12.5, "y": 3.5}, + {"matrix": [3, 13], "x": 13.5, "y": 3.5, "w": 1.5}, + + {"matrix": [3, 14], "x": 15.5, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4.5}, + {"matrix": [4, 2], "x": 2.75, "y": 4.5}, + {"matrix": [4, 3], "x": 3.75, "y": 4.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.5}, + {"matrix": [4, 6], "x": 6.75, "y": 4.5}, + {"matrix": [4, 7], "x": 7.75, "y": 4.5}, + {"matrix": [4, 8], "x": 8.75, "y": 4.5}, + {"matrix": [4, 9], "x": 9.75, "y": 4.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4.5}, + {"matrix": [4, 12], "x": 12.75, "y": 4.5, "w": 2.25}, + + {"matrix": [4, 14], "x": 15.5, "y": 4.5}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 2.25}, + {"matrix": [5, 1], "x": 2.25, "y": 5.5}, + {"matrix": [5, 2], "x": 3.25, "y": 5.5}, + {"matrix": [5, 3], "x": 4.25, "y": 5.5}, + {"matrix": [5, 4], "x": 5.25, "y": 5.5}, + {"matrix": [5, 5], "x": 6.25, "y": 5.5}, + {"matrix": [5, 6], "x": 7.25, "y": 5.5}, + {"matrix": [5, 7], "x": 8.25, "y": 5.5}, + {"matrix": [5, 8], "x": 9.25, "y": 5.5}, + {"matrix": [5, 9], "x": 10.25, "y": 5.5}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5}, + {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.75}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + + {"matrix": [5, 14], "x": 15.5, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 6.5, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 6.5, "w": 1.25}, + {"matrix": [6, 2], "x": 2.5, "y": 6.5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 6.5, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 6.5, "w": 1.5}, + {"matrix": [6, 10], "x": 11.5, "y": 6.5, "w": 1.5}, + + {"matrix": [6, 12], "x": 13.25, "y": 6.75}, + {"matrix": [6, 13], "x": 14.25, "y": 6.75}, + {"matrix": [6, 14], "x": 15.25, "y": 6.75}, + + {"matrix": [6, 15], "x": 16.5, "y": 6.5}, + {"matrix": [6, 16], "x": 17.5, "y": 6.5} ] } } diff --git a/keyboards/handwired/datahand/datahand.h b/keyboards/handwired/datahand/datahand.h index cb9a4d3e3b62..bd759be34346 100644 --- a/keyboards/handwired/datahand/datahand.h +++ b/keyboards/handwired/datahand/datahand.h @@ -17,40 +17,6 @@ #include "quantum.h" -/* This a shortcut to help you visually see your layout. - * The first section contains all of the arguements; the second converts the arguments into a two-dimensional array. - */ - -/* Each code is three letters - * l or r - left or right hand - * p, r, m, i, t - pinky, ring finger, middle finger, index finger, thumb - * fingers: n, s, e, w, c - north, south, east, west, and center (manual calls this "well" but we already have "west") - * thumb: p, n, c, l, u, k - pad, nail, center, lock (harder center), up, knuckle - */ -#define LAYOUT( \ - lpn, lrn, lmn, lin, rin, rmn, rrn, rpn, \ -lpw, lpc, lpe, lrw, lrc, lre, lmw, lmc, lme, liw, lic, lie, riw, ric, rie, rmw, rmc, rme, rrw, rrc, rre, rpw, rpc, rpe, \ - lps, lrs, lms, lis, ris, rms, rrs, rps, \ - ltp, ltn, rtn, rtp, \ - ltc, rtc, \ - ltl, rtl, \ - ltu, ltk, rtk, rtu) \ -{ \ - {riw, rin, lpw, lpn},\ - {ric, rie, lpc, lpe},\ - {ris, rms, lps, lrs},\ - {rmw, rmn, lrw, lrn},\ - {rmc, rme, lrc, lre},\ - {rrw, rrn, lmw, lmn},\ - {rrc, rre, lmc, lme},\ - {rrs, rps, lms, lis},\ - {rpw, rpn, liw, lin},\ - {rpc, rpe, lic, lie},\ - {rtk, rtn, ltk, ltn},\ - {rtc, rtl, ltc, ltl},\ - {rtp, rtu, ltp, ltu},\ -} - /* Mode LEDs are active-low on Port B on the Teensy. */ #define LED_MODE_PORT PORTB #define LED_TENKEY (1<<3) diff --git a/keyboards/handwired/datahand/info.json b/keyboards/handwired/datahand/info.json index 61d95aa12a60..590eb090bdfb 100644 --- a/keyboards/handwired/datahand/info.json +++ b/keyboards/handwired/datahand/info.json @@ -14,89 +14,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"lpn", "x":1, "y":2.75}, + {"matrix": [0, 3], "x": 1, "y": 2.75}, + {"matrix": [3, 3], "x": 3.25, "y": 1.25}, - {"label":"lrn", "x":3.25, "y":1.25}, + {"matrix": [5, 3], "x": 5.75, "y": 0}, + {"matrix": [8, 3], "x": 9, "y": 0.75}, - {"label":"lmn", "x":5.75, "y":0}, + {"matrix": [0, 1], "x": 13, "y": 0.75}, + {"matrix": [3, 1], "x": 16.25, "y": 0}, - {"label":"lin", "x":9, "y":0.75}, + {"matrix": [5, 1], "x": 18.75, "y": 1.25}, + {"matrix": [8, 1], "x": 21, "y": 2.75}, - {"label":"rin", "x":13, "y":0.75}, + {"matrix": [0, 2], "x": 0, "y": 3.75}, + {"matrix": [1, 2], "x": 1, "y": 3.75}, + {"matrix": [1, 3], "x": 2, "y": 3.75}, - {"label":"rmn", "x":16.25, "y":0}, + {"matrix": [3, 2], "x": 2.25, "y": 2.25}, + {"matrix": [4, 2], "x": 3.25, "y": 2.25}, + {"matrix": [4, 3], "x": 4.25, "y": 2.25}, - {"label":"rrn", "x":18.75, "y":1.25}, + {"matrix": [5, 2], "x": 4.75, "y": 1}, + {"matrix": [6, 2], "x": 5.75, "y": 1}, + {"matrix": [6, 3], "x": 6.75, "y": 1}, - {"label":"rpn", "x":21, "y":2.75}, + {"matrix": [8, 2], "x": 8, "y": 1.75}, + {"matrix": [9, 2], "x": 9, "y": 1.75}, + {"matrix": [9, 3], "x": 10, "y": 1.75}, - {"label":"lpw", "x":0, "y":3.75}, - {"label":"lpc", "x":1, "y":3.75}, - {"label":"lpe", "x":2, "y":3.75}, + {"matrix": [0, 0], "x": 12, "y": 1.75}, + {"matrix": [1, 0], "x": 13, "y": 1.75}, + {"matrix": [1, 1], "x": 14, "y": 1.75}, - {"label":"lrw", "x":2.25, "y":2.25}, - {"label":"lrc", "x":3.25, "y":2.25}, - {"label":"lre", "x":4.25, "y":2.25}, + {"matrix": [3, 0], "x": 15.25, "y": 1}, + {"matrix": [4, 0], "x": 16.25, "y": 1}, + {"matrix": [4, 1], "x": 17.25, "y": 1}, - {"label":"lmw", "x":4.75, "y":1}, - {"label":"lmc", "x":5.75, "y":1}, - {"label":"lme", "x":6.75, "y":1}, + {"matrix": [5, 0], "x": 17.75, "y": 2.25}, + {"matrix": [6, 0], "x": 18.75, "y": 2.25}, + {"matrix": [6, 1], "x": 19.75, "y": 2.25}, - {"label":"liw", "x":8, "y":1.75}, - {"label":"lic", "x":9, "y":1.75}, - {"label":"lie", "x":10, "y":1.75}, + {"matrix": [8, 0], "x": 20, "y": 3.75}, + {"matrix": [9, 0], "x": 21, "y": 3.75}, + {"matrix": [9, 1], "x": 22, "y": 3.75}, - {"label":"riw", "x":12, "y":1.75}, - {"label":"ric", "x":13, "y":1.75}, - {"label":"rie", "x":14, "y":1.75}, + {"matrix": [2, 2], "x": 1, "y": 4.75}, + {"matrix": [2, 3], "x": 3.25, "y": 3.25}, - {"label":"rmw", "x":15.25, "y":1}, - {"label":"rmc", "x":16.25, "y":1}, - {"label":"rme", "x":17.25, "y":1}, + {"matrix": [7, 2], "x": 5.75, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2.75}, - {"label":"rrw", "x":17.75, "y":2.25}, - {"label":"rrc", "x":18.75, "y":2.25}, - {"label":"rre", "x":19.75, "y":2.25}, + {"matrix": [2, 0], "x": 13, "y": 2.75}, + {"matrix": [2, 1], "x": 16.25, "y": 2}, - {"label":"rpw", "x":20, "y":3.75}, - {"label":"rpc", "x":21, "y":3.75}, - {"label":"rpe", "x":22, "y":3.75}, + {"matrix": [7, 0], "x": 18.75, "y": 3.25}, + {"matrix": [7, 1], "x": 21, "y": 4.75}, - {"label":"lps", "x":1, "y":4.75}, + {"matrix": [12, 2], "x": 8, "y": 4.75}, + {"matrix": [10, 3], "x": 10, "y": 4.75}, + {"matrix": [10, 1], "x": 12, "y": 4.75}, + {"matrix": [12, 0], "x": 14, "y": 4.75}, - {"label":"lrs", "x":3.25, "y":3.25}, + {"matrix": [11, 2], "x": 9, "y": 5.25}, + {"matrix": [11, 0], "x": 13, "y": 5.25}, - {"label":"lms", "x":5.75, "y":2}, + {"matrix": [11, 3], "x": 9, "y": 6.25}, + {"matrix": [11, 1], "x": 13, "y": 6.25}, - {"label":"lis", "x":9, "y":2.75}, - - {"label":"ris", "x":13, "y":2.75}, - - {"label":"rms", "x":16.25, "y":2}, - - {"label":"rrs", "x":18.75, "y":3.25}, - - {"label":"rps", "x":21, "y":4.75}, - - {"label":"ltp", "x":8, "y":4.75}, - {"label":"ltn", "x":10, "y":4.75}, - - {"label":"rtn", "x":12, "y":4.75}, - {"label":"rtp", "x":14, "y":4.75}, - - {"label":"ltc", "x":9, "y":5.25}, - - {"label":"rtc", "x":13, "y":5.25}, - - {"label":"ltl", "x":9, "y":6.25}, - - {"label":"rtl", "x":13, "y":6.25}, - - {"label":"ltu", "x":8, "y":6.75}, - {"label":"ltk", "x":10, "y":6.75}, - - {"label":"rtk", "x":12, "y":6.75}, - {"label":"rtu", "x":14, "y":6.75} + {"matrix": [12, 3], "x": 8, "y": 6.75}, + {"matrix": [10, 2], "x": 10, "y": 6.75}, + {"matrix": [10, 0], "x": 12, "y": 6.75}, + {"matrix": [12, 1], "x": 14, "y": 6.75} ] } } diff --git a/keyboards/handwired/dqz11n1g/dqz11n1g.h b/keyboards/handwired/dqz11n1g/dqz11n1g.h deleted file mode 100644 index f5c55bd6d515..000000000000 --- a/keyboards/handwired/dqz11n1g/dqz11n1g.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2022 David Kuehling - * - * 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 XXX KC_NO - -/* Fill actually existing keys into the 7x19 keyboard matrix */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0J, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1J, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2J, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3J, \ - k40, k41, k42, k43, k44, k45, k4D, k4E, k4F, k4G, k4H, k4J, \ - k51, k52, k53, k54, k5E, k5F, k5G, k5H, \ - k46, k47, k48, k4A, k4B, k4C, \ - k56, k57, k58, k5A, k5B, k5C, \ - k68, k6A \ -) { \ - /* left hand */ /* middle/thumb block */ /* right hand */ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0J }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1J }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2J }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G, k3H, k3J }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4J }, \ - { XXX, k51, k52, k53, k54, XXX, k56, k57, k58, XXX, k5A, k5B, k5C, XXX, k5E, k5F, k5G, k5H, XXX }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, k68, XXX, k6A, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX }, \ -} - -/* - * Local Variables: - * c-basic-offset:4 - * fill-column: 76 - * End: - */ diff --git a/keyboards/handwired/dqz11n1g/info.json b/keyboards/handwired/dqz11n1g/info.json index c72310a1e8ef..4df418501095 100644 --- a/keyboards/handwired/dqz11n1g/info.json +++ b/keyboards/handwired/dqz11n1g/info.json @@ -18,136 +18,137 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0, "matrix": [0, 0] }, - {"x": 1, "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": 7, "y": 0, "matrix": [0, 6] }, - {"x": 8, "y": 0, "matrix": [0, 7] }, - {"x": 9, "y": 0, "matrix": [0, 8] }, - {"x": 10, "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": 15, "y": 0, "matrix": [0, 13] }, - {"x": 16, "y": 0, "matrix": [0, 14] }, - {"x": 17, "y": 0, "matrix": [0, 15] }, - {"x": 18, "y": 0, "matrix": [0, 16] }, - {"x": 19, "y": 0, "matrix": [0, 17] }, - {"x": 20, "y": 0, "matrix": [0, 18] }, - - {"x": 0, "y": 1, "matrix": [1, 0] }, - {"x": 1, "y": 1, "matrix": [1, 1] }, - {"x": 2, "y": 1, "matrix": [1, 2] }, - {"x": 3, "y": 1, "matrix": [1, 3] }, - {"x": 4, "y": 1, "matrix": [1, 4] }, - {"x": 5, "y": 1, "matrix": [1, 5] }, - - {"x": 7, "y": 1, "matrix": [1, 6] }, - {"x": 8, "y": 1, "matrix": [1, 7] }, - {"x": 9, "y": 1, "matrix": [1, 8] }, - {"x": 10, "y": 1, "matrix": [1, 9] }, - {"x": 11, "y": 1, "matrix": [1, 10] }, - {"x": 12, "y": 1, "matrix": [1, 11] }, - {"x": 13, "y": 1, "matrix": [1, 12] }, - - {"x": 15, "y": 1, "matrix": [1, 13] }, - {"x": 16, "y": 1, "matrix": [1, 14] }, - {"x": 17, "y": 1, "matrix": [1, 15] }, - {"x": 18, "y": 1, "matrix": [1, 16] }, - {"x": 19, "y": 1, "matrix": [1, 17] }, - {"x": 20, "y": 1, "matrix": [1, 18] }, - - {"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": 7, "y": 2, "matrix": [2, 6] }, - {"x": 8, "y": 2, "matrix": [2, 7] }, - {"x": 9, "y": 2, "matrix": [2, 8] }, - {"x": 10, "y": 2, "matrix": [2, 9] }, - {"x": 11, "y": 2, "matrix": [2, 10] }, - {"x": 12, "y": 2, "matrix": [2, 11] }, - {"x": 13, "y": 2, "matrix": [2, 12] }, - - {"x": 15, "y": 2, "matrix": [2, 13] }, - {"x": 16, "y": 2, "matrix": [2, 14] }, - {"x": 17, "y": 2, "matrix": [2, 15] }, - {"x": 18, "y": 2, "matrix": [2, 16] }, - {"x": 19, "y": 2, "matrix": [2, 17] }, - {"x": 20, "y": 2, "matrix": [2, 18] }, - - {"x": 0, "y": 3, "matrix": [3, 0] }, - {"x": 1, "y": 3, "matrix": [3, 1] }, - {"x": 2, "y": 3, "matrix": [3, 2] }, - {"x": 3, "y": 3, "matrix": [3, 3] }, - {"x": 4, "y": 3, "matrix": [3, 4] }, - {"x": 5, "y": 3, "matrix": [3, 5] }, - - {"x": 7, "y": 3, "matrix": [3, 6] }, - {"x": 8, "y": 3, "matrix": [3, 7] }, - {"x": 9, "y": 3, "matrix": [3, 8] }, - {"x": 10, "y": 3, "matrix": [3, 9] }, - {"x": 11, "y": 3, "matrix": [3, 10] }, - {"x": 12, "y": 3, "matrix": [3, 11] }, - {"x": 13, "y": 3, "matrix": [3, 12] }, - - {"x": 15, "y": 3, "matrix": [3, 13] }, - {"x": 16, "y": 3, "matrix": [3, 14] }, - {"x": 17, "y": 3, "matrix": [3, 15] }, - {"x": 18, "y": 3, "matrix": [3, 16] }, - {"x": 19, "y": 3, "matrix": [3, 17] }, - {"x": 20, "y": 3, "matrix": [3, 18] }, - - {"x": 0, "y": 4, "h": 2, "matrix": [4, 0] }, - {"x": 1, "y": 4, "matrix": [4, 1] }, - {"x": 2, "y": 4, "matrix": [4, 2] }, - {"x": 3, "y": 4, "matrix": [4, 3] }, - {"x": 4, "y": 4, "matrix": [4, 4] }, - {"x": 5, "y": 4, "matrix": [4, 5] }, - - {"x": 15, "y": 4, "matrix": [4, 13] }, - {"x": 16, "y": 4, "matrix": [4, 14] }, - {"x": 17, "y": 4, "matrix": [4, 15] }, - {"x": 18, "y": 4, "matrix": [4, 16] }, - {"x": 19, "y": 4, "matrix": [4, 17] }, - {"x": 20, "y": 4, "h": 2, "matrix": [4, 18] }, - - {"x": 1, "y": 5, "matrix": [5, 1] }, - {"x": 2, "y": 5, "matrix": [5, 2] }, - {"x": 3, "y": 5, "matrix": [5, 3] }, - {"x": 4, "y": 5, "matrix": [5, 4] }, - - {"x": 16, "y": 5, "matrix": [5, 14] }, - {"x": 17, "y": 5, "matrix": [5, 15] }, - {"x": 18, "y": 5, "matrix": [5, 16] }, - {"x": 19, "y": 5, "matrix": [5, 17] }, - - {"x": 5, "y": 7, "matrix": [4, 6] }, - {"x": 6, "y": 7, "matrix": [4, 7] }, - {"x": 7, "y": 7, "matrix": [4, 8] }, - - {"x": 13, "y": 7, "matrix": [4, 10] }, - {"x": 14, "y": 7, "matrix": [4, 11] }, - {"x": 15, "y": 7, "matrix": [4, 12] }, - - {"x": 5, "y": 8, "h": 2, "matrix": [5, 6] }, - {"x": 6, "y": 8, "h": 2, "matrix": [5, 7] }, - {"x": 7, "y": 8, "matrix": [5, 8] }, - - {"x": 13, "y": 8, "matrix": [5, 10] }, - {"x": 14, "y": 8, "h": 2, "matrix": [5, 11] }, - {"x": 15, "y": 8, "h": 2, "matrix": [5, 12] }, - - {"x": 7, "y": 9, "matrix": [6, 8] }, - {"x": 13, "y": 9, "matrix": [6, 10] } + {"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": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "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": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, + {"matrix": [0, 15], "x": 17, "y": 0}, + {"matrix": [0, 16], "x": 18, "y": 0}, + {"matrix": [0, 17], "x": 19, "y": 0}, + {"matrix": [0, 18], "x": 20, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + + {"matrix": [1, 13], "x": 15, "y": 1}, + {"matrix": [1, 14], "x": 16, "y": 1}, + {"matrix": [1, 15], "x": 17, "y": 1}, + {"matrix": [1, 16], "x": 18, "y": 1}, + {"matrix": [1, 17], "x": 19, "y": 1}, + {"matrix": [1, 18], "x": 20, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "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": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [2, 14], "x": 16, "y": 2}, + {"matrix": [2, 15], "x": 17, "y": 2}, + {"matrix": [2, 16], "x": 18, "y": 2}, + {"matrix": [2, 17], "x": 19, "y": 2}, + {"matrix": [2, 18], "x": 20, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [3, 14], "x": 16, "y": 3}, + {"matrix": [3, 15], "x": 17, "y": 3}, + {"matrix": [3, 16], "x": 18, "y": 3}, + {"matrix": [3, 17], "x": 19, "y": 3}, + {"matrix": [3, 18], "x": 20, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "h": 2}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + + {"matrix": [4, 13], "x": 15, "y": 4}, + {"matrix": [4, 14], "x": 16, "y": 4}, + {"matrix": [4, 15], "x": 17, "y": 4}, + {"matrix": [4, 16], "x": 18, "y": 4}, + {"matrix": [4, 17], "x": 19, "y": 4}, + {"matrix": [4, 18], "x": 20, "y": 4, "h": 2}, + + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + + {"matrix": [5, 14], "x": 16, "y": 5}, + {"matrix": [5, 15], "x": 17, "y": 5}, + {"matrix": [5, 16], "x": 18, "y": 5}, + {"matrix": [5, 17], "x": 19, "y": 5}, + + {"matrix": [4, 6], "x": 5, "y": 7}, + {"matrix": [4, 7], "x": 6, "y": 7}, + {"matrix": [4, 8], "x": 7, "y": 7}, + + {"matrix": [4, 10], "x": 13, "y": 7}, + {"matrix": [4, 11], "x": 14, "y": 7}, + {"matrix": [4, 12], "x": 15, "y": 7}, + + {"matrix": [5, 6], "x": 5, "y": 8, "h": 2}, + {"matrix": [5, 7], "x": 6, "y": 8, "h": 2}, + {"matrix": [5, 8], "x": 7, "y": 8}, + + {"matrix": [5, 10], "x": 13, "y": 8}, + {"matrix": [5, 11], "x": 14, "y": 8, "h": 2}, + {"matrix": [5, 12], "x": 15, "y": 8, "h": 2}, + + {"matrix": [6, 8], "x": 7, "y": 9}, + + {"matrix": [6, 10], "x": 13, "y": 9} ] } } diff --git a/keyboards/handwired/eagleii/eagleii.h b/keyboards/handwired/eagleii/eagleii.h deleted file mode 100644 index 5f3acac79842..000000000000 --- a/keyboards/handwired/eagleii/eagleii.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K47, K27, K37, K38, K28, K39, K29, K34, K24, K31, K21, K32, K22, K33, K23, K0A, K0B, K46, K44, \ - K17, K97, K18, K98, K19, K99, K14, K94, K11, K91, K12, K92, K13, K83, K8A, K8B, K43, K4A, \ - KA0, K77, K88, K78, K89, K79, K84, K74, K81, K71, K82, K72, K93, K1A, K1B, K42, K6B, \ - K50, K87, K08, K68, K09, K69, K04, K61, K01, K62, K02, K70, K6A, K41, \ - KB5, K66, K07, K64, K76, K03 \ -) { \ - { KC_NO, K01, K02, K03, K04, KC_NO, KC_NO, K07, K08, K09, K0A, K0B }, \ - { KC_NO, K11, K12, K13, K14, KC_NO, KC_NO, K17, K18, K19, K1A, K1B }, \ - { KC_NO, K21, K22, K23, K24, KC_NO, KC_NO, K27, K28, K29, KC_NO, KC_NO }, \ - { KC_NO, K31, K32, K33, K34, KC_NO, KC_NO, K37, K38, K39, KC_NO, KC_NO }, \ - { KC_NO, K41, K42, K43, K44, KC_NO, K46, K47, KC_NO, KC_NO, K4A, KC_NO }, \ - { K50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, K61, K62, KC_NO, K64, KC_NO, K66, KC_NO, K68, K69, K6A, K6B }, \ - { K70, K71, K72, KC_NO, K74, KC_NO, K76, K77, K78, K79, KC_NO, KC_NO }, \ - { KC_NO, K81, K82, K83, K84, KC_NO, KC_NO, K87, K88, K89, K8A, K8B }, \ - { KC_NO, K91, K92, K93, K94, KC_NO, KC_NO, K97, K98, K99, KC_NO, KC_NO }, \ - { KA0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KB5, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/handwired/eagleii/info.json b/keyboards/handwired/eagleii/info.json index e84808c71dad..a321bf8ed199 100644 --- a/keyboards/handwired/eagleii/info.json +++ b/keyboards/handwired/eagleii/info.json @@ -18,80 +18,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K47 (F7,C7)", "x":0, "y":0, "w":1.5}, - {"label":"K27 (F1,C7)", "x":1.5, "y":0}, - {"label":"K37 (B2,C7)", "x":2.5, "y":0}, - {"label":"K38 (B2,F0)", "x":3.5, "y":0}, - {"label":"K28 (F1,F0)", "x":4.5, "y":0}, - {"label":"K39 (B2,B6)", "x":5.5, "y":0}, - {"label":"K29 (F1,B6)", "x":6.5, "y":0}, - {"label":"K34 (B2,B3)", "x":7.5, "y":0}, - {"label":"K24 (F1,B3)", "x":8.5, "y":0}, - {"label":"K31 (B2,C6)", "x":9.5, "y":0}, - {"label":"K21 (F1,C6)", "x":10.5, "y":0}, - {"label":"K32 (B2,E6)", "x":11.5, "y":0}, - {"label":"K22 (F1,E6)", "x":12.5, "y":0}, - {"label":"K33 (B2,D5)", "x":13.5, "y":0}, - {"label":"K23 (F1,D5)", "x":14.5, "y":0}, - {"label":"K0A (D0,B1)", "x":16.5, "y":0}, - {"label":"K0B (D0,F4)", "x":17.5, "y":0}, - {"label":"K46 (F7,D1)", "x":18.5, "y":0}, - {"label":"K44 (F7,B3)", "x":20.5, "y":0}, - {"label":"K17 (B5,C7)", "x":0, "y":1, "w":2}, - {"label":"K97 (B7,C7)", "x":2, "y":1}, - {"label":"K18 (B5,F0)", "x":3, "y":1}, - {"label":"K98 (B7,F0)", "x":4, "y":1}, - {"label":"K19 (B5,B6)", "x":5, "y":1}, - {"label":"K99 (B7,B6)", "x":6, "y":1}, - {"label":"K14 (B5,B3)", "x":7, "y":1}, - {"label":"K94 (B7,B3)", "x":8, "y":1}, - {"label":"K11 (B5,C6)", "x":9, "y":1}, - {"label":"K91 (B7,C6)", "x":10, "y":1}, - {"label":"K12 (B5,E6)", "x":11, "y":1}, - {"label":"K92 (B7,E6)", "x":12, "y":1}, - {"label":"K13 (B5,D5)", "x":13, "y":1}, - {"label":"K83 (B4,D5)", "x":14, "y":1, "w":1.5}, - {"label":"K8A (B4,B1)", "x":16.5, "y":1}, - {"label":"K8B (B4,F4)", "x":17.5, "y":1}, - {"label":"K43 (F7,D5)", "x":18.5, "y":1}, - {"label":"K4A (F7,B1)", "x":20.5, "y":1}, - {"label":"KA0 (F5,D2)", "x":0.25, "y":2, "w":2}, - {"label":"K77 (D7,C7)", "x":2.25, "y":2}, - {"label":"K88 (B4,F0)", "x":3.25, "y":2}, - {"label":"K78 (D7,F0)", "x":4.25, "y":2}, - {"label":"K89 (B4,B6)", "x":5.25, "y":2}, - {"label":"K79 (D7,B6)", "x":6.25, "y":2}, - {"label":"K84 (B4,B3)", "x":7.25, "y":2}, - {"label":"K74 (D7,B3)", "x":8.25, "y":2}, - {"label":"K81 (B4,C6)", "x":9.25, "y":2}, - {"label":"K71 (D7,C6)", "x":10.25, "y":2}, - {"label":"K82 (B4,E6)", "x":11.25, "y":2}, - {"label":"K72 (D7,E6)", "x":12.25, "y":2}, - {"label":"K93 (B7,D5)", "x":13.25, "y":2, "w":2}, - {"label":"K1A (B5,B1)", "x":16.5, "y":2}, - {"label":"K1B (B5,F4)", "x":17.5, "y":2}, - {"label":"K42 (F7,E6)", "x":18.5, "y":2}, - {"label":"K6B (D4,F4)", "x":20.5, "y":2, "h":2}, - {"label":"K50 (F6,D2)", "x":0.75, "y":3, "w":2}, - {"label":"K87 (B4,C7)", "x":2.75, "y":3}, - {"label":"K08 (D0,F0)", "x":3.75, "y":3}, - {"label":"K68 (D4,F0)", "x":4.75, "y":3}, - {"label":"K09 (D0,B6)", "x":5.75, "y":3}, - {"label":"K69 (D4,B6)", "x":6.75, "y":3}, - {"label":"K04 (D0,B3)", "x":7.75, "y":3}, - {"label":"K61 (D4,C6)", "x":8.75, "y":3}, - {"label":"K01 (D0,C6)", "x":9.75, "y":3}, - {"label":"K62 (D4,E6)", "x":10.75, "y":3}, - {"label":"K02 (D0,E6)", "x":11.75, "y":3}, - {"label":"K70 (D7,D2)", "x":12.75, "y":3, "w":2}, - {"label":"K6A (D4,B1)", "x":16.5, "y":3, "w":2}, - {"label":"K41 (F7,C6)", "x":18.5, "y":3}, - {"label":"KB5 (B0,D3)", "x":0.75, "y":4}, - {"label":"K66 (D4,D1)", "x":1.75, "y":4}, - {"label":"K07 (D0,C7)", "x":2.75, "y":4}, - {"label":"K64 (D4,B3)", "x":3.75, "y":4, "w":8}, - {"label":"K76 (D7,D1)", "x":11.75, "y":4}, - {"label":"K03 (D0,D5)", "x":12.75, "y":4, "w":2} + {"matrix": [4, 7], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [2, 7], "x": 1.5, "y": 0}, + {"matrix": [3, 7], "x": 2.5, "y": 0}, + {"matrix": [3, 8], "x": 3.5, "y": 0}, + {"matrix": [2, 8], "x": 4.5, "y": 0}, + {"matrix": [3, 9], "x": 5.5, "y": 0}, + {"matrix": [2, 9], "x": 6.5, "y": 0}, + {"matrix": [3, 4], "x": 7.5, "y": 0}, + {"matrix": [2, 4], "x": 8.5, "y": 0}, + {"matrix": [3, 1], "x": 9.5, "y": 0}, + {"matrix": [2, 1], "x": 10.5, "y": 0}, + {"matrix": [3, 2], "x": 11.5, "y": 0}, + {"matrix": [2, 2], "x": 12.5, "y": 0}, + {"matrix": [3, 3], "x": 13.5, "y": 0}, + {"matrix": [2, 3], "x": 14.5, "y": 0}, + + {"matrix": [0, 10], "x": 16.5, "y": 0}, + {"matrix": [0, 11], "x": 17.5, "y": 0}, + {"matrix": [4, 6], "x": 18.5, "y": 0}, + + {"matrix": [4, 4], "x": 20.5, "y": 0}, + + {"matrix": [1, 7], "x": 0, "y": 1, "w": 2}, + {"matrix": [9, 7], "x": 2, "y": 1}, + {"matrix": [1, 8], "x": 3, "y": 1}, + {"matrix": [9, 8], "x": 4, "y": 1}, + {"matrix": [1, 9], "x": 5, "y": 1}, + {"matrix": [9, 9], "x": 6, "y": 1}, + {"matrix": [1, 4], "x": 7, "y": 1}, + {"matrix": [9, 4], "x": 8, "y": 1}, + {"matrix": [1, 1], "x": 9, "y": 1}, + {"matrix": [9, 1], "x": 10, "y": 1}, + {"matrix": [1, 2], "x": 11, "y": 1}, + {"matrix": [9, 2], "x": 12, "y": 1}, + {"matrix": [1, 3], "x": 13, "y": 1}, + {"matrix": [8, 3], "x": 14, "y": 1, "w": 1.5}, + + {"matrix": [8, 10], "x": 16.5, "y": 1}, + {"matrix": [8, 11], "x": 17.5, "y": 1}, + {"matrix": [4, 3], "x": 18.5, "y": 1}, + + {"matrix": [4, 10], "x": 20.5, "y": 1}, + + {"matrix": [10, 0], "x": 0.25, "y": 2, "w": 2}, + {"matrix": [7, 7], "x": 2.25, "y": 2}, + {"matrix": [8, 8], "x": 3.25, "y": 2}, + {"matrix": [7, 8], "x": 4.25, "y": 2}, + {"matrix": [8, 9], "x": 5.25, "y": 2}, + {"matrix": [7, 9], "x": 6.25, "y": 2}, + {"matrix": [8, 4], "x": 7.25, "y": 2}, + {"matrix": [7, 4], "x": 8.25, "y": 2}, + {"matrix": [8, 1], "x": 9.25, "y": 2}, + {"matrix": [7, 1], "x": 10.25, "y": 2}, + {"matrix": [8, 2], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [9, 3], "x": 13.25, "y": 2, "w": 2}, + + {"matrix": [1, 10], "x": 16.5, "y": 2}, + {"matrix": [1, 11], "x": 17.5, "y": 2}, + {"matrix": [4, 2], "x": 18.5, "y": 2}, + + {"matrix": [6, 11], "x": 20.5, "y": 2, "h": 2}, + + {"matrix": [5, 0], "x": 0.75, "y": 3, "w": 2}, + {"matrix": [8, 7], "x": 2.75, "y": 3}, + {"matrix": [0, 8], "x": 3.75, "y": 3}, + {"matrix": [6, 8], "x": 4.75, "y": 3}, + {"matrix": [0, 9], "x": 5.75, "y": 3}, + {"matrix": [6, 9], "x": 6.75, "y": 3}, + {"matrix": [0, 4], "x": 7.75, "y": 3}, + {"matrix": [6, 1], "x": 8.75, "y": 3}, + {"matrix": [0, 1], "x": 9.75, "y": 3}, + {"matrix": [6, 2], "x": 10.75, "y": 3}, + {"matrix": [0, 2], "x": 11.75, "y": 3}, + {"matrix": [7, 0], "x": 12.75, "y": 3, "w": 2}, + + {"matrix": [6, 10], "x": 16.5, "y": 3, "w": 2}, + {"matrix": [4, 1], "x": 18.5, "y": 3}, + + {"matrix": [11, 5], "x": 0.75, "y": 4}, + {"matrix": [6, 6], "x": 1.75, "y": 4}, + {"matrix": [0, 7], "x": 2.75, "y": 4}, + {"matrix": [6, 4], "x": 3.75, "y": 4, "w": 8}, + {"matrix": [7, 6], "x": 11.75, "y": 4}, + {"matrix": [0, 3], "x": 12.75, "y": 4, "w": 2} ] } } diff --git a/keyboards/handwired/ergocheap/ergocheap.h b/keyboards/handwired/ergocheap/ergocheap.h deleted file mode 100644 index 106fa45328ef..000000000000 --- a/keyboards/handwired/ergocheap/ergocheap.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 xSteins - -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" - -/* - * The first section contains all of the arguments representing the physical - * layout of the board and position of the Keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. -*/ - - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, K2D, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3D, K3E, K3F, \ - K40, K42, K44, K45, K46, K47, K48, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B, K2D, K2E, K2F }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO, K3B, K3D, K3E, K3F }, \ - { K40, KC_NO, K42, KC_NO, K44, K45, K46, K47, K48, KC_NO, KC_NO, K4B, K4D, K4E, K4F } \ -} diff --git a/keyboards/handwired/ergocheap/info.json b/keyboards/handwired/ergocheap/info.json index 097a4e627869..12bff57b3e06 100644 --- a/keyboards/handwired/ergocheap/info.json +++ b/keyboards/handwired/ergocheap/info.json @@ -18,75 +18,84 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0.75, "y":0}, - {"label":"1", "x":1.75, "y":0}, - {"label":"2", "x":2.75, "y":0}, - {"label":"3", "x":4.25, "y":0}, - {"label":"4", "x":5.25, "y":0}, - {"label":"5", "x":6.25, "y":0}, - {"label":"6", "x":7.25, "y":0}, - {"label":"7", "x":10.5, "y":0}, - {"label":"8", "x":11.5, "y":0}, - {"label":"9", "x":12.5, "y":0}, - {"label":"0", "x":13.5, "y":0}, - {"label":"MINS", "x":14.5, "y":0}, - {"label":"EQL", "x":16, "y":0}, - {"label":"BSPC", "x":17, "y":0, "w":2}, - {"label":"GRV", "x":19, "y":0}, - {"label":"TAB", "x":0.5, "y":1, "w":1.5}, - {"label":"Q", "x":2, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":10, "y":1}, - {"label":"U", "x":11, "y":1}, - {"label":"I", "x":12, "y":1}, - {"label":"O", "x":13, "y":1}, - {"label":"P", "x":14, "y":1}, - {"label":"LBRC", "x":16, "y":1}, - {"label":"RBRC", "x":17, "y":1}, - {"label":"BSLS", "x":18, "y":1, "w":1.5}, - {"label":"DEL", "x":19.5, "y":1}, - {"label":"CAPS", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":4, "y":2}, - {"label":"D", "x":5, "y":2}, - {"label":"F", "x":6, "y":2}, - {"label":"G", "x":7, "y":2}, - {"label":"H", "x":10.25, "y":2}, - {"label":"J", "x":11.25, "y":2}, - {"label":"K", "x":12.25, "y":2}, - {"label":"L", "x":13.25, "y":2}, - {"label":"SCLN", "x":15.5, "y":2}, - {"label":"QUOT", "x":16.5, "y":2}, - {"label":"ENT", "x":17.5, "y":2, "w":2.25}, - {"label":"HOME", "x":19.75, "y":2}, - {"label":"LSFT", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":4.5, "y":3}, - {"label":"C", "x":5.5, "y":3}, - {"label":"V", "x":6.5, "y":3}, - {"label":"B", "x":7.5, "y":3}, - {"label":"N", "x":10.5, "y":3}, - {"label":"M", "x":11.5, "y":3}, - {"label":"COMM", "x":12.5, "y":3}, - {"label":"DOT", "x":13.5, "y":3}, - {"label":"SLSH", "x":15.75, "y":3}, - {"label":"TO(_FN1)", "x":16.75, "y":3, "w":1.25}, - {"label":"UP", "x":18, "y":3}, - {"label":"END", "x":19.5, "y":3}, - {"label":"LCTL", "x":0, "y":4, "w":1.25}, - {"label":"LALT", "x":4.5, "y":4, "w":1.25}, - {"label":"SPC", "x":5.75, "y":4, "w":2}, - {"label":"MO(_FN1)", "x":7.75, "y":4, "w":1.25}, - {"label":"SPC", "x":10, "y":4, "w":1.75}, - {"label":"SPC", "x":11.75, "y":4}, - {"label":"MO(_FN1)", "x":12.75, "y":4, "w":1.25}, - {"label":"LGUI", "x":15.5, "y":4, "w":1.25}, - {"label":"LEFT", "x":17, "y":4}, - {"label":"DOWN", "x":18, "y":4}, - {"label":"RGHT", "x":19, "y":4} + {"matrix": [0, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0}, + {"matrix": [0, 5], "x": 6.25, "y": 0}, + {"matrix": [0, 6], "x": 7.25, "y": 0}, + + {"matrix": [0, 7], "x": 10.5, "y": 0}, + {"matrix": [0, 8], "x": 11.5, "y": 0}, + {"matrix": [0, 9], "x": 12.5, "y": 0}, + {"matrix": [0, 10], "x": 13.5, "y": 0}, + {"matrix": [0, 11], "x": 14.5, "y": 0}, + {"matrix": [0, 12], "x": 16, "y": 0}, + {"matrix": [0, 13], "x": 17, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 19, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3.75, "y": 1}, + {"matrix": [1, 3], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + + {"matrix": [1, 6], "x": 10, "y": 1}, + {"matrix": [1, 7], "x": 11, "y": 1}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [1, 9], "x": 13, "y": 1}, + {"matrix": [1, 10], "x": 14, "y": 1}, + {"matrix": [1, 11], "x": 16, "y": 1}, + {"matrix": [1, 12], "x": 17, "y": 1}, + {"matrix": [1, 13], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 19.5, "y": 1}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [2, 3], "x": 5, "y": 2}, + {"matrix": [2, 4], "x": 6, "y": 2}, + {"matrix": [2, 5], "x": 7, "y": 2}, + + {"matrix": [2, 6], "x": 10.25, "y": 2}, + {"matrix": [2, 7], "x": 11.25, "y": 2}, + {"matrix": [2, 8], "x": 12.25, "y": 2}, + {"matrix": [2, 9], "x": 13.25, "y": 2}, + {"matrix": [2, 11], "x": 15.5, "y": 2}, + {"matrix": [2, 12], "x": 16.5, "y": 2}, + {"matrix": [2, 13], "x": 17.5, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 19.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 4.5, "y": 3}, + {"matrix": [3, 3], "x": 5.5, "y": 3}, + {"matrix": [3, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 3}, + + {"matrix": [3, 6], "x": 10.5, "y": 3}, + {"matrix": [3, 7], "x": 11.5, "y": 3}, + {"matrix": [3, 8], "x": 12.5, "y": 3}, + {"matrix": [3, 9], "x": 13.5, "y": 3}, + {"matrix": [3, 11], "x": 15.75, "y": 3}, + {"matrix": [3, 12], "x": 16.75, "y": 3, "w": 1.25}, + {"matrix": [3, 13], "x": 18, "y": 3}, + {"matrix": [3, 14], "x": 19.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 10, "y": 4, "w": 1.75}, + {"matrix": [4, 7], "x": 11.75, "y": 4}, + {"matrix": [4, 8], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 15.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 17, "y": 4}, + {"matrix": [4, 13], "x": 18, "y": 4}, + {"matrix": [4, 14], "x": 19, "y": 4} ] } } diff --git a/keyboards/handwired/evk/v1_3/info.json b/keyboards/handwired/evk/v1_3/info.json index 10564bb2a7a7..7e3baab9addc 100644 --- a/keyboards/handwired/evk/v1_3/info.json +++ b/keyboards/handwired/evk/v1_3/info.json @@ -21,101 +21,117 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k0A", "x":0, "y":0.4}, - {"label":"k0B", "x":1, "y":0.2}, - {"label":"k0C", "x":2, "y":0}, - {"label":"k0D", "x":3, "y":0.2}, - {"label":"k0E", "x":4, "y":0.2}, - {"label":"k0F", "x":5, "y":0.2}, - {"label":"k0G", "x":7, "y":0.2}, - {"label":"k0H", "x":8, "y":0.2}, - {"label":"k0I", "x":9, "y":0.2}, - {"label":"k0J", "x":10, "y":0.2}, - {"label":"k0K", "x":12.2, "y":0.2}, - {"label":"k0L", "x":13.2, "y":0.2}, - {"label":"k0M", "x":14.2, "y":0.2}, - {"label":"k0N", "x":15.2, "y":0}, - {"label":"k0O", "x":16.2, "y":0.2}, - {"label":"k0P", "x":17.2, "y":0.4}, - - {"label":"k1A", "x":0, "y":1.4}, - {"label":"k1B", "x":1, "y":1.2}, - {"label":"k1C", "x":2, "y":1}, - {"label":"k1D", "x":3, "y":1.2}, - {"label":"k1E", "x":4, "y":1.2}, - {"label":"k1F", "x":5, "y":1.2}, - {"label":"k1G", "x":7, "y":1.2}, - {"label":"k1H", "x":8, "y":1.2}, - {"label":"k1I", "x":9, "y":1.2}, - {"label":"k1J", "x":10, "y":1.2}, - {"label":"k1K", "x":12.2, "y":1.2}, - {"label":"k1L", "x":13.2, "y":1.2}, - {"label":"k1M", "x":14.2, "y":1.2}, - {"label":"k1N", "x":15.2, "y":1}, - {"label":"k1O", "x":16.2, "y":1.2}, - {"label":"k1P", "x":17.2, "y":1.4}, - - {"label":"k2A", "x":0, "y":2.4}, - {"label":"k2B", "x":1, "y":2.2}, - {"label":"k2C", "x":2, "y":2}, - {"label":"k2D", "x":3, "y":2.2}, - {"label":"k2E", "x":4, "y":2.2}, - {"label":"k2F", "x":5, "y":2.2}, - {"label":"k2G", "x":7, "y":2.2}, - {"label":"k2H", "x":8, "y":2.2}, - {"label":"k2I", "x":9, "y":2.2}, - {"label":"k2J", "x":10, "y":2.2}, - {"label":"k2K", "x":12.2, "y":2.2}, - {"label":"k2L", "x":13.2, "y":2.2}, - {"label":"k2M", "x":14.2, "y":2.2}, - {"label":"k2N", "x":15.2, "y":2}, - {"label":"k2O", "x":16.2, "y":2.2}, - {"label":"k2P", "x":17.2, "y":2.4}, - - {"label":"k3A", "x":0, "y":3.4}, - {"label":"k3B", "x":1, "y":3.2}, - {"label":"k3C", "x":2, "y":3}, - {"label":"k3D", "x":3, "y":3.2}, - {"label":"k3E", "x":4, "y":3.2}, - {"label":"k3G", "x":7, "y":3.2}, - {"label":"k3H", "x":8, "y":3.2}, - {"label":"k3I", "x":9, "y":3.2}, - {"label":"k3J", "x":10, "y":3.2}, - {"label":"k3L", "x":13.2, "y":3.2}, - {"label":"k3M", "x":14.2, "y":3.2}, - {"label":"k3N", "x":15.2, "y":3}, - {"label":"k3O", "x":16.2, "y":3.2}, - {"label":"k3P", "x":17.2, "y":3.4}, - - {"label":"k4A", "x":0, "y":4.4}, - {"label":"k4B", "x":1, "y":4.2}, - {"label":"k4C", "x":2, "y":4}, - {"label":"k4D", "x":3, "y":4.2}, - {"label":"k4E", "x":4, "y":4.2}, - {"label":"k4F", "x":5.2, "y":4.4}, - {"label":"k4G", "x":7, "y":4.2}, - {"label":"k4H", "x":8, "y":4.2}, - {"label":"k4I", "x":9, "y":4.2}, - {"label":"k4J", "x":10, "y":4.2}, - {"label":"k4K", "x":12, "y":4.4}, - {"label":"k4L", "x":13.2, "y":4.2}, - {"label":"k4M", "x":14.2, "y":4.2}, - {"label":"k4N", "x":15.2, "y":4}, - {"label":"k4O", "x":16.2, "y":4.2}, - {"label":"k4P", "x":17.2, "y":4.4}, - - {"label":"k5B", "x":1, "y":5.2}, - {"label":"k5C", "x":2, "y":5}, - {"label":"k5E", "x":4.2, "y":5.4}, - {"label":"k5F", "x":5.24, "y":5.4}, - {"label":"k5G", "x":7, "y":5.2}, - {"label":"k5H", "x":8, "y":5.2}, - {"label":"k5I", "x":9, "y":5.2}, - {"label":"k5J", "x":10, "y":5.2}, - {"label":"k5K", "x":12, "y":5.4}, - {"label":"k5L", "x":13, "y":5.4}, - {"label":"k5N", "x":15.2, "y":5}, - {"label":"k5O", "x":16.2, "y":5.2} + {"matrix": [0, 0], "x": 0, "y": 0.4}, + {"matrix": [0, 1], "x": 1, "y": 0.2}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.2}, + {"matrix": [0, 4], "x": 4, "y": 0.2}, + {"matrix": [0, 5], "x": 5, "y": 0.2}, + + {"matrix": [0, 6], "x": 7, "y": 0.2}, + {"matrix": [0, 7], "x": 8, "y": 0.2}, + {"matrix": [0, 8], "x": 9, "y": 0.2}, + {"matrix": [0, 9], "x": 10, "y": 0.2}, + + {"matrix": [0, 10], "x": 12.2, "y": 0.2}, + {"matrix": [0, 11], "x": 13.2, "y": 0.2}, + {"matrix": [0, 12], "x": 14.2, "y": 0.2}, + {"matrix": [0, 13], "x": 15.2, "y": 0}, + {"matrix": [0, 14], "x": 16.2, "y": 0.2}, + {"matrix": [0, 15], "x": 17.2, "y": 0.4}, + + {"matrix": [1, 0], "x": 0, "y": 1.4}, + {"matrix": [1, 1], "x": 1, "y": 1.2}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.2}, + {"matrix": [1, 4], "x": 4, "y": 1.2}, + {"matrix": [1, 5], "x": 5, "y": 1.2}, + + {"matrix": [1, 6], "x": 7, "y": 1.2}, + {"matrix": [1, 7], "x": 8, "y": 1.2}, + {"matrix": [1, 8], "x": 9, "y": 1.2}, + {"matrix": [1, 9], "x": 10, "y": 1.2}, + + {"matrix": [1, 10], "x": 12.2, "y": 1.2}, + {"matrix": [1, 11], "x": 13.2, "y": 1.2}, + {"matrix": [1, 12], "x": 14.2, "y": 1.2}, + {"matrix": [1, 13], "x": 15.2, "y": 1}, + {"matrix": [1, 14], "x": 16.2, "y": 1.2}, + {"matrix": [1, 15], "x": 17.2, "y": 1.4}, + + {"matrix": [2, 0], "x": 0, "y": 2.4}, + {"matrix": [2, 1], "x": 1, "y": 2.2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.2}, + {"matrix": [2, 4], "x": 4, "y": 2.2}, + {"matrix": [2, 5], "x": 5, "y": 2.2}, + + {"matrix": [2, 6], "x": 7, "y": 2.2}, + {"matrix": [2, 7], "x": 8, "y": 2.2}, + {"matrix": [2, 8], "x": 9, "y": 2.2}, + {"matrix": [2, 9], "x": 10, "y": 2.2}, + + {"matrix": [2, 10], "x": 12.2, "y": 2.2}, + {"matrix": [2, 11], "x": 13.2, "y": 2.2}, + {"matrix": [2, 12], "x": 14.2, "y": 2.2}, + {"matrix": [2, 13], "x": 15.2, "y": 2}, + {"matrix": [2, 14], "x": 16.2, "y": 2.2}, + {"matrix": [2, 15], "x": 17.2, "y": 2.4}, + + {"matrix": [3, 0], "x": 0, "y": 3.4}, + {"matrix": [3, 1], "x": 1, "y": 3.2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.2}, + {"matrix": [3, 4], "x": 4, "y": 3.2}, + + {"matrix": [3, 6], "x": 7, "y": 3.2}, + {"matrix": [3, 7], "x": 8, "y": 3.2}, + {"matrix": [3, 8], "x": 9, "y": 3.2}, + {"matrix": [3, 9], "x": 10, "y": 3.2}, + + {"matrix": [3, 11], "x": 13.2, "y": 3.2}, + {"matrix": [3, 12], "x": 14.2, "y": 3.2}, + {"matrix": [3, 13], "x": 15.2, "y": 3}, + {"matrix": [3, 14], "x": 16.2, "y": 3.2}, + {"matrix": [3, 15], "x": 17.2, "y": 3.4}, + + {"matrix": [4, 0], "x": 0, "y": 4.4}, + {"matrix": [4, 1], "x": 1, "y": 4.2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4.2}, + {"matrix": [4, 4], "x": 4, "y": 4.2}, + + {"matrix": [4, 5], "x": 5.2, "y": 4.4}, + + {"matrix": [4, 6], "x": 7, "y": 4.2}, + {"matrix": [4, 7], "x": 8, "y": 4.2}, + {"matrix": [4, 8], "x": 9, "y": 4.2}, + {"matrix": [4, 9], "x": 10, "y": 4.2}, + + {"matrix": [4, 10], "x": 12, "y": 4.4}, + + {"matrix": [4, 11], "x": 13.2, "y": 4.2}, + {"matrix": [4, 12], "x": 14.2, "y": 4.2}, + {"matrix": [4, 13], "x": 15.2, "y": 4}, + {"matrix": [4, 14], "x": 16.2, "y": 4.2}, + {"matrix": [4, 15], "x": 17.2, "y": 4.4}, + + {"matrix": [5, 1], "x": 1, "y": 5.2}, + {"matrix": [5, 2], "x": 2, "y": 5}, + + {"matrix": [5, 4], "x": 4.2, "y": 5.4}, + {"matrix": [5, 5], "x": 5.24, "y": 5.4}, + + {"matrix": [5, 6], "x": 7, "y": 5.2}, + {"matrix": [5, 7], "x": 8, "y": 5.2}, + {"matrix": [5, 8], "x": 9, "y": 5.2}, + {"matrix": [5, 9], "x": 10, "y": 5.2}, + + {"matrix": [5, 10], "x": 12, "y": 5.4}, + {"matrix": [5, 11], "x": 13, "y": 5.4}, + + {"matrix": [5, 13], "x": 15.2, "y": 5}, + {"matrix": [5, 14], "x": 16.2, "y": 5.2} ] } } diff --git a/keyboards/handwired/evk/v1_3/v1_3.c b/keyboards/handwired/evk/v1_3/v1_3.c index 718a3361229d..7c6889396836 100644 --- a/keyboards/handwired/evk/v1_3/v1_3.c +++ b/keyboards/handwired/evk/v1_3/v1_3.c @@ -12,7 +12,7 @@ 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 . */ -#include "v1_3.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/handwired/evk/v1_3/v1_3.h b/keyboards/handwired/evk/v1_3/v1_3.h deleted file mode 100644 index da02b806f8ad..000000000000 --- a/keyboards/handwired/evk/v1_3/v1_3.h +++ /dev/null @@ -1,43 +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 XXX KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT(\ - k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P, \ - k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P, \ - k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P, \ - k3A, k3B, k3C, k3D, k3E, k3G, k3H, k3I, k3J, k3L, k3M, k3N, k3O, k3P, \ - k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P, \ - k5B, k5C, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, k5N, k5O \ -) { \ - { k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, k0K, k0L, k0M, k0N, k0O, k0P }, \ - { k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J, k1K, k1L, k1M, k1N, k1O, k1P }, \ - { k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, k2J, k2K, k2L, k2M, k2N, k2O, k2P }, \ - { k3A, k3B, k3C, k3D, k3E, XXX, k3G, k3H, k3I, k3J, XXX, k3L, k3M, k3N, k3O, k3P }, \ - { k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, k4J, k4K, k4L, k4M, k4N, k4O, k4P }, \ - { XXX, k5B, k5C, XXX, k5E, k5F, k5G, k5H, k5I, k5J, k5k, k5L, XXX, k5N, k5O, XXX } \ -} diff --git a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h b/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h deleted file mode 100644 index f9abbf383576..000000000000 --- a/keyboards/handwired/fc200rt_qmk/fc200rt_qmk.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2020 NaCly - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k31, k62, k63, k13, k33, k70, k36, k17, k67, k6A, k7A, k3A, k5A, k79, k09, k00, \ - k61, k71, k72, k73, k74, k64, k65, k75, k76, k77, k78, k68, k66, k1A, k6C, k6E, k6D, \ - k11, k01, k02, k03, k04, k14, k15, k05, k06, k07, k08, k18, k16, k2A, k6B, k7E, k7D, \ - k12, k21, k22, k23, k24, k34, k35, k25, k26, k27, k28, k38, k4A, \ - k1F, k41, k42, k43, k44, k54, k55, k45, k46, k47, k58, k2F, k3E, \ - k60, k10, k39, k3B, k59, k29, k57, k40, k5E, k5B, k5C \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, KC_NO, k1A, KC_NO, KC_NO, KC_NO, KC_NO, k1F }, \ - { KC_NO, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, KC_NO, KC_NO, KC_NO, KC_NO, k2F }, \ - { KC_NO, k31, KC_NO, k33, k34, k35, k36, KC_NO, k38, k39, k3A, k3B, KC_NO, KC_NO, k3E, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, KC_NO, KC_NO, k4A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, k54, k55, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, KC_NO, k6A, k6B, k6C, k6D, k6E, KC_NO }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A, KC_NO, KC_NO, k7D, k7E, KC_NO }, \ -} diff --git a/keyboards/handwired/fc200rt_qmk/info.json b/keyboards/handwired/fc200rt_qmk/info.json index 395b42bcc8d2..8528b0abc25d 100644 --- a/keyboards/handwired/fc200rt_qmk/info.json +++ b/keyboards/handwired/fc200rt_qmk/info.json @@ -17,7 +17,109 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "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.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, "w":2}, {"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":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"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":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}] + "layout": [ + {"matrix": [3, 1], "x": 0, "y": 0}, + + {"matrix": [6, 2], "x": 2, "y": 0}, + {"matrix": [6, 3], "x": 3, "y": 0}, + {"matrix": [1, 3], "x": 4, "y": 0}, + {"matrix": [3, 3], "x": 5, "y": 0}, + + {"matrix": [7, 0], "x": 6.5, "y": 0}, + {"matrix": [3, 6], "x": 7.5, "y": 0}, + {"matrix": [1, 7], "x": 8.5, "y": 0}, + {"matrix": [6, 7], "x": 9.5, "y": 0}, + + {"matrix": [6, 10], "x": 11, "y": 0}, + {"matrix": [7, 10], "x": 12, "y": 0}, + {"matrix": [3, 10], "x": 13, "y": 0}, + {"matrix": [5, 10], "x": 14, "y": 0}, + + {"matrix": [7, 9], "x": 15.25, "y": 0}, + {"matrix": [0, 9], "x": 16.25, "y": 0}, + {"matrix": [0, 0], "x": 17.25, "y": 0}, + + {"matrix": [6, 1], "x": 0, "y": 1.5}, + {"matrix": [7, 1], "x": 1, "y": 1.5}, + {"matrix": [7, 2], "x": 2, "y": 1.5}, + {"matrix": [7, 3], "x": 3, "y": 1.5}, + {"matrix": [7, 4], "x": 4, "y": 1.5}, + {"matrix": [6, 4], "x": 5, "y": 1.5}, + {"matrix": [6, 5], "x": 6, "y": 1.5}, + {"matrix": [7, 5], "x": 7, "y": 1.5}, + {"matrix": [7, 6], "x": 8, "y": 1.5}, + {"matrix": [7, 7], "x": 9, "y": 1.5}, + {"matrix": [7, 8], "x": 10, "y": 1.5}, + {"matrix": [6, 8], "x": 11, "y": 1.5}, + {"matrix": [6, 6], "x": 12, "y": 1.5}, + {"matrix": [1, 10], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [6, 12], "x": 15.25, "y": 1.5}, + {"matrix": [6, 14], "x": 16.25, "y": 1.5}, + {"matrix": [6, 13], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 2.5}, + {"matrix": [0, 2], "x": 2.5, "y": 2.5}, + {"matrix": [0, 3], "x": 3.5, "y": 2.5}, + {"matrix": [0, 4], "x": 4.5, "y": 2.5}, + {"matrix": [1, 4], "x": 5.5, "y": 2.5}, + {"matrix": [1, 5], "x": 6.5, "y": 2.5}, + {"matrix": [0, 5], "x": 7.5, "y": 2.5}, + {"matrix": [0, 6], "x": 8.5, "y": 2.5}, + {"matrix": [0, 7], "x": 9.5, "y": 2.5}, + {"matrix": [0, 8], "x": 10.5, "y": 2.5}, + {"matrix": [1, 8], "x": 11.5, "y": 2.5}, + {"matrix": [1, 6], "x": 12.5, "y": 2.5}, + {"matrix": [2, 10], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [6, 11], "x": 15.25, "y": 2.5}, + {"matrix": [7, 14], "x": 16.25, "y": 2.5}, + {"matrix": [7, 13], "x": 17.25, "y": 2.5}, + + {"matrix": [1, 2], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3.5}, + {"matrix": [2, 2], "x": 2.75, "y": 3.5}, + {"matrix": [2, 3], "x": 3.75, "y": 3.5}, + {"matrix": [2, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 4], "x": 5.75, "y": 3.5}, + {"matrix": [3, 5], "x": 6.75, "y": 3.5}, + {"matrix": [2, 5], "x": 7.75, "y": 3.5}, + {"matrix": [2, 6], "x": 8.75, "y": 3.5}, + {"matrix": [2, 7], "x": 9.75, "y": 3.5}, + {"matrix": [2, 8], "x": 10.75, "y": 3.5}, + {"matrix": [3, 8], "x": 11.75, "y": 3.5}, + {"matrix": [4, 10], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [1, 15], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [5, 4], "x": 6.25, "y": 4.5}, + {"matrix": [5, 5], "x": 7.25, "y": 4.5}, + {"matrix": [4, 5], "x": 8.25, "y": 4.5}, + {"matrix": [4, 6], "x": 9.25, "y": 4.5}, + {"matrix": [4, 7], "x": 10.25, "y": 4.5}, + {"matrix": [5, 8], "x": 11.25, "y": 4.5}, + {"matrix": [2, 15], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [3, 14], "x": 16.25, "y": 4.5}, + + {"matrix": [6, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [1, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [3, 9], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [3, 11], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [2, 9], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [4, 0], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 11], "x": 16.25, "y": 5.5}, + {"matrix": [5, 12], "x": 17.25, "y": 5.5} + ] } } + } diff --git a/keyboards/handwired/fivethirteen/fivethirteen.h b/keyboards/handwired/fivethirteen/fivethirteen.h deleted file mode 100644 index ffa0bd59d5ad..000000000000 --- a/keyboards/handwired/fivethirteen/fivethirteen.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, \ - k40, k41, k42, k43, k44, k46, k47, k48, k49, k4A, k4B, k4C \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C }, \ - { k40, k41, k42, k43, k44, XXX, k46, k47, k48, k49, k4A, k4B, k4C } \ -} diff --git a/keyboards/handwired/fivethirteen/info.json b/keyboards/handwired/fivethirteen/info.json index 66e51571e2de..66d556f7ac12 100644 --- a/keyboards/handwired/fivethirteen/info.json +++ b/keyboards/handwired/fivethirteen/info.json @@ -18,70 +18,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"[", "x":11, "y":1}, - {"label":"]", "x":12, "y":1}, - {"label":"Ctrl/Esc", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":";", "x":10, "y":2}, - {"label":"'", "x":11, "y":2}, - {"label":"Enter", "x":12, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6, "y":3}, - {"label":"M", "x":7, "y":3}, - {"label":",", "x":8, "y":3}, - {"label":".", "x":9, "y":3}, - {"label":"/", "x":10, "y":3}, - {"label":"Up", "x":11, "y":3}, - {"label":"\\", "x":12, "y":3}, - {"label":"MO(MOS)", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"GUI", "x":3, "y":4}, - {"label":"MO(HDN)", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4, "w":2}, - {"label":"Shift/Backspace", "x":7, "y":4}, - {"label":"MO(OSY)", "x":8, "y":4}, - {"label":"MO(HDN)", "x":9, "y":4}, - {"label":"Left", "x":10, "y":4}, - {"label":"Down", "x":11, "y":4}, - {"label":"Right", "x":12, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4} ] } } diff --git a/keyboards/handwired/frenchdev/frenchdev.h b/keyboards/handwired/frenchdev/frenchdev.h index d608fe9f0924..6bea49d87b95 100644 --- a/keyboards/handwired/frenchdev/frenchdev.h +++ b/keyboards/handwired/frenchdev/frenchdev.h @@ -73,38 +73,3 @@ inline void frenchdev_led_all_set(uint8_t n) frenchdev_led_2_set(n); frenchdev_led_3_set(n); } - -#define LAYOUT( \ - \ - k01, k02, k03, k04, k05, k06, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k29, k2a, k2b, k2c, k2d, k2e, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k39, k3a, k3b, k3c, k3d, k3e, k3f, \ - k40, k41, k42, k43, k44, k45, k46, k47, k37, k38, k48, k49, k4a, k4b, k4c, k4d, k4e, k4f, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e, k5f, \ - \ - PL1, PL2, PL3, \ - PR1, PR2, PR3 \ - ) \ - \ - /* matrix positions, inverted left and right for I2C to be on row 0-7 */\ - { \ - \ - { k5f, k4f, k3f, k2f, k1f, KC_NO}, \ - { k5e, k4e, k3e, k2e, k1e, k0e }, \ - { k5d, k4d, k3d, k2d, k1d, k0d }, \ - { k5c, k4c, k3c, k2c, k1c, k0c }, \ - { k5b, k4b, k3b, k2b, k1b, k0b }, \ - { k5a, k4a, k3a, k2a, k1a, k0a }, \ - { k59, k49, k39, k29, k19, k09 }, \ - { k58, k48, k38, PR1, PR2, PR3 }, \ - \ - { k57, k47, k37, PL1, PL2, PL3 }, \ - { k56, k46, k36, k26, k16, k06 }, \ - { k55, k45, k35, k25, k15, k05 }, \ - { k54, k44, k34, k24, k14, k04 }, \ - { k53, k43, k33, k23, k13, k03 }, \ - { k52, k42, k32, k22, k12, k02 }, \ - { k51, k41, k31, k21, k11, k01 }, \ - { k50, k40, k30, k20, k10, KC_NO } \ - } diff --git a/keyboards/handwired/frenchdev/info.json b/keyboards/handwired/frenchdev/info.json index a179dde73fb2..d5981aebd471 100644 --- a/keyboards/handwired/frenchdev/info.json +++ b/keyboards/handwired/frenchdev/info.json @@ -12,106 +12,119 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F1", "x":1, "y":0.9}, - {"label":"F2", "x":2, "y":0.3}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0.4}, - {"label":"F5", "x":5, "y":0.5}, - {"label":"F6", "x":6, "y":0.5}, - {"label":"F7", "x":13, "y":0.5}, - {"label":"F8", "x":14, "y":0.5}, - {"label":"F9", "x":15, "y":0.4}, - {"label":"F10", "x":16, "y":0}, - {"label":"F11", "x":17, "y":0.3}, - {"label":"F12", "x":18, "y":0.9}, - - {"label":"Esc", "x":0, "y":1.9}, - {"label":"\"", "x":1, "y":1.9}, - {"label":"\u00ab", "x":2, "y":1.3}, - {"label":"\u00bb", "x":3, "y":1}, - {"label":"(", "x":4, "y":1.4}, - {"label":")", "x":5, "y":1.5}, - {"label":"\u00a8", "x":6, "y":1.5}, - {"label":"^", "x":13, "y":1.5}, - {"label":"@", "x":14, "y":1.5}, - {"label":"+", "x":15, "y":1.4}, - {"label":"-", "x":16, "y":1}, - {"label":"/", "x":17, "y":1.3}, - {"label":"*", "x":18, "y":1.9}, - {"label":"Backspace", "x":19, "y":1.9}, - - {"label":"Tab", "x":0, "y":2.9}, - {"label":"B", "x":1, "y":2.9}, - {"label":"É", "x":2, "y":2.3}, - {"label":"P", "x":3, "y":2}, - {"label":"O", "x":4, "y":2.4}, - {"label":"È", "x":5, "y":2.5}, - {"label":"_", "x":6, "y":2.5}, - {"label":"=", "x":13, "y":2.5}, - {"label":"K", "x":14, "y":2.5}, - {"label":"V", "x":15, "y":2.4}, - {"label":"D", "x":16, "y":2}, - {"label":"L", "x":17, "y":2.3}, - {"label":"J", "x":18, "y":2.9}, - {"label":"Enter", "x":19, "y":2.9}, - - {"label":"`", "x":0, "y":3.9}, - {"label":"A", "x":1, "y":3.9}, - {"label":"U", "x":2, "y":3.3}, - {"label":"E", "x":3, "y":3}, - {"label":"I", "x":4, "y":3.4}, - {"label":"F", "x":5, "y":3.5}, - {"label":";", "x":6, "y":3.5}, - {"label":"!", "x":13, "y":3.5}, - {"label":"C", "x":14, "y":3.5}, - {"label":"T", "x":15, "y":3.4}, - {"label":"S", "x":16, "y":3}, - {"label":"R", "x":17, "y":3.3}, - {"label":"N", "x":18, "y":3.9}, - {"label":"'", "x":19, "y":3.9}, - - {"label":"Shift", "x":0, "y":4.9}, - {"label":"Z", "x":1, "y":4.9}, - {"label":"À", "x":2, "y":4.3}, - {"label":"Y", "x":3, "y":4}, - {"label":"X", "x":4, "y":4.4}, - {"label":"]", "x":5, "y":4.5}, - {"label":"Shift/Space", "x":6.5, "y":5}, - {"label":"Ctrl/Backspace", "x":7.5, "y":5}, - {"label":"Layer 2/Insert", "x":8.5, "y":5}, - {"label":"Layer 2 Lock", "x":10.5, "y":5}, - {"label":"Ctrl/Delete", "x":11.5, "y":5}, - {"label":"Shift/Space", "x":12.5, "y":5}, - {"label":"M", "x":14, "y":4.5}, - {"label":"G", "x":15, "y":4.4}, - {"label":"Up", "x":16, "y":4}, - {"label":"H", "x":17, "y":4.3}, - {"label":"Q", "x":18, "y":4.9}, - {"label":"Shift", "x":19, "y":4.9}, - - {"label":"Ctrl", "x":0, "y":5.9}, - {"label":"GUI", "x":1, "y":5.9}, - {"label":"Keypad /", "x":2, "y":5.3}, - {"label":".", "x":3, "y":5}, - {"label":",", "x":4, "y":5.4}, - {"label":"Space", "x":5, "y":5.5}, - {"label":"Layer 1/Space", "x":6.5, "y":6}, - {"label":"Alt", "x":7.5, "y":6}, - {"label":"Caps Lock", "x":11.5, "y":6}, - {"label":"Layer 1/Space", "x":12.5, "y":6}, - {"label":"Space", "x":14, "y":5.5}, - {"label":"Left", "x":15, "y":5.4}, - {"label":"Down", "x":16, "y":5}, - {"label":"Right", "x":17, "y":5.3}, - {"label":":", "x":18, "y":5.9}, - {"label":"Ctrl", "x":19, "y":5.9}, - - {"label":"Left Pedal 1", "x":2.25, "y":7.5, "w":1.5, "h":2}, - {"label":"Left Pedal 2", "x":3.75, "y":7.5, "w":1.5, "h":2}, - {"label":"Left Pedal 3", "x":5.25, "y":7.5, "w":1.5, "h":2}, - {"label":"Right Pedal 1", "x":13.25, "y":7.5, "w":1.5, "h":2}, - {"label":"Right Pedal 2", "x":14.75, "y":7.5, "w":1.5, "h":2}, - {"label":"Right Pedal 3", "x":16.25, "y":7.5, "w":1.5, "h":2} + {"matrix": [14, 5], "x": 1, "y": 0.9}, + {"matrix": [13, 5], "x": 2, "y": 0.3}, + {"matrix": [12, 5], "x": 3, "y": 0}, + {"matrix": [11, 5], "x": 4, "y": 0.4}, + {"matrix": [10, 5], "x": 5, "y": 0.5}, + {"matrix": [9, 5], "x": 6, "y": 0.5}, + + {"matrix": [6, 5], "x": 13, "y": 0.5}, + {"matrix": [5, 5], "x": 14, "y": 0.5}, + {"matrix": [4, 5], "x": 15, "y": 0.4}, + {"matrix": [3, 5], "x": 16, "y": 0}, + {"matrix": [2, 5], "x": 17, "y": 0.3}, + {"matrix": [1, 5], "x": 18, "y": 0.9}, + + {"matrix": [15, 4], "x": 0, "y": 1.9}, + {"matrix": [14, 4], "x": 1, "y": 1.9}, + {"matrix": [13, 4], "x": 2, "y": 1.3}, + {"matrix": [12, 4], "x": 3, "y": 1}, + {"matrix": [11, 4], "x": 4, "y": 1.4}, + {"matrix": [10, 4], "x": 5, "y": 1.5}, + {"matrix": [9, 4], "x": 6, "y": 1.5}, + + {"matrix": [6, 4], "x": 13, "y": 1.5}, + {"matrix": [5, 4], "x": 14, "y": 1.5}, + {"matrix": [4, 4], "x": 15, "y": 1.4}, + {"matrix": [3, 4], "x": 16, "y": 1}, + {"matrix": [2, 4], "x": 17, "y": 1.3}, + {"matrix": [1, 4], "x": 18, "y": 1.9}, + {"matrix": [0, 4], "x": 19, "y": 1.9}, + + {"matrix": [15, 3], "x": 0, "y": 2.9}, + {"matrix": [14, 3], "x": 1, "y": 2.9}, + {"matrix": [13, 3], "x": 2, "y": 2.3}, + {"matrix": [12, 3], "x": 3, "y": 2}, + {"matrix": [11, 3], "x": 4, "y": 2.4}, + {"matrix": [10, 3], "x": 5, "y": 2.5}, + {"matrix": [9, 3], "x": 6, "y": 2.5}, + + {"matrix": [6, 3], "x": 13, "y": 2.5}, + {"matrix": [5, 3], "x": 14, "y": 2.5}, + {"matrix": [4, 3], "x": 15, "y": 2.4}, + {"matrix": [3, 3], "x": 16, "y": 2}, + {"matrix": [2, 3], "x": 17, "y": 2.3}, + {"matrix": [1, 3], "x": 18, "y": 2.9}, + {"matrix": [0, 3], "x": 19, "y": 2.9}, + + {"matrix": [15, 2], "x": 0, "y": 3.9}, + {"matrix": [14, 2], "x": 1, "y": 3.9}, + {"matrix": [13, 2], "x": 2, "y": 3.3}, + {"matrix": [12, 2], "x": 3, "y": 3}, + {"matrix": [11, 2], "x": 4, "y": 3.4}, + {"matrix": [10, 2], "x": 5, "y": 3.5}, + {"matrix": [9, 2], "x": 6, "y": 3.5}, + + {"matrix": [6, 2], "x": 13, "y": 3.5}, + {"matrix": [5, 2], "x": 14, "y": 3.5}, + {"matrix": [4, 2], "x": 15, "y": 3.4}, + {"matrix": [3, 2], "x": 16, "y": 3}, + {"matrix": [2, 2], "x": 17, "y": 3.3}, + {"matrix": [1, 2], "x": 18, "y": 3.9}, + {"matrix": [0, 2], "x": 19, "y": 3.9}, + + {"matrix": [15, 1], "x": 0, "y": 4.9}, + {"matrix": [14, 1], "x": 1, "y": 4.9}, + {"matrix": [13, 1], "x": 2, "y": 4.3}, + {"matrix": [12, 1], "x": 3, "y": 4}, + {"matrix": [11, 1], "x": 4, "y": 4.4}, + {"matrix": [10, 1], "x": 5, "y": 4.5}, + + {"matrix": [9, 1], "x": 6.5, "y": 5}, + {"matrix": [8, 1], "x": 7.5, "y": 5}, + {"matrix": [8, 2], "x": 8.5, "y": 5}, + + {"matrix": [7, 2], "x": 10.5, "y": 5}, + {"matrix": [7, 1], "x": 11.5, "y": 5}, + {"matrix": [6, 1], "x": 12.5, "y": 5}, + + {"matrix": [5, 1], "x": 14, "y": 4.5}, + {"matrix": [4, 1], "x": 15, "y": 4.4}, + {"matrix": [3, 1], "x": 16, "y": 4}, + {"matrix": [2, 1], "x": 17, "y": 4.3}, + {"matrix": [1, 1], "x": 18, "y": 4.9}, + {"matrix": [0, 1], "x": 19, "y": 4.9}, + + {"matrix": [15, 0], "x": 0, "y": 5.9}, + {"matrix": [14, 0], "x": 1, "y": 5.9}, + {"matrix": [13, 0], "x": 2, "y": 5.3}, + {"matrix": [12, 0], "x": 3, "y": 5}, + {"matrix": [11, 0], "x": 4, "y": 5.4}, + {"matrix": [10, 0], "x": 5, "y": 5.5}, + + {"matrix": [9, 0], "x": 6.5, "y": 6}, + {"matrix": [8, 0], "x": 7.5, "y": 6}, + + {"matrix": [7, 0], "x": 11.5, "y": 6}, + {"matrix": [6, 0], "x": 12.5, "y": 6}, + + {"matrix": [5, 0], "x": 14, "y": 5.5}, + {"matrix": [4, 0], "x": 15, "y": 5.4}, + {"matrix": [3, 0], "x": 16, "y": 5}, + {"matrix": [2, 0], "x": 17, "y": 5.3}, + {"matrix": [1, 0], "x": 18, "y": 5.9}, + {"matrix": [0, 0], "x": 19, "y": 5.9}, + + {"matrix": [8, 3], "x": 2.25, "y": 7.5, "w": 1.5, "h": 2}, + {"matrix": [8, 4], "x": 3.75, "y": 7.5, "w": 1.5, "h": 2}, + + {"matrix": [8, 5], "x": 5.25, "y": 7.5, "w": 1.5, "h": 2}, + + {"matrix": [7, 3], "x": 13.25, "y": 7.5, "w": 1.5, "h": 2}, + {"matrix": [7, 4], "x": 14.75, "y": 7.5, "w": 1.5, "h": 2}, + + {"matrix": [7, 5], "x": 16.25, "y": 7.5, "w": 1.5, "h": 2} ] } } diff --git a/keyboards/handwired/freoduo/freoduo.h b/keyboards/handwired/freoduo/freoduo.h deleted file mode 100644 index 3093a9362708..000000000000 --- a/keyboards/handwired/freoduo/freoduo.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Filip Paryż (@FilipParyz) - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, KC_NO}, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { KC_NO, R41, R42, R43, R44, R45 } \ - } diff --git a/keyboards/handwired/freoduo/info.json b/keyboards/handwired/freoduo/info.json index 90b34f29d49e..5ddf21ee7956 100644 --- a/keyboards/handwired/freoduo/info.json +++ b/keyboards/handwired/freoduo/info.json @@ -25,65 +25,74 @@ "layouts": { "LAYOUT": { "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": 7, "y": 0}, - {"x": 8, "y": 0}, - {"x": 9, "y": 0}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 7, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - {"x": 2, "y": 4}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4, "w": 2}, - {"x": 7, "y": 4, "w": 2}, - {"x": 9, "y": 4}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4}, - {"x": 12, "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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2}, + + {"matrix": [9, 1], "x": 7, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} + ] } } +} diff --git a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h b/keyboards/handwired/hacked_motospeed/hacked_motospeed.h deleted file mode 100644 index 1063fd2e6231..000000000000 --- a/keyboards/handwired/hacked_motospeed/hacked_motospeed.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2019 Vladislav Opara - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - EWR, DWR, CWR, BWR, AWR, FXR, FYL, AZL, BZL, CZL, DZL, \ - DXR, CXR, BXR, AXR, FZR, DVL, AYL, BYL, CYL, DYL, EZL, \ - EZR, DYR, CYR, BYR, AYR, DVR, FZL, AXL, BXL, CXL, DXL, \ - DZR, CZR, BZR, AZR, FYR, FXL, AWL, BWL, CWL, DWL, EWL \ -) \ -{ \ - { EWR, DWR, CWR, BWR, AWR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, DXR, CXR, BXR, AXR, FXR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, DYR, CYR, BYR, AYR, FYR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { EZR, DZR, CZR, AZR, BZR, FZR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, DVR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FZL, BZL, AZL, CZL, DZL, EZL }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FYL, AYL, BYL, CYL, DYL, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, FXL, AXL, BXL, CXL, DXL, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, AWL, BWL, CWL, DWL, EWL }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, DVL, KC_NO } \ -} diff --git a/keyboards/handwired/hacked_motospeed/info.json b/keyboards/handwired/hacked_motospeed/info.json index c64931a74bfe..86736773ece8 100644 --- a/keyboards/handwired/hacked_motospeed/info.json +++ b/keyboards/handwired/hacked_motospeed/info.json @@ -20,7 +20,59 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"ESC", "x":0, "y":0, "h":2}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Z", "x":7, "y":0}, {"label":"U", "x":8, "y":0}, {"label":"I", "x":9, "y":0}, {"label":"O", "x":10, "y":0}, {"label":"P", "x":11, "y":0, "w":2}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":7, "y":1}, {"label":"J", "x":8, "y":1}, {"label":"K", "x":9, "y":1}, {"label":"L", "x":10, "y":1}, {"label":"(", "x":11, "y":1}, {"label":")", "x":12, "y":1}, {"label":"=", "x":0, "y":2}, {"label":"Y", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":",", "x":9, "y":2}, {"label":".", "x":10, "y":2}, {"label":"?", "x":11, "y":2}, {"label":"Fn", "x":0, "y":3, "w":2}, {"label":"Num", "x":2, "y":3}, {"label":"Bksp", "x":3, "y":3}, {"label":"Enter", "x":4, "y":3}, {"label":"Spc", "x":5, "y":3}, {"label":"LShift", "x":7, "y":3}, {"label":"LCtrl", "x":8, "y":3}, {"label":"LAlt", "x":9, "y":3}, {"label":"RAlt", "x":10, "y":3}, {"label":"Meta", "x":11, "y":3}, {"label":"Fn", "x":12, "y":2, "h":2}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "h": 2}, + {"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": [1, 5], "x": 5, "y": 0}, + + {"matrix": [6, 6], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [5, 7], "x": 9, "y": 0}, + {"matrix": [5, 9], "x": 10, "y": 0}, + {"matrix": [5, 10], "x": 11, "y": 0, "w": 2}, + + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [3, 5], "x": 5, "y": 1}, + + {"matrix": [9, 10], "x": 7, "y": 1}, + {"matrix": [6, 7], "x": 8, "y": 1}, + {"matrix": [6, 8], "x": 9, "y": 1}, + {"matrix": [6, 9], "x": 10, "y": 1}, + {"matrix": [6, 10], "x": 11, "y": 1}, + {"matrix": [5, 11], "x": 12, "y": 1}, + + {"matrix": [3, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [4, 1], "x": 5, "y": 2}, + + {"matrix": [5, 6], "x": 7, "y": 2}, + {"matrix": [7, 7], "x": 8, "y": 2}, + {"matrix": [7, 8], "x": 9, "y": 2}, + {"matrix": [7, 9], "x": 10, "y": 2}, + {"matrix": [7, 10], "x": 11, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 4], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [2, 5], "x": 5, "y": 3}, + + {"matrix": [7, 6], "x": 7, "y": 3}, + {"matrix": [8, 7], "x": 8, "y": 3}, + {"matrix": [8, 8], "x": 9, "y": 3}, + {"matrix": [8, 9], "x": 10, "y": 3}, + {"matrix": [8, 10], "x": 11, "y": 3}, + {"matrix": [8, 11], "x": 12, "y": 2, "h": 2} + ] } } } diff --git a/keyboards/handwired/hexon38/hexon38.h b/keyboards/handwired/hexon38/hexon38.h deleted file mode 100644 index f98f460faf82..000000000000 --- a/keyboards/handwired/hexon38/hexon38.h +++ /dev/null @@ -1,17 +0,0 @@ -// see https://github.com/pepaslabs/hexon38 - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K002, K003, K004, K005, K006, K007, K008, K009, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K207, K208, K209, K210, K211, \ - K302, K303, K304, K305, K306, K307, K308, K309 \ -) { \ - { KC_NO, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, KC_NO, KC_NO }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, KC_NO, KC_NO, K207, K208, K209, K210, K211 }, \ - { KC_NO, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/hexon38/info.json b/keyboards/handwired/hexon38/info.json index 2f22eeeaf8f0..5bb94b0c4054 100644 --- a/keyboards/handwired/hexon38/info.json +++ b/keyboards/handwired/hexon38/info.json @@ -18,47 +18,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, - {"x":17, "y":1}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [0, 7], "x": 13, "y": 0}, + {"matrix": [0, 8], "x": 14, "y": 0}, + {"matrix": [0, 9], "x": 15, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, - {"x":17, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.5, "y":3}, - {"x":7.5, "y":3}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3} + {"matrix": [1, 6], "x": 12, "y": 1}, + {"matrix": [1, 7], "x": 13, "y": 1}, + {"matrix": [1, 8], "x": 14, "y": 1}, + {"matrix": [1, 9], "x": 15, "y": 1}, + {"matrix": [1, 10], "x": 16, "y": 1}, + {"matrix": [1, 11], "x": 17, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [2, 7], "x": 13, "y": 2}, + {"matrix": [2, 8], "x": 14, "y": 2}, + {"matrix": [2, 9], "x": 15, "y": 2}, + {"matrix": [2, 10], "x": 16, "y": 2}, + {"matrix": [2, 11], "x": 17, "y": 2}, + + {"matrix": [3, 2], "x": 4.5, "y": 3}, + {"matrix": [3, 3], "x": 5.5, "y": 3}, + {"matrix": [3, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 3}, + + {"matrix": [3, 6], "x": 9.5, "y": 3}, + {"matrix": [3, 7], "x": 10.5, "y": 3}, + {"matrix": [3, 8], "x": 11.5, "y": 3}, + {"matrix": [3, 9], "x": 12.5, "y": 3} ] } } diff --git a/keyboards/handwired/hnah40/hnah40.h b/keyboards/handwired/hnah40/hnah40.h deleted file mode 100644 index 28e09f668320..000000000000 --- a/keyboards/handwired/hnah40/hnah40.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2019 HnahKB - * - * 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" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments representing the physical -// layout of the board and position of the keys -// The second converts the arguments into a two-dimensional array which -// represents the switch matrix. - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k39, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, \ - k30, k31, k32, k33, k35, k37, k38, k3A\ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \ - { k30, k31, k32, k33, KC_NO, k35, KC_NO, k37, k38, k39, k3A }, \ -} diff --git a/keyboards/handwired/hnah40/info.json b/keyboards/handwired/hnah40/info.json index cd94929ea183..a4ed0756e7a2 100644 --- a/keyboards/handwired/hnah40/info.json +++ b/keyboards/handwired/hnah40/info.json @@ -18,48 +18,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"BSPC", "x":11, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"Enter", "x":10.5, "y":1, "w":1.5}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":",", "x":8.75, "y":2}, - {"label":".", "x":9.75, "y":2}, - {"label":"Shift", "x":10.75, "y":2, "w":1.25}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3, "w":1.5}, - {"label":"Alt", "x":2.75, "y":3, "w":1.25}, - {"label":"Space", "x":4, "y":3, "w":2}, - {"label":"Space", "x":6, "y":3, "w":2}, - {"label":"App", "x":8, "y":3, "w":1.25}, - {"label":"Fn", "x":9.25, "y":3, "w":1.5}, - {"label":"Ctrl", "x":10.75, "y":3, "w":1.25} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [3, 9], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 9.25, "y": 3, "w": 1.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/handwired/hwpm87/hwpm87.h b/keyboards/handwired/hwpm87/hwpm87.h deleted file mode 100644 index 7de32eaa8c49..000000000000 --- a/keyboards/handwired/hwpm87/hwpm87.h +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright 2022 CAO THAI DUONG (@KD-MM2) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K02, K03, K04, K05, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, K1G, K1H, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4G, \ - K50, K51, K53, K56, K5A, K5B, K5D, K5E, K5F, K5G, K5H \ -) { \ - { K00, XXX, K02, K03, K04, K05, XXX, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E, K1F, K1G, K1H }, \ - { K20, XXX, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX, XXX, XXX, XXX }, \ - { XXX, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX, XXX, K4G, XXX }, \ - { K50, K51, XXX, K53, XXX, XXX, K56, XXX, XXX, XXX, K5A, K5B, XXX, K5D, K5E, K5F, K5G, K5H }, \ -} diff --git a/keyboards/handwired/hwpm87/info.json b/keyboards/handwired/hwpm87/info.json index a719ba5ef241..88079c32adc3 100644 --- a/keyboards/handwired/hwpm87/info.json +++ b/keyboards/handwired/hwpm87/info.json @@ -22,95 +22,107 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (B0,D3)", "x": 0, "y": 0 }, - { "label": "K02 (B0,D1)", "x": 2, "y": 0 }, - { "label": "K03 (B0,D0)", "x": 3, "y": 0 }, - { "label": "K04 (B0,D4)", "x": 4, "y": 0 }, - { "label": "K05 (B0,C6)", "x": 5, "y": 0 }, - { "label": "K07 (B0,E6)", "x": 6.5, "y": 0 }, - { "label": "K08 (B0,B7)", "x": 7.5, "y": 0 }, - { "label": "K09 (B0,F0)", "x": 8.5, "y": 0 }, - { "label": "K0A (B0,F1)", "x": 9.5, "y": 0 }, - { "label": "K0B (B0,D5)", "x": 11, "y": 0 }, - { "label": "K0C (B0,D6)", "x": 12, "y": 0 }, - { "label": "K0D (B0,C7)", "x": 13, "y": 0 }, - { "label": "K0E (B0,E2)", "x": 14, "y": 0 }, - { "label": "K0F (B0,B6)", "x": 15.25, "y": 0 }, - { "label": "K0G (B0,F7)", "x": 16.25, "y": 0 }, - { "label": "K0H (B0,F6)", "x": 17.25, "y": 0 }, - { "label": "K10 (B1,D3)", "x": 0, "y": 1 }, - { "label": "K11 (B1,D2)", "x": 1, "y": 1 }, - { "label": "K12 (B1,D1)", "x": 2, "y": 1 }, - { "label": "K13 (B1,D0)", "x": 3, "y": 1 }, - { "label": "K14 (B1,D4)", "x": 4, "y": 1 }, - { "label": "K15 (B1,C6)", "x": 5, "y": 1 }, - { "label": "K16 (B1,D7)", "x": 6, "y": 1 }, - { "label": "K17 (B1,E6)", "x": 7, "y": 1 }, - { "label": "K18 (B1,B7)", "x": 8, "y": 1 }, - { "label": "K19 (B1,F0)", "x": 9, "y": 1 }, - { "label": "K1A (B1,F1)", "x": 10, "y": 1 }, - { "label": "K1B (B1,D5)", "x": 11, "y": 1 }, - { "label": "K1C (B1,D6)", "x": 12, "y": 1 }, - { "label": "K1E (B1,E2)", "x": 13, "y": 1, "w": 2 }, - { "label": "K1F (B1,B6)", "x": 15.25, "y": 1 }, - { "label": "K1G (B1,F7)", "x": 16.25, "y": 1 }, - { "label": "K1H (B1,F6)", "x": 17.25, "y": 1 }, - { "label": "K20 (B2,D3)", "x": 0, "y": 2, "w": 1.5 }, - { "label": "K22 (B2,D1)", "x": 1.5, "y": 2 }, - { "label": "K23 (B2,D0)", "x": 2.5, "y": 2 }, - { "label": "K24 (B2,D4)", "x": 3.5, "y": 2 }, - { "label": "K25 (B2,C6)", "x": 4.5, "y": 2 }, - { "label": "K26 (B2,D7)", "x": 5.5, "y": 2 }, - { "label": "K27 (B2,E6)", "x": 6.5, "y": 2 }, - { "label": "K28 (B2,B7)", "x": 7.5, "y": 2 }, - { "label": "K29 (B2,F0)", "x": 8.5, "y": 2 }, - { "label": "K2A (B2,F1)", "x": 9.5, "y": 2 }, - { "label": "K2B (B2,D5)", "x": 10.5, "y": 2 }, - { "label": "K2C (B2,D6)", "x": 11.5, "y": 2 }, - { "label": "K2D (B2,C7)", "x": 12.5, "y": 2 }, - { "label": "K2E (B2,E2)", "x": 13.5, "y": 2, "w": 1.5 }, - { "label": "K2F (B2,B6)", "x": 15.25, "y": 2 }, - { "label": "K2G (B2,F7)", "x": 16.25, "y": 2 }, - { "label": "K2H (B2,F6)", "x": 17.25, "y": 2 }, - { "label": "K30 (B3,D3)", "x": 0, "y": 3, "w": 1.75 }, - { "label": "K32 (B3,D1)", "x": 1.75, "y": 3 }, - { "label": "K33 (B3,D0)", "x": 2.75, "y": 3 }, - { "label": "K34 (B3,D4)", "x": 3.75, "y": 3 }, - { "label": "K35 (B3,C6)", "x": 4.75, "y": 3 }, - { "label": "K36 (B3,D7)", "x": 5.75, "y": 3 }, - { "label": "K37 (B3,E6)", "x": 6.75, "y": 3 }, - { "label": "K38 (B3,B7)", "x": 7.75, "y": 3 }, - { "label": "K39 (B3,F0)", "x": 8.75, "y": 3 }, - { "label": "K3A (B3,F1)", "x": 9.75, "y": 3 }, - { "label": "K3B (B3,D5)", "x": 10.75, "y": 3 }, - { "label": "K3C (B3,D6)", "x": 11.75, "y": 3 }, - { "label": "K3D (B3,C7)", "x": 12.75, "y": 3, "w": 2.25 }, - { "label": "K41 (B4,D2)", "x": 0, "y": 4, "w": 2.25 }, - { "label": "K42 (B4,D1)", "x": 2.25, "y": 4 }, - { "label": "K43 (B4,D0)", "x": 3.25, "y": 4 }, - { "label": "K44 (B4,D4)", "x": 4.25, "y": 4 }, - { "label": "K45 (B4,C6)", "x": 5.25, "y": 4 }, - { "label": "K46 (B4,D7)", "x": 6.25, "y": 4 }, - { "label": "K47 (B4,E6)", "x": 7.25, "y": 4 }, - { "label": "K48 (B4,B7)", "x": 8.25, "y": 4 }, - { "label": "K49 (B4,F0)", "x": 9.25, "y": 4 }, - { "label": "K4A (B4,F1)", "x": 10.25, "y": 4 }, - { "label": "K4B (B4,D5)", "x": 11.25, "y": 4 }, - { "label": "K4D (B4,C7)", "x": 12.25, "y": 4, "w": 2.75 }, - { "label": "K4G (B4,F7)", "x": 16.25, "y": 4 }, - { "label": "K50 (B5,D3)", "x": 0, "y": 5, "w": 1.25 }, - { "label": "K51 (B5,D2)", "x": 1.25, "y": 5, "w": 1.25 }, - { "label": "K53 (B5,D0)", "x": 2.5, "y": 5, "w": 1.25 }, - { "label": "K56 (B5,D7)", "x": 3.75, "y": 5, "w": 6.25 }, - { "label": "K5A (B5,F1)", "x": 10, "y": 5, "w": 1.25 }, - { "label": "K5B (B5,D5)", "x": 11.25, "y": 5, "w": 1.25 }, - { "label": "K5D (B5,C7)", "x": 12.5, "y": 5, "w": 1.25 }, - { "label": "K5E (B5,E2)", "x": 13.75, "y": 5, "w": 1.25 }, - { "label": "K5F (B5,B6)", "x": 15.25, "y": 5 }, - { "label": "K5G (B5,F7)", "x": 16.25, "y": 5 }, - { "label": "K5H (B5,F6)", "x": 17.25, "y": 5 } + {"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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + {"matrix": [1, 16], "x": 16.25, "y": 1}, + {"matrix": [1, 17], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2}, + {"matrix": [2, 16], "x": 16.25, "y": 2}, + {"matrix": [2, 17], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5, "w": 1.25}, + {"matrix": [5, 13], "x": 12.5, "y": 5, "w": 1.25}, + {"matrix": [5, 14], "x": 13.75, "y": 5, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5}, + {"matrix": [5, 16], "x": 16.25, "y": 5}, + {"matrix": [5, 17], "x": 17.25, "y": 5} ] } } - } diff --git a/keyboards/handwired/ibm122m/ibm122m.h b/keyboards/handwired/ibm122m/ibm122m.h deleted file mode 100644 index a52bf4bc44db..000000000000 --- a/keyboards/handwired/ibm122m/ibm122m.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2018 REPLACE_WITH_YOUR_NAME - * - * 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" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k09, k19, k1A, k29, k39, k3A, k49, k59, k5A, k69, k79, k7A, \ - k0A, k0B, k1B, k2A, k2B, k3B, k4A, k4B, k5B, k6A, k6B, k7B, \ - k31, k32, k34, k24, k25, k26, k27, k37, k38, k28, k2C, k2D, k2E, k3E, k3C, k3F, k3G, k3H, k2G, k2F, k2H, k2I, k20, \ - k21, k41, k42, k44, k45, k46, k47, k57, k58, k48, k4C, k4D, k4E, k5E, k5C, k6F, k1G, k5G, k4G, k4F, k4H, k4I, k40, \ - k51, k52, k62, k14, k15, k16, k17, k07, k08, k18, k1C, k1D, k1E, k0E, k6E, k0G, k1F, k1H, k1I, k10, \ - k11, k12, k73, k74, k64, k65, k66, k67, k77, k78, k68, k6C, k6D, k7E, k63, k60, k0J, k1J, k61, k6H, k6I, k7J, \ - k02, k01, k00, k70, k71, k03, k72, k0F, k7H, k7I \ -) \ -{ \ - { k00, k01, k02, k03, KC_NO, KC_NO, KC_NO, k07, k08, k09, k0A, k0B, KC_NO, KC_NO, k0E, k0F, k0G, KC_NO, KC_NO, k0J }, \ - { k10, k11, k12, KC_NO, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J }, \ - { k20, k21, KC_NO, KC_NO, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, KC_NO }, \ - { KC_NO, k31, k32, KC_NO, k34, KC_NO, KC_NO, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E, k3F, k3G, k3H, KC_NO, KC_NO }, \ - { k40, k41, k42, KC_NO, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, KC_NO }, \ - { KC_NO, k51, k52, KC_NO, KC_NO, KC_NO, KC_NO, k57, k58, k59, k5A, k5B, k5C, KC_NO, k5E, KC_NO, k5G, KC_NO, KC_NO, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, KC_NO, k6H, k6I, KC_NO }, \ - { k70, k71, k72, k73, k74, KC_NO, KC_NO, k77, k78, k79, k7A, k7B, KC_NO, KC_NO, k7E, KC_NO, KC_NO, k7H, k7I, k7J }, \ -} diff --git a/keyboards/handwired/ibm122m/info.json b/keyboards/handwired/ibm122m/info.json index 6a157a8031b4..8dbdbb9fb502 100644 --- a/keyboards/handwired/ibm122m/info.json +++ b/keyboards/handwired/ibm122m/info.json @@ -18,128 +18,150 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F13", "x":3.25, "y":0}, - {"label":"F14", "x":4.25, "y":0}, - {"label":"F15", "x":5.25, "y":0}, - {"label":"F16", "x":6.25, "y":0}, - {"label":"F17", "x":7.25, "y":0}, - {"label":"F18", "x":8.25, "y":0}, - {"label":"F19", "x":9.25, "y":0}, - {"label":"F20", "x":10.25, "y":0}, - {"label":"F21", "x":11.25, "y":0}, - {"label":"F22", "x":12.25, "y":0}, - {"label":"F23", "x":13.25, "y":0}, - {"label":"F24", "x":14.25, "y":0}, - {"label":"F1", "x":3.25, "y":1}, - {"label":"F2", "x":4.25, "y":1}, - {"label":"F3", "x":5.25, "y":1}, - {"label":"F4", "x":6.25, "y":1}, - {"label":"F5", "x":7.25, "y":1}, - {"label":"F6", "x":8.25, "y":1}, - {"label":"F7", "x":9.25, "y":1}, - {"label":"F8", "x":10.25, "y":1}, - {"label":"F9", "x":11.25, "y":1}, - {"label":"F10", "x":12.25, "y":1}, - {"label":"F11", "x":13.25, "y":1}, - {"label":"F12", "x":14.25, "y":1}, - {"label":"Esc", "x":0, "y":3}, - {"x":1, "y":3}, - {"label":"`", "x":2.25, "y":3}, - {"label":"1", "x":3.25, "y":3}, - {"label":"2", "x":4.25, "y":3}, - {"label":"3", "x":5.25, "y":3}, - {"label":"4", "x":6.25, "y":3}, - {"label":"5", "x":7.25, "y":3}, - {"label":"6", "x":8.25, "y":3}, - {"label":"7", "x":9.25, "y":3}, - {"label":"8", "x":10.25, "y":3}, - {"label":"9", "x":11.25, "y":3}, - {"label":"0", "x":12.25, "y":3}, - {"label":"-", "x":13.25, "y":3}, - {"label":"=", "x":14.25, "y":3}, - {"label":"Backspace", "x":15.25, "y":3, "w":2}, - {"label":"Insert", "x":17.5, "y":3}, - {"label":"Home", "x":18.5, "y":3}, - {"label":"Page Up", "x":19.5, "y":3}, - {"label":"Num Lock", "x":20.75, "y":3}, - {"label":"/", "x":21.75, "y":3}, - {"label":"*", "x":22.75, "y":3}, - {"label":"-", "x":23.75, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"label":"Tab", "x":2.25, "y":4, "w":1.5}, - {"label":"Q", "x":3.75, "y":4}, - {"label":"W", "x":4.75, "y":4}, - {"label":"E", "x":5.75, "y":4}, - {"label":"R", "x":6.75, "y":4}, - {"label":"T", "x":7.75, "y":4}, - {"label":"Y", "x":8.75, "y":4}, - {"label":"U", "x":9.75, "y":4}, - {"label":"I", "x":10.75, "y":4}, - {"label":"O", "x":11.75, "y":4}, - {"label":"P", "x":12.75, "y":4}, - {"label":"[", "x":13.75, "y":4}, - {"label":"]", "x":14.75, "y":4}, - {"label":"Enter", "x":16, "y":4, "w":1.25, "h":2}, - {"label":"Delete", "x":17.5, "y":4}, - {"label":"End", "x":18.5, "y":4}, - {"label":"Page Down", "x":19.5, "y":4}, - {"label":"7", "x":20.75, "y":4}, - {"label":"8", "x":21.75, "y":4}, - {"label":"9", "x":22.75, "y":4}, - {"label":"+", "x":23.75, "y":4}, - {"x":0, "y":5}, - {"x":1, "y":5}, - {"label":"Caps Lock", "x":2.25, "y":5, "w":1.75}, - {"label":"A", "x":4, "y":5}, - {"label":"S", "x":5, "y":5}, - {"label":"D", "x":6, "y":5}, - {"label":"F", "x":7, "y":5}, - {"label":"G", "x":8, "y":5}, - {"label":"H", "x":9, "y":5}, - {"label":"J", "x":10, "y":5}, - {"label":"K", "x":11, "y":5}, - {"label":"L", "x":12, "y":5}, - {"label":";", "x":13, "y":5}, - {"label":"'", "x":14, "y":5}, - {"label":"#", "x":15, "y":5}, - {"label":"Up", "x":18.5, "y":5}, - {"label":"4", "x":20.75, "y":5}, - {"label":"5", "x":21.75, "y":5}, - {"label":"6", "x":22.75, "y":5}, - {"x":23.75, "y":5}, - {"x":0, "y":6}, - {"x":1, "y":6}, - {"label":"Shift", "x":2.25, "y":6, "w":1.25}, - {"label":"\\", "x":3.5, "y":6}, - {"label":"Z", "x":4.5, "y":6}, - {"label":"X", "x":5.5, "y":6}, - {"label":"C", "x":6.5, "y":6}, - {"label":"V", "x":7.5, "y":6}, - {"label":"B", "x":8.5, "y":6}, - {"label":"N", "x":9.5, "y":6}, - {"label":"M", "x":10.5, "y":6}, - {"label":",", "x":11.5, "y":6}, - {"label":".", "x":12.5, "y":6}, - {"label":"/", "x":13.5, "y":6}, - {"label":"Shift", "x":14.5, "y":6, "w":2.75}, - {"label":"Left", "x":17.5, "y":6}, - {"x":18.5, "y":6}, - {"label":"Right", "x":19.5, "y":6}, - {"label":"1", "x":20.75, "y":6}, - {"label":"2", "x":21.75, "y":6}, - {"label":"3", "x":22.75, "y":6}, - {"label":"Enter", "x":23.75, "y":6, "h":2}, - {"x":0, "y":7}, - {"x":1, "y":7}, - {"label":"Ctrl", "x":2.25, "y":7, "w":1.5}, - {"label":"Alt", "x":4.75, "y":7, "w":1.5}, - {"x":6.25, "y":7, "w":7}, - {"label":"AltGr", "x":13.25, "y":7, "w":1.5}, - {"label":"Ctrl", "x":15.75, "y":7, "w":1.5}, - {"label":"Down", "x":18.5, "y":7}, - {"label":"0", "x":20.75, "y":7, "w":2}, - {"label":".", "x":22.75, "y":7} + {"matrix": [0, 9], "x": 3.25, "y": 0}, + {"matrix": [1, 9], "x": 4.25, "y": 0}, + {"matrix": [1, 10], "x": 5.25, "y": 0}, + {"matrix": [2, 9], "x": 6.25, "y": 0}, + {"matrix": [3, 9], "x": 7.25, "y": 0}, + {"matrix": [3, 10], "x": 8.25, "y": 0}, + {"matrix": [4, 9], "x": 9.25, "y": 0}, + {"matrix": [5, 9], "x": 10.25, "y": 0}, + {"matrix": [5, 10], "x": 11.25, "y": 0}, + {"matrix": [6, 9], "x": 12.25, "y": 0}, + {"matrix": [7, 9], "x": 13.25, "y": 0}, + {"matrix": [7, 10], "x": 14.25, "y": 0}, + + {"matrix": [0, 10], "x": 3.25, "y": 1}, + {"matrix": [0, 11], "x": 4.25, "y": 1}, + {"matrix": [1, 11], "x": 5.25, "y": 1}, + {"matrix": [2, 10], "x": 6.25, "y": 1}, + {"matrix": [2, 11], "x": 7.25, "y": 1}, + {"matrix": [3, 11], "x": 8.25, "y": 1}, + {"matrix": [4, 10], "x": 9.25, "y": 1}, + {"matrix": [4, 11], "x": 10.25, "y": 1}, + {"matrix": [5, 11], "x": 11.25, "y": 1}, + {"matrix": [6, 10], "x": 12.25, "y": 1}, + {"matrix": [6, 11], "x": 13.25, "y": 1}, + {"matrix": [7, 11], "x": 14.25, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + + {"matrix": [3, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [2, 5], "x": 4.25, "y": 3}, + {"matrix": [2, 6], "x": 5.25, "y": 3}, + {"matrix": [2, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [2, 8], "x": 9.25, "y": 3}, + {"matrix": [2, 12], "x": 10.25, "y": 3}, + {"matrix": [2, 13], "x": 11.25, "y": 3}, + {"matrix": [2, 14], "x": 12.25, "y": 3}, + {"matrix": [3, 14], "x": 13.25, "y": 3}, + {"matrix": [3, 12], "x": 14.25, "y": 3}, + {"matrix": [3, 15], "x": 15.25, "y": 3, "w": 2}, + + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3}, + {"matrix": [2, 16], "x": 19.5, "y": 3}, + + {"matrix": [2, 15], "x": 20.75, "y": 3}, + {"matrix": [2, 17], "x": 21.75, "y": 3}, + {"matrix": [2, 18], "x": 22.75, "y": 3}, + {"matrix": [2, 0], "x": 23.75, "y": 3}, + + {"matrix": [2, 1], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 3.75, "y": 4}, + {"matrix": [4, 5], "x": 4.75, "y": 4}, + {"matrix": [4, 6], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4}, + {"matrix": [5, 7], "x": 7.75, "y": 4}, + {"matrix": [5, 8], "x": 8.75, "y": 4}, + {"matrix": [4, 8], "x": 9.75, "y": 4}, + {"matrix": [4, 12], "x": 10.75, "y": 4}, + {"matrix": [4, 13], "x": 11.75, "y": 4}, + {"matrix": [4, 14], "x": 12.75, "y": 4}, + {"matrix": [5, 14], "x": 13.75, "y": 4}, + {"matrix": [5, 12], "x": 14.75, "y": 4}, + {"matrix": [6, 15], "x": 16, "y": 4, "w": 1.25, "h": 2}, + + {"matrix": [1, 16], "x": 17.5, "y": 4}, + {"matrix": [5, 16], "x": 18.5, "y": 4}, + {"matrix": [4, 16], "x": 19.5, "y": 4}, + + {"matrix": [4, 15], "x": 20.75, "y": 4}, + {"matrix": [4, 17], "x": 21.75, "y": 4}, + {"matrix": [4, 18], "x": 22.75, "y": 4}, + {"matrix": [4, 0], "x": 23.75, "y": 4}, + + {"matrix": [5, 1], "x": 0, "y": 5}, + {"matrix": [5, 2], "x": 1, "y": 5}, + + {"matrix": [6, 2], "x": 2.25, "y": 5, "w": 1.75}, + {"matrix": [1, 4], "x": 4, "y": 5}, + {"matrix": [1, 5], "x": 5, "y": 5}, + {"matrix": [1, 6], "x": 6, "y": 5}, + {"matrix": [1, 7], "x": 7, "y": 5}, + {"matrix": [0, 7], "x": 8, "y": 5}, + {"matrix": [0, 8], "x": 9, "y": 5}, + {"matrix": [1, 8], "x": 10, "y": 5}, + {"matrix": [1, 12], "x": 11, "y": 5}, + {"matrix": [1, 13], "x": 12, "y": 5}, + {"matrix": [1, 14], "x": 13, "y": 5}, + {"matrix": [0, 14], "x": 14, "y": 5}, + {"matrix": [6, 14], "x": 15, "y": 5}, + + {"matrix": [0, 16], "x": 18.5, "y": 5}, + + {"matrix": [1, 15], "x": 20.75, "y": 5}, + {"matrix": [1, 17], "x": 21.75, "y": 5}, + {"matrix": [1, 18], "x": 22.75, "y": 5}, + + {"matrix": [1, 0], "x": 23.75, "y": 5}, + + {"matrix": [1, 1], "x": 0, "y": 6}, + {"matrix": [1, 2], "x": 1, "y": 6}, + + {"matrix": [7, 3], "x": 2.25, "y": 6, "w": 1.25}, + {"matrix": [7, 4], "x": 3.5, "y": 6}, + {"matrix": [6, 4], "x": 4.5, "y": 6}, + {"matrix": [6, 5], "x": 5.5, "y": 6}, + {"matrix": [6, 6], "x": 6.5, "y": 6}, + {"matrix": [6, 7], "x": 7.5, "y": 6}, + {"matrix": [7, 7], "x": 8.5, "y": 6}, + {"matrix": [7, 8], "x": 9.5, "y": 6}, + {"matrix": [6, 8], "x": 10.5, "y": 6}, + {"matrix": [6, 12], "x": 11.5, "y": 6}, + {"matrix": [6, 13], "x": 12.5, "y": 6}, + {"matrix": [7, 14], "x": 13.5, "y": 6}, + {"matrix": [6, 3], "x": 14.5, "y": 6, "w": 2.75}, + + {"matrix": [6, 0], "x": 17.5, "y": 6}, + {"matrix": [0, 19], "x": 18.5, "y": 6}, + {"matrix": [1, 19], "x": 19.5, "y": 6}, + + {"matrix": [6, 1], "x": 20.75, "y": 6}, + {"matrix": [6, 17], "x": 21.75, "y": 6}, + {"matrix": [6, 18], "x": 22.75, "y": 6}, + {"matrix": [7, 19], "x": 23.75, "y": 6, "h": 2}, + + {"matrix": [0, 2], "x": 0, "y": 7}, + {"matrix": [0, 1], "x": 1, "y": 7}, + + {"matrix": [0, 0], "x": 2.25, "y": 7, "w": 1.5}, + {"matrix": [7, 0], "x": 4.75, "y": 7, "w": 1.5}, + {"matrix": [7, 1], "x": 6.25, "y": 7, "w": 7}, + {"matrix": [0, 3], "x": 13.25, "y": 7, "w": 1.5}, + {"matrix": [7, 2], "x": 15.75, "y": 7, "w": 1.5}, + + {"matrix": [0, 15], "x": 18.5, "y": 7}, + + {"matrix": [7, 17], "x": 20.75, "y": 7, "w": 2}, + {"matrix": [7, 18], "x": 22.75, "y": 7} ] } } diff --git a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h b/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h deleted file mode 100644 index 55d54580aaed..000000000000 --- a/keyboards/handwired/ibm_wheelwriter/ibm_wheelwriter.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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( \ - \ - K22, K24, K34, K35, K36, K37, K27, K28, K38, K39, K3A, K3B, K2B, K29, K2C, K3C, \ - K41, K42, K44, K45, K46, K47, K57, K58, K48, K49, K4A, K4B, K5B, K59, K6C, K4C, \ - K52, K62, K14, K15, K16, K17, K07, K08, K18, K19, K1A, K1B, K0B, K6B, K1C, \ - K12, K73, K74, K64, K65, K66, K67, K77, K78, K68, K69, K6A, K7B, K61, \ - K01, K70, K71, K72, K7C \ - ) { \ - { KC_NO, K01, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K07, K08, KC_NO, KC_NO, K0B, KC_NO }, \ - { KC_NO, KC_NO, K12, KC_NO, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { KC_NO, KC_NO, K22, KC_NO, K24, KC_NO, KC_NO, K27, K28, K29, KC_NO, K2B, K2C }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \ - { KC_NO, K41, K42, KC_NO, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C }, \ - { KC_NO, KC_NO, K52, KC_NO, KC_NO, KC_NO, KC_NO, K57, K58, K59, KC_NO, K5B, KC_NO }, \ - { KC_NO, K61, K62, KC_NO, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C }, \ - { K70, K71, K72, K73, K74, KC_NO, KC_NO, K77, K78, KC_NO, KC_NO, K7B, K7C }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ibm_wheelwriter/info.json b/keyboards/handwired/ibm_wheelwriter/info.json index 792f6b8aea4b..4ec01887e16e 100644 --- a/keyboards/handwired/ibm_wheelwriter/info.json +++ b/keyboards/handwired/ibm_wheelwriter/info.json @@ -18,87 +18,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "w":1.5}, + {"matrix": [2, 2], "x": 0, "y": 0, "w": 1.5}, - {"x":1.75, "y":0}, - {"x":2.75, "y":0}, - {"x":3.75, "y":0}, - {"x":4.75, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - {"x":13.75, "y":0}, - {"x":14.75, "y":0, "w":2}, + {"matrix": [2, 4], "x": 1.75, "y": 0}, + {"matrix": [3, 4], "x": 2.75, "y": 0}, + {"matrix": [3, 5], "x": 3.75, "y": 0}, + {"matrix": [3, 6], "x": 4.75, "y": 0}, + {"matrix": [3, 7], "x": 5.75, "y": 0}, + {"matrix": [2, 7], "x": 6.75, "y": 0}, + {"matrix": [2, 8], "x": 7.75, "y": 0}, + {"matrix": [3, 8], "x": 8.75, "y": 0}, + {"matrix": [3, 9], "x": 9.75, "y": 0}, + {"matrix": [3, 10], "x": 10.75, "y": 0}, + {"matrix": [3, 11], "x": 11.75, "y": 0}, + {"matrix": [2, 11], "x": 12.75, "y": 0}, + {"matrix": [2, 9], "x": 13.75, "y": 0}, + {"matrix": [2, 12], "x": 14.75, "y": 0, "w": 2}, - {"x":17, "y":0, "w":1.5}, + {"matrix": [3, 12], "x": 17, "y": 0, "w": 1.5}, - {"x":0, "y":1, "w":1.5}, + {"matrix": [4, 1], "x": 0, "y": 1, "w": 1.5}, - {"x":1.75, "y":1, "w":1.5}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - {"x":8.25, "y":1}, - {"x":9.25, "y":1}, - {"x":10.25, "y":1}, - {"x":11.25, "y":1}, - {"x":12.25, "y":1}, - {"x":13.25, "y":1}, - {"x":14.25, "y":1}, - {"x":15.5, "y":1, "w":1.25, "h":2}, + {"matrix": [4, 2], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [4, 4], "x": 3.25, "y": 1}, + {"matrix": [4, 5], "x": 4.25, "y": 1}, + {"matrix": [4, 6], "x": 5.25, "y": 1}, + {"matrix": [4, 7], "x": 6.25, "y": 1}, + {"matrix": [5, 7], "x": 7.25, "y": 1}, + {"matrix": [5, 8], "x": 8.25, "y": 1}, + {"matrix": [4, 8], "x": 9.25, "y": 1}, + {"matrix": [4, 9], "x": 10.25, "y": 1}, + {"matrix": [4, 10], "x": 11.25, "y": 1}, + {"matrix": [4, 11], "x": 12.25, "y": 1}, + {"matrix": [5, 11], "x": 13.25, "y": 1}, + {"matrix": [5, 9], "x": 14.25, "y": 1}, + {"matrix": [6, 12], "x": 15.5, "y": 1, "w": 1.25, "h": 2}, - {"x":17, "y":1, "w":1.5}, + {"matrix": [4, 12], "x": 17, "y": 1, "w": 1.5}, - {"x":0, "y":2, "w":1.5}, + {"matrix": [5, 2], "x": 0, "y": 2, "w": 1.5}, - {"x":1.75, "y":2, "w":1.25}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, - {"x":8.5, "y":2}, - {"x":9.5, "y":2}, - {"x":10.5, "y":2}, - {"x":11.5, "y":2}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2}, - {"x":14.5, "y":2}, + {"matrix": [6, 2], "x": 1.75, "y": 2, "w": 1.25}, + {"matrix": [1, 4], "x": 3.5, "y": 2}, + {"matrix": [1, 5], "x": 4.5, "y": 2}, + {"matrix": [1, 6], "x": 5.5, "y": 2}, + {"matrix": [1, 7], "x": 6.5, "y": 2}, + {"matrix": [0, 7], "x": 7.5, "y": 2}, + {"matrix": [0, 8], "x": 8.5, "y": 2}, + {"matrix": [1, 8], "x": 9.5, "y": 2}, + {"matrix": [1, 9], "x": 10.5, "y": 2}, + {"matrix": [1, 10], "x": 11.5, "y": 2}, + {"matrix": [1, 11], "x": 12.5, "y": 2}, + {"matrix": [0, 11], "x": 13.5, "y": 2}, + {"matrix": [6, 11], "x": 14.5, "y": 2}, - {"x":17, "y":2, "w":1.5}, + {"matrix": [1, 12], "x": 17, "y": 2, "w": 1.5}, - {"x":0, "y":3, "w":1.5}, + {"matrix": [1, 2], "x": 0, "y": 3, "w": 1.5}, - {"x":1.75, "y":3, "w":1.25}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, + {"matrix": [7, 3], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [7, 4], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3}, + {"matrix": [6, 5], "x": 5, "y": 3}, + {"matrix": [6, 6], "x": 6, "y": 3}, + {"matrix": [6, 7], "x": 7, "y": 3}, + {"matrix": [7, 7], "x": 8, "y": 3}, + {"matrix": [7, 8], "x": 9, "y": 3}, + {"matrix": [6, 8], "x": 10, "y": 3}, + {"matrix": [6, 9], "x": 11, "y": 3}, + {"matrix": [6, 10], "x": 12, "y": 3}, + {"matrix": [7, 11], "x": 13, "y": 3}, + {"matrix": [6, 1], "x": 17, "y": 3, "w": 1.5}, - {"x":17, "y":3, "w":1.5}, + {"matrix": [0, 1], "x": 0, "y": 4, "w": 1.5}, - {"x":0, "y":4, "w":1.5}, + {"matrix": [7, 0], "x": 4.25, "y": 4, "w": 2.75}, + {"matrix": [7, 1], "x": 7, "y": 4, "w": 7.25}, + {"matrix": [7, 2], "x": 15.25, "y": 4, "w": 1.5}, - {"x":4.25, "y":4, "w":2.75}, - {"x":7, "y":4, "w":7.25}, - - {"x":15.25, "y":4, "w":1.5}, - - {"x":17, "y":4, "w":1.5} + {"matrix": [7, 12], "x": 17, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/handwired/jopr/info.json b/keyboards/handwired/jopr/info.json index 0dae7b010c0c..efebe52d0bcf 100644 --- a/keyboards/handwired/jopr/info.json +++ b/keyboards/handwired/jopr/info.json @@ -21,554 +21,130 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "MX_A0", - "x": 0, - "y": 0 - }, - { - "label": "MX_B0", - "x": 1.25, - "y": 0 - }, - { - "label": "MX_C0", - "x": 2.25, - "y": 0 - }, - { - "label": "MX_D0", - "x": 3.25, - "y": 0 - }, - { - "label": "MX_E0", - "x": 4.25, - "y": 0 - }, - { - "label": "MX_F0", - "x": 5.5, - "y": 0 - }, - { - "label": "MX_G0", - "x": 6.5, - "y": 0 - }, - { - "label": "MX_H0", - "x": 7.5, - "y": 0 - }, - { - "label": "MX_I0", - "x": 8.5, - "y": 0 - }, - { - "label": "MX_J0", - "x": 9.75, - "y": 0 - }, - { - "label": "MX_A6", - "x": 10.75, - "y": 0 - }, - { - "label": "MX_B6", - "x": 11.75, - "y": 0 - }, - { - "label": "MX_C6", - "x": 12.75, - "y": 0 - }, - { - "label": "MX_D6", - "x": 14, - "y": 0 - }, - { - "label": "MX_E6", - "x": 15.25, - "y": 0 - }, - { - "label": "MX_F6", - "x": 16.25, - "y": 0 - }, - { - "label": "MX_G6", - "x": 17.25, - "y": 0 - }, - { - "label": "MX_H6", - "x": 18.25, - "y": 0 - }, - { - "label": "MX_A1", - "x": 0, - "y": 1.25 - }, - { - "label": "MX_B1", - "x": 1, - "y": 1.25 - }, - { - "label": "MX_C1", - "x": 2, - "y": 1.25 - }, - { - "label": "MX_D1", - "x": 3, - "y": 1.25 - }, - { - "label": "MX_E1", - "x": 4, - "y": 1.25 - }, - { - "label": "MX_F1", - "x": 5, - "y": 1.25 - }, - { - "label": "MX_G1", - "x": 6, - "y": 1.25 - }, - { - "label": "MX_H1", - "x": 7, - "y": 1.25 - }, - { - "label": "MX_I1", - "x": 8, - "y": 1.25 - }, - { - "label": "MX_J1", - "x": 9, - "y": 1.25 - }, - { - "label": "MX_A7", - "x": 10, - "y": 1.25 - }, - { - "label": "MX_B7", - "x": 11, - "y": 1.25 - }, - { - "label": "MX_C7", - "x": 12, - "y": 1.25 - }, - { - "label": "MX_D7", - "x": 13, - "y": 1.25, - "w": 2 - }, - { - "label": "MX_E7", - "x": 15.25, - "y": 1.25 - }, - { - "label": "MX_F7", - "x": 16.25, - "y": 1.25 - }, - { - "label": "MX_G7", - "x": 17.25, - "y": 1.25 - }, - { - "label": "MX_H7", - "x": 18.25, - "y": 1.25 - }, - { - "label": "MX_A2", - "x": 0, - "y": 2.25, - "w": 1.5 - }, - { - "label": "MX_B2", - "x": 1.5, - "y": 2.25 - }, - { - "label": "MX_C2", - "x": 2.5, - "y": 2.25 - }, - { - "label": "MX_D2", - "x": 3.5, - "y": 2.25 - }, - { - "label": "MX_E2", - "x": 4.5, - "y": 2.25 - }, - { - "label": "MX_F2", - "x": 5.5, - "y": 2.25 - }, - { - "label": "MX_G2", - "x": 6.5, - "y": 2.25 - }, - { - "label": "MX_H2", - "x": 7.5, - "y": 2.25 - }, - { - "label": "MX_I2", - "x": 8.5, - "y": 2.25 - }, - { - "label": "MX_J2", - "x": 9.5, - "y": 2.25 - }, - { - "label": "MX_A8", - "x": 10.5, - "y": 2.25 - }, - { - "label": "MX_B8", - "x": 11.5, - "y": 2.25 - }, - { - "label": "MX_C8", - "x": 12.5, - "y": 2.25 - }, - { - "label": "MX_D8", - "x": 13.75, - "y": 2.25, - "w": 1.25, - "h": 2 - }, - { - "label": "MX_E8", - "x": 15.25, - "y": 2.25 - }, - { - "label": "MX_F8", - "x": 16.25, - "y": 2.25 - }, - { - "label": "MX_G8", - "x": 17.25, - "y": 2.25 - }, - { - "label": "MX_H8", - "x": 18.25, - "y": 2.25, - "h": 2 - }, - { - "label": "MX_A3", - "x": 0, - "y": 3.25, - "w": 1.75 - }, - { - "label": "MX_B3", - "x": 1.75, - "y": 3.25 - }, - { - "label": "MX_C3", - "x": 2.75, - "y": 3.25 - }, - { - "label": "MX_D3", - "x": 3.75, - "y": 3.25 - }, - { - "label": "MX_E3", - "x": 4.75, - "y": 3.25 - }, - { - "label": "MX_F3", - "x": 5.75, - "y": 3.25 - }, - { - "label": "MX_G3", - "x": 6.75, - "y": 3.25 - }, - { - "label": "MX_H3", - "x": 7.75, - "y": 3.25 - }, - { - "label": "MX_I3", - "x": 8.75, - "y": 3.25 - }, - { - "label": "MX_J3", - "x": 9.75, - "y": 3.25 - }, - { - "label": "MX_A9", - "x": 10.75, - "y": 3.25 - }, - { - "label": "MX_B9", - "x": 11.75, - "y": 3.25 - }, - { - "label": "MX_C9", - "x": 12.75, - "y": 3.25 - }, - { - "label": "MX_E9", - "x": 15.25, - "y": 3.25 - }, - { - "label": "MX_F9", - "x": 16.25, - "y": 3.25 - }, - { - "label": "MX_G9", - "x": 17.25, - "y": 3.25 - }, - { - "label": "MX_H9", - "x": 19.5, - "y": 3.25 - }, - { - "label": "MX_K1", - "x": 20.5, - "y": 3.25 - }, - { - "label": "MX_K0", - "x": 21.5, - "y": 3.25 - }, - { - "label": "MX_A4", - "x": 0, - "y": 4.25, - "w": 1.25 - }, - { - "label": "MX_B4", - "x": 1.25, - "y": 4.25 - }, - { - "label": "MX_C4", - "x": 2.25, - "y": 4.25 - }, - { - "label": "MX_D4", - "x": 3.25, - "y": 4.25 - }, - { - "label": "MX_E4", - "x": 4.25, - "y": 4.25 - }, - { - "label": "MX_F4", - "x": 5.25, - "y": 4.25 - }, - { - "label": "MX_G4", - "x": 6.25, - "y": 4.25 - }, - { - "label": "MX_H4", - "x": 7.25, - "y": 4.25 - }, - { - "label": "MX_I4", - "x": 8.25, - "y": 4.25 - }, - { - "label": "MX_J4", - "x": 9.25, - "y": 4.25 - }, - { - "label": "MX_I9", - "x": 10.25, - "y": 4.25 - }, - { - "label": "MX_I8", - "x": 11.25, - "y": 4.25 - }, - { - "label": "MX_I7", - "x": 12.25, - "y": 4.25, - "w": 2.75 - }, - { - "label": "MX_I6", - "x": 15.25, - "y": 4.25 - }, - { - "label": "MX_J9", - "x": 16.25, - "y": 4.25 - }, - { - "label": "MX_J8", - "x": 17.25, - "y": 4.25 - }, - { - "label": "MX_J7", - "x": 18.25, - "y": 4.25, - "h": 2 - }, - { - "label": "MX_J6", - "x": 19.5, - "y": 4.25 - }, - { - "label": "MX_K3", - "x": 20.5, - "y": 4.25 - }, - { - "label": "MX_K2", - "x": 21.5, - "y": 4.25 - }, - { - "label": "MX_A5", - "x": 0, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_B5", - "x": 1.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_C5", - "x": 2.5, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_D5", - "x": 3.75, - "y": 5.25, - "w": 6.25 - }, - { - "label": "MX_J5", - "x": 10, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_I5", - "x": 11.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_K9", - "x": 12.5, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_E5", - "x": 13.75, - "y": 5.25, - "w": 1.25 - }, - { - "label": "MX_K8", - "x": 15.25, - "y": 5.25, - "w": 2 - }, - { - "label": "MX_K7", - "x": 17.25, - "y": 5.25 - }, - { - "label": "MX_K6", - "x": 19.5, - "y": 5.25 - }, - { - "label": "MX_K5", - "x": 20.5, - "y": 5.25 - }, - { - "label": "MX_K4", - "x": 21.5, - "y": 5.25 - } + {"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": [6, 0], "x": 10.75, "y": 0}, + {"matrix": [6, 1], "x": 11.75, "y": 0}, + {"matrix": [6, 2], "x": 12.75, "y": 0}, + + {"matrix": [6, 3], "x": 14, "y": 0}, + + {"matrix": [6, 4], "x": 15.25, "y": 0}, + {"matrix": [6, 5], "x": 16.25, "y": 0}, + {"matrix": [6, 6], "x": 17.25, "y": 0}, + {"matrix": [6, 7], "x": 18.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": [7, 0], "x": 10, "y": 1.25}, + {"matrix": [7, 1], "x": 11, "y": 1.25}, + {"matrix": [7, 2], "x": 12, "y": 1.25}, + {"matrix": [7, 3], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [7, 4], "x": 15.25, "y": 1.25}, + {"matrix": [7, 5], "x": 16.25, "y": 1.25}, + {"matrix": [7, 6], "x": 17.25, "y": 1.25}, + {"matrix": [7, 7], "x": 18.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": [8, 0], "x": 10.5, "y": 2.25}, + {"matrix": [8, 1], "x": 11.5, "y": 2.25}, + {"matrix": [8, 2], "x": 12.5, "y": 2.25}, + {"matrix": [8, 3], "x": 13.75, "y": 2.25, "w": 1.25, "h": 2}, + + {"matrix": [8, 4], "x": 15.25, "y": 2.25}, + {"matrix": [8, 5], "x": 16.25, "y": 2.25}, + {"matrix": [8, 6], "x": 17.25, "y": 2.25}, + {"matrix": [8, 7], "x": 18.25, "y": 2.25, "h": 2}, + + {"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": [9, 0], "x": 10.75, "y": 3.25}, + {"matrix": [9, 1], "x": 11.75, "y": 3.25}, + {"matrix": [9, 2], "x": 12.75, "y": 3.25}, + + {"matrix": [9, 4], "x": 15.25, "y": 3.25}, + {"matrix": [9, 5], "x": 16.25, "y": 3.25}, + {"matrix": [9, 6], "x": 17.25, "y": 3.25}, + + {"matrix": [9, 7], "x": 19.5, "y": 3.25}, + {"matrix": [1, 10], "x": 20.5, "y": 3.25}, + {"matrix": [0, 10], "x": 21.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": [9, 8], "x": 10.25, "y": 4.25}, + {"matrix": [8, 8], "x": 11.25, "y": 4.25}, + {"matrix": [7, 8], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [6, 8], "x": 15.25, "y": 4.25}, + {"matrix": [9, 9], "x": 16.25, "y": 4.25}, + {"matrix": [8, 9], "x": 17.25, "y": 4.25}, + {"matrix": [7, 9], "x": 18.25, "y": 4.25, "h": 2}, + + {"matrix": [6, 9], "x": 19.5, "y": 4.25}, + {"matrix": [3, 10], "x": 20.5, "y": 4.25}, + {"matrix": [2, 10], "x": 21.5, "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, 3], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [9, 10], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [8, 10], "x": 15.25, "y": 5.25, "w": 2}, + {"matrix": [7, 10], "x": 17.25, "y": 5.25}, + + {"matrix": [6, 10], "x": 19.5, "y": 5.25}, + {"matrix": [5, 10], "x": 20.5, "y": 5.25}, + {"matrix": [4, 10], "x": 21.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/jopr/jopr.c b/keyboards/handwired/jopr/jopr.c index a337867dd1a1..e6d6f05dd287 100644 --- a/keyboards/handwired/jopr/jopr.c +++ b/keyboards/handwired/jopr/jopr.c @@ -1,4 +1,4 @@ -#include "jopr.h" +#include "quantum.h" void led_init_ports(void) { setPinOutput(F0); diff --git a/keyboards/handwired/jopr/jopr.h b/keyboards/handwired/jopr/jopr.h deleted file mode 100644 index b79a8f2646cc..000000000000 --- a/keyboards/handwired/jopr/jopr.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K600, K601, K602, K603, K604, K605, K606, K607, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K700, K701, K702, K703, K704, K705, K706, K707, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K800, K801, K802, K803, K804, K805, K806, K807, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K900, K901, K902, K904, K905, K906, K907, K110, K010, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K908, K808, K708, K608, K909, K809, K709, K609, K310, K210, \ - K500, K501, K502, K503, K509, K508, K910, K504, K810, K710, K610, K510, K410 \ -) \ -{ \ - { 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, KC_NO, KC_NO, KC_NO, 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, KC_NO, K904, K905, K906, K907, K908, K909, K910 } \ -} diff --git a/keyboards/handwired/k8split/info.json b/keyboards/handwired/k8split/info.json index 4cb7713c7f79..3ec5d1c36f9e 100644 --- a/keyboards/handwired/k8split/info.json +++ b/keyboards/handwired/k8split/info.json @@ -18,59 +18,59 @@ "layouts": { "LAYOUT": { "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}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, - {"x":0, "y":2, "w":1.5}, - {"x":1.5, "y":2}, - {"x":2.5, "y":2}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.5, "y":2}, - {"x":7.5, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, - {"x":0, "y":3, "w":1.75}, - {"x":1.75, "y":3}, - {"x":2.75, "y":3}, - {"x":3.75, "y":3}, - {"x":4.75, "y":3}, - {"x":5.75, "y":3}, - {"x":6.75, "y":3}, - {"x":7.75, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, - {"x":0, "y":4, "w":2.25}, - {"x":2.25, "y":4}, - {"x":3.25, "y":4}, - {"x":4.25, "y":4}, - {"x":5.25, "y":4}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4}, - {"x":8.25, "y":4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, - {"x":0, "y":5, "w":1.5}, - {"x":1.5, "y":5}, - {"x":2.5, "y":5}, - {"x":3.5, "y":5, "w":1.25}, - {"x":4.75, "y":5, "w":2.25}, - {"x":7, "y":5}, - {"x":8, "y":5}, - {"x":9, "y":5} + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5}, + {"matrix": [5, 2], "x": 2.5, "y": 5}, + {"matrix": [5, 3], "x": 3.5, "y": 5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2.25}, + {"matrix": [5, 5], "x": 7, "y": 5}, + {"matrix": [5, 6], "x": 8, "y": 5}, + {"matrix": [5, 7], "x": 9, "y": 5} ] } } diff --git a/keyboards/handwired/k8split/k8split.h b/keyboards/handwired/k8split/k8split.h deleted file mode 100644 index 247c0d775a90..000000000000 --- a/keyboards/handwired/k8split/k8split.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2020 Ckat - -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( \ - k00, k06, k12, k18, k24, k30, k36, k42, \ - k01, k07, k13, k19, k25, k31, k37, k43, \ - k02, k08, k14, k20, k26, k32, k38, k44, \ - k03, k09, k15, k21, k27, k33, k39, k45, \ - k04, k10, k16, k22, k28, k34, k40, k46, \ - k05, k11, k17, k23, k29, k35, k41, k47 \ -) \ -{ \ - { k00, k06, k12, k18, k24, k30, k36, k42 }, \ - { k01, k07, k13, k19, k25, k31, k37, k43 }, \ - { k02, k08, k14, k20, k26, k32, k38, k44 }, \ - { k03, k09, k15, k21, k27, k33, k39, k45 }, \ - { k04, k10, k16, k22, k28, k34, k40, k46 }, \ - { k05, k11, k17, k23, k29, k35, k41, k47 } \ -} diff --git a/keyboards/handwired/kbod/info.json b/keyboards/handwired/kbod/info.json index 667e53756e02..6508b3d85969 100644 --- a/keyboards/handwired/kbod/info.json +++ b/keyboards/handwired/kbod/info.json @@ -21,67 +21,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"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, "w": 2}, + + {"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": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 2}, + {"matrix": [4, 2], "x": 2.75, "y": 2}, + {"matrix": [4, 3], "x": 3.75, "y": 2}, + {"matrix": [4, 4], "x": 4.75, "y": 2}, + {"matrix": [4, 5], "x": 5.75, "y": 2}, + {"matrix": [4, 6], "x": 6.75, "y": 2}, + {"matrix": [4, 7], "x": 7.75, "y": 2}, + {"matrix": [5, 0], "x": 8.75, "y": 2}, + {"matrix": [5, 1], "x": 9.75, "y": 2}, + {"matrix": [5, 2], "x": 10.75, "y": 2}, + {"matrix": [5, 3], "x": 11.75, "y": 2}, + {"matrix": [5, 4], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [6, 2], "x": 3.25, "y": 3}, + {"matrix": [6, 3], "x": 4.25, "y": 3}, + {"matrix": [6, 4], "x": 5.25, "y": 3}, + {"matrix": [6, 5], "x": 6.25, "y": 3}, + {"matrix": [6, 6], "x": 7.25, "y": 3}, + {"matrix": [6, 7], "x": 8.25, "y": 3}, + {"matrix": [5, 5], "x": 9.25, "y": 3}, + {"matrix": [5, 6], "x": 10.25, "y": 3}, + {"matrix": [5, 7], "x": 11.25, "y": 3}, + {"matrix": [3, 7], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [7, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [7, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [7, 7], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/kbod/kbod.h b/keyboards/handwired/kbod/kbod.h deleted file mode 100644 index 86ff0e8eadba..000000000000 --- a/keyboards/handwired/kbod/kbod.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k10, k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, k26, k27, k30, k31, k32, k33, k34, k35, \ - k40, k41, k42, k43, k44, k45, k46, k47, k50, k51, k52, k53, k54, \ - k60, k61, k62, k63, k64, k65, k66, k67, k55, k56, k57, k37, \ - k70, k71, k72, k73, k74, k75, k76, k77 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, XXX, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, XXX, 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 } \ -} diff --git a/keyboards/handwired/ks63/info.json b/keyboards/handwired/ks63/info.json index 8bb32c871dff..6fcd1c12bb89 100644 --- a/keyboards/handwired/ks63/info.json +++ b/keyboards/handwired/ks63/info.json @@ -21,338 +21,73 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "~", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 7, - "y": 0 - }, - { - "label": "*", - "x": 8, - "y": 0 - }, - { - "label": "(", - "x": 9, - "y": 0 - }, - { - "label": ")", - "x": 10, - "y": 0 - }, - { - "label": "_", - "x": 11, - "y": 0 - }, - { - "label": "+", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "{", - "x": 11.5, - "y": 1 - }, - { - "label": "}", - "x": 12.5, - "y": 1 - }, - { - "label": "|", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Caps Lock", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": ":", - "x": 10.75, - "y": 2 - }, - { - "label": "\"", - "x": 11.75, - "y": 2 - }, - { - "label": "Enter", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": "<", - "x": 9.25, - "y": 3 - }, - { - "label": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "Shift", - "x": 12.25, - "y": 3, - "w": 2.75 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "x": 3.75, - "y": 4, - "w": 2.25 - }, - { - "label": "Esc", - "x": 6, - "y": 4, - "w": 1.25 - }, - { - "label": "Space", - "x": 7.25, - "y": 4, - "w": 2.75 - }, - { - "label": "\u2190", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2193", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2191", - "x": 12.5, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2192", - "x": 13.75, - "y": 4, - "w": 1.25 - } + {"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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 7], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [6, 0], "x": 6.5, "y": 1}, + {"matrix": [6, 1], "x": 7.5, "y": 1}, + {"matrix": [6, 2], "x": 8.5, "y": 1}, + {"matrix": [6, 3], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 5], "x": 11.5, "y": 1}, + {"matrix": [6, 6], "x": 12.5, "y": 1}, + {"matrix": [6, 7], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [7, 0], "x": 6.75, "y": 2}, + {"matrix": [7, 1], "x": 7.75, "y": 2}, + {"matrix": [7, 2], "x": 8.75, "y": 2}, + {"matrix": [7, 3], "x": 9.75, "y": 2}, + {"matrix": [7, 4], "x": 10.75, "y": 2}, + {"matrix": [7, 5], "x": 11.75, "y": 2}, + {"matrix": [7, 6], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [8, 0], "x": 7.25, "y": 3}, + {"matrix": [8, 1], "x": 8.25, "y": 3}, + {"matrix": [8, 2], "x": 9.25, "y": 3}, + {"matrix": [8, 3], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 6], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/ks63/ks63.h b/keyboards/handwired/ks63/ks63.h deleted file mode 100644 index 05006f593d57..000000000000 --- a/keyboards/handwired/ks63/ks63.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K403, K404, K406, K408, K410, K411, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006 }, \ - { K100, KC_NO, K102, K103, K104, K105, K106 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206 }, \ - { KC_NO, K301, K302, K303, K304, K305, K306 }, \ - { K400, K401, KC_NO, K403, K404, KC_NO, K406 }, \ - \ - { K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ - { K307, K308, K309, K310, K311, KC_NO, K313, KC_NO }, \ - { KC_NO, K408, KC_NO, K410, K411, KC_NO, K413, K414 } \ -} diff --git a/keyboards/handwired/lagrange/info.json b/keyboards/handwired/lagrange/info.json index 1141183e18f0..243f9a5d7bda 100644 --- a/keyboards/handwired/lagrange/info.json +++ b/keyboards/handwired/lagrange/info.json @@ -30,82 +30,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75, "w":1.5}, - {"x":1.5, "y":0.75}, - {"x":2.5, "y":0.375}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0.5}, - {"x":5.5, "y":0.5}, - {"x":12.5, "y":0.5}, - {"x":13.5, "y":0.5}, - {"x":14.5, "y":0}, - {"x":15.5, "y":0.375}, - {"x":16.5, "y":0.75}, - {"x":17.5, "y":0.75, "w":1.5}, + {"matrix": [0, 0], "x": 0, "y": 0.75, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0.75}, + {"matrix": [0, 2], "x": 2.5, "y": 0.375}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0.5}, + {"matrix": [0, 5], "x": 5.5, "y": 0.5}, - {"x":0, "y":1.75, "w":1.5}, - {"x":1.5, "y":1.75}, - {"x":2.5, "y":1.375}, - {"x":3.5, "y":1}, - {"x":4.5, "y":1.5}, - {"x":5.5, "y":1.5}, - {"x":12.5, "y":1.5}, - {"x":13.5, "y":1.5}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1.375}, - {"x":16.5, "y":1.75}, - {"x":17.5, "y":1.75, "w":1.5}, + {"matrix": [7, 5], "x": 12.5, "y": 0.5}, + {"matrix": [7, 4], "x": 13.5, "y": 0.5}, + {"matrix": [7, 3], "x": 14.5, "y": 0}, + {"matrix": [7, 2], "x": 15.5, "y": 0.375}, + {"matrix": [7, 1], "x": 16.5, "y": 0.75}, + {"matrix": [7, 0], "x": 17.5, "y": 0.75, "w": 1.5}, - {"x":0, "y":2.75, "w":1.5}, - {"x":1.5, "y":2.75}, - {"x":2.5, "y":2.375}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2.5}, - {"x":5.5, "y":2.5}, - {"x":12.5, "y":2.5}, - {"x":13.5, "y":2.5}, - {"x":14.5, "y":2}, - {"x":15.5, "y":2.375}, - {"x":16.5, "y":2.75}, - {"x":17.5, "y":2.75, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1.75, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.75}, + {"matrix": [1, 2], "x": 2.5, "y": 1.375}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, - {"x":0, "y":3.75, "w":1.5}, - {"x":1.5, "y":3.75}, - {"x":2.5, "y":3.375}, - {"x":3.5, "y":3}, - {"x":4.5, "y":3.5}, - {"x":5.5, "y":3.5}, - {"x":12.5, "y":3.5}, - {"x":13.5, "y":3.5}, - {"x":14.5, "y":3}, - {"x":15.5, "y":3.375}, - {"x":16.5, "y":3.75}, - {"x":17.5, "y":3.75, "w":1.5}, + {"matrix": [8, 5], "x": 12.5, "y": 1.5}, + {"matrix": [8, 4], "x": 13.5, "y": 1.5}, + {"matrix": [8, 3], "x": 14.5, "y": 1}, + {"matrix": [8, 2], "x": 15.5, "y": 1.375}, + {"matrix": [8, 1], "x": 16.5, "y": 1.75}, + {"matrix": [8, 0], "x": 17.5, "y": 1.75, "w": 1.5}, - {"x":0, "y":4.75, "w":1.5}, - {"x":2.5, "y":4.375}, - {"x":3.5, "y":4}, - {"x":5, "y":5, "h":1.25}, - {"x":6, "y":5, "h":1.5}, - {"x":7, "y":5, "h":1.5}, - {"x":8, "y":5.5}, - {"x":10, "y":5.5}, - {"x":11, "y":5, "h":1.5}, - {"x":12, "y":5, "h":1.5}, - {"x":13, "y":5, "h":1.25}, - {"x":14.5, "y":4}, - {"x":15.5, "y":4.5}, - {"x":17.5, "y":4.75, "w":1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.75, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.75}, + {"matrix": [2, 2], "x": 2.5, "y": 2.375}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, - {"x":5, "y":7}, - {"x":6, "y":6.5}, - {"x":7, "y":7}, - {"x":11, "y":7}, - {"x":12, "y":6.5}, - {"x":13, "y":7}, + {"matrix": [9, 5], "x": 12.5, "y": 2.5}, + {"matrix": [9, 4], "x": 13.5, "y": 2.5}, + {"matrix": [9, 3], "x": 14.5, "y": 2}, + {"matrix": [9, 2], "x": 15.5, "y": 2.375}, + {"matrix": [9, 1], "x": 16.5, "y": 2.75}, + {"matrix": [9, 0], "x": 17.5, "y": 2.75, "w": 1.5}, - {"x":6, "y":7.5}, - {"x":12, "y":7.5} + {"matrix": [3, 0], "x": 0, "y": 3.75, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.75}, + {"matrix": [3, 2], "x": 2.5, "y": 3.375}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5}, + + {"matrix": [10, 5], "x": 12.5, "y": 3.5}, + {"matrix": [10, 4], "x": 13.5, "y": 3.5}, + {"matrix": [10, 3], "x": 14.5, "y": 3}, + {"matrix": [10, 2], "x": 15.5, "y": 3.375}, + {"matrix": [10, 1], "x": 16.5, "y": 3.75}, + {"matrix": [10, 0], "x": 17.5, "y": 3.75, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.75, "w": 1.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.375}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 5, "h": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 5, "h": 1.5}, + {"matrix": [5, 5], "x": 7, "y": 5, "h": 1.5}, + {"matrix": [6, 5], "x": 8, "y": 5.5}, + + {"matrix": [13, 5], "x": 10, "y": 5.5}, + {"matrix": [12, 5], "x": 11, "y": 5, "h": 1.5}, + {"matrix": [11, 5], "x": 12, "y": 5, "h": 1.5}, + {"matrix": [11, 4], "x": 13, "y": 5, "h": 1.25}, + {"matrix": [11, 3], "x": 14.5, "y": 4}, + {"matrix": [11, 2], "x": 15.5, "y": 4.5}, + {"matrix": [11, 0], "x": 17.5, "y": 4.75, "w": 1.5}, + + {"matrix": [5, 3], "x": 5, "y": 7}, + {"matrix": [5, 4], "x": 6, "y": 6.5}, + {"matrix": [6, 4], "x": 7, "y": 7}, + + {"matrix": [13, 4], "x": 11, "y": 7}, + {"matrix": [12, 4], "x": 12, "y": 6.5}, + {"matrix": [12, 3], "x": 13, "y": 7}, + + {"matrix": [6, 3], "x": 6, "y": 7.5}, + + {"matrix": [13, 3], "x": 12, "y": 7.5} ] } } diff --git a/keyboards/handwired/lagrange/lagrange.h b/keyboards/handwired/lagrange/lagrange.h index 6f808ba8e4ca..60f82c11b237 100644 --- a/keyboards/handwired/lagrange/lagrange.h +++ b/keyboards/handwired/lagrange/lagrange.h @@ -25,29 +25,3 @@ #define SPI_SCK_PIN B1 #define SPI_MOSI_PIN B2 #define SPI_MISO_PIN B3 - -#define LAYOUT( \ - l00, l01, l02, l03, l04, l05, r05, r04, r03, r02, r01, r00, \ - l10, l11, l12, l13, l14, l15, r15, r14, r13, r12, r11, r10, \ - l20, l21, l22, l23, l24, l25, r25, r24, r23, r22, r21, r20, \ - l30, l31, l32, l33, l34, l35, r35, r34, r33, r32, r31, r30, \ - l40, l42, l43, l44, l45, l46, l47, r47, r46, r45, r44, r43, r42, r40, \ - l50, l51, l52, r52, r51, r50, \ - l70, r70) \ - { \ - {l00, l01, l02, l03, l04, l05}, \ - {l10, l11, l12, l13, l14, l15}, \ - {l20, l21, l22, l23, l24, l25}, \ - {l30, l31, l32, l33, l34, l35}, \ - {l40, KC_NO, l42, l43, l44, l45}, \ - {KC_NO, KC_NO, KC_NO, l50, l51, l46}, \ - {KC_NO, KC_NO, KC_NO, l70, l52, l47}, \ - \ - {r00, r01, r02, r03, r04, r05}, \ - {r10, r11, r12, r13, r14, r15}, \ - {r20, r21, r22, r23, r24, r25}, \ - {r30, r31, r32, r33, r34, r35}, \ - {r40, KC_NO, r42, r43, r44, r45}, \ - {KC_NO, KC_NO, KC_NO, r50, r51, r46}, \ - {KC_NO, KC_NO, KC_NO, r70, r52, r47} \ - } diff --git a/keyboards/handwired/magicforce61/info.json b/keyboards/handwired/magicforce61/info.json index fd457aba7e09..9ec845614c72 100644 --- a/keyboards/handwired/magicforce61/info.json +++ b/keyboards/handwired/magicforce61/info.json @@ -18,67 +18,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/magicforce61/magicforce61.h b/keyboards/handwired/magicforce61/magicforce61.h deleted file mode 100644 index 37a32ed7839c..000000000000 --- a/keyboards/handwired/magicforce61/magicforce61.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3D, \ - K40, K41, K42, K45, K49, K4A, K4C, K4D \ - ) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, KC_NO, K3D }, \ - { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D }, \ -} diff --git a/keyboards/handwired/magicforce68/info.json b/keyboards/handwired/magicforce68/info.json index 465639485825..da77c2b91c26 100644 --- a/keyboards/handwired/magicforce68/info.json +++ b/keyboards/handwired/magicforce68/info.json @@ -18,75 +18,84 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Insert", "x":15.25, "y":0}, - {"label":"Page Up", "x":16.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Delete", "x":15.25, "y":1}, - {"label":"Page Down", "x":16.25, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Up", "x":15.25, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Fn", "x":10, "y":4, "w":1.25}, - {"label":"Alt", "x":11.25, "y":4, "w":1.25}, - {"label":"Ctrl", "x":12.5, "y":4, "w":1.25}, - {"label":"Left", "x":14.25, "y":4}, - {"label":"Down", "x":15.25, "y":4}, - {"label":"Right", "x":16.25, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [2, 14], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15.25, "y": 1}, + {"matrix": [3, 14], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [3, 13], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 14.25, "y": 4}, + {"matrix": [4, 13], "x": 15.25, "y": 4}, + {"matrix": [4, 14], "x": 16.25, "y": 4} ] } } + } diff --git a/keyboards/handwired/magicforce68/magicforce68.h b/keyboards/handwired/magicforce68/magicforce68.h deleted file mode 100644 index 829e5932b58b..000000000000 --- a/keyboards/handwired/magicforce68/magicforce68.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k3E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3C, k3D, \ - k40, k41, k42, k45, k49, k4A, k4B, k4C, k4D, k4E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, XXX, k3C, k3D, k3E }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/handwired/marauder/info.json b/keyboards/handwired/marauder/info.json index eba81459efc3..a4bab132846f 100644 --- a/keyboards/handwired/marauder/info.json +++ b/keyboards/handwired/marauder/info.json @@ -21,100 +21,114 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D0,B6)", "x":0, "y":0}, - {"label":"K01 (D0,B2)", "x":2, "y":0}, - {"label":"K02 (D0,B3)", "x":3, "y":0}, - {"label":"K03 (D0,B1)", "x":4, "y":0}, - {"label":"K04 (D0,F7)", "x":5, "y":0}, - {"label":"K05 (D0,F6)", "x":6.5, "y":0}, - {"label":"K06 (D0,F5)", "x":7.5, "y":0}, - {"label":"K07 (D0,F4)", "x":8.5, "y":0}, - {"label":"K08 (D0,B0)", "x":9.5, "y":0}, - {"label":"K68 (B5,B0)", "x":11, "y":0}, - {"label":"K67 (B5,F4)", "x":12, "y":0}, - {"label":"K66 (B5,F5)", "x":13, "y":0}, - {"label":"K65 (B5,F6)", "x":14, "y":0}, - {"label":"K63 (B5,B1)", "x":15.25, "y":0}, - {"label":"K62 (B5,B3)", "x":16.25, "y":0}, - {"label":"K61 (B5,B2)", "x":17.25, "y":0}, - {"label":"K60 (B5,B6)", "x":18.25, "y":0}, - {"label":"K10 (D4,B6)", "x":0, "y":1.5}, - {"label":"K11 (D4,B2)", "x":1, "y":1.5}, - {"label":"K12 (D4,B3)", "x":2, "y":1.5}, - {"label":"K13 (D4,B1)", "x":3, "y":1.5}, - {"label":"K14 (D4,F7)", "x":4, "y":1.5}, - {"label":"K15 (D4,F6)", "x":5, "y":1.5}, - {"label":"K16 (D4,F5)", "x":6, "y":1.5}, - {"label":"K17 (D4,F4)", "x":7, "y":1.5}, - {"label":"K18 (D4,B0)", "x":8, "y":1.5}, - {"label":"K78 (B7,B0)", "x":9, "y":1.5}, - {"label":"K77 (B7,F4)", "x":10, "y":1.5}, - {"label":"K76 (B7,F5)", "x":11, "y":1.5}, - {"label":"K75 (B7,F6)", "x":12, "y":1.5}, - {"label":"K74 (B7,F7)", "x":13, "y":1.5, "w":2}, - {"label":"K73 (B7,B1)", "x":15.25, "y":1.5}, - {"label":"K72 (B7,B3)", "x":16.25, "y":1.5}, - {"label":"K71 (B7,B2)", "x":17.25, "y":1.5}, - {"label":"K70 (B7,B6)", "x":18.25, "y":1.5}, - {"label":"K20 (C6,B6)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (C6,B2)", "x":1.5, "y":2.5}, - {"label":"K22 (C6,B3)", "x":2.5, "y":2.5}, - {"label":"K23 (C6,B1)", "x":3.5, "y":2.5}, - {"label":"K24 (C6,F7)", "x":4.5, "y":2.5}, - {"label":"K25 (C6,F6)", "x":5.5, "y":2.5}, - {"label":"K26 (C6,F5)", "x":6.5, "y":2.5}, - {"label":"K27 (C6,F4)", "x":7.5, "y":2.5}, - {"label":"K28 (C6,B0)", "x":8.5, "y":2.5}, - {"label":"K88 (D5,B0)", "x":9.5, "y":2.5}, - {"label":"K87 (D5,F4)", "x":10.5, "y":2.5}, - {"label":"K86 (D5,F5)", "x":11.5, "y":2.5}, - {"label":"K85 (D5,F6)", "x":12.5, "y":2.5}, - {"label":"K84 (D5,F7)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K83 (D5,B1)", "x":15.25, "y":2.5}, - {"label":"K82 (D5,B3)", "x":16.25, "y":2.5}, - {"label":"K81 (D5,B2)", "x":17.25, "y":2.5}, - {"label":"K80 (D5,B6)", "x":18.25, "y":2.5, "h":2}, - {"label":"K30 (D7,B6)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (D7,B2)", "x":1.75, "y":3.5}, - {"label":"K32 (D7,B3)", "x":2.75, "y":3.5}, - {"label":"K33 (D7,B1)", "x":3.75, "y":3.5}, - {"label":"K34 (D7,F7)", "x":4.75, "y":3.5}, - {"label":"K35 (D7,F6)", "x":5.75, "y":3.5}, - {"label":"K36 (D7,F5)", "x":6.75, "y":3.5}, - {"label":"K37 (D7,F4)", "x":7.75, "y":3.5}, - {"label":"K38 (D7,B0)", "x":8.75, "y":3.5}, - {"label":"K98 (C7,B0)", "x":9.75, "y":3.5}, - {"label":"K97 (C7,F4)", "x":10.75, "y":3.5}, - {"label":"K96 (C7,F5)", "x":11.75, "y":3.5}, - {"label":"K95 (C7,F6)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K93 (C7,B1)", "x":15.25, "y":3.5}, - {"label":"K92 (C7,B3)", "x":16.25, "y":3.5}, - {"label":"K91 (C7,B2)", "x":17.25, "y":3.5}, - {"label":"K40 (E6,B6)", "x":0, "y":4.5, "w":2.25}, - {"label":"K41 (E6,B2)", "x":2.25, "y":4.5}, - {"label":"K42 (E6,B3)", "x":3.25, "y":4.5}, - {"label":"K43 (E6,B1)", "x":4.25, "y":4.5}, - {"label":"K44 (E6,F7)", "x":5.25, "y":4.5}, - {"label":"K45 (E6,F6)", "x":6.25, "y":4.5}, - {"label":"K46 (E6,F5)", "x":7.25, "y":4.5}, - {"label":"K47 (E6,F4)", "x":8.25, "y":4.5}, - {"label":"K48 (E6,B0)", "x":9.25, "y":4.5}, - {"label":"KA8 (F1,B0)", "x":10.25, "y":4.5}, - {"label":"KA7 (F1,F4)", "x":11.25, "y":4.5}, - {"label":"KA6 (F1,F5)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"KA3 (F1,B1)", "x":15.25, "y":4.5}, - {"label":"KA2 (F1,B3)", "x":16.25, "y":4.5}, - {"label":"KA1 (F1,B2)", "x":17.25, "y":4.5}, - {"label":"KA0 (F1,B6)", "x":18.25, "y":4.5, "h":2}, - {"label":"K50 (B4,B6)", "x":0, "y":5.5, "w":1.5}, - {"label":"K51 (B4,B2)", "x":1.5, "y":5.5}, - {"label":"K52 (B4,B3)", "x":2.5, "y":5.5, "w":1.5}, - {"label":"K56 (B4,F5)", "x":4, "y":5.5, "w":7}, - {"label":"KB7 (F0,F4)", "x":11, "y":5.5, "w":1.5}, - {"label":"KB6 (F0,F5)", "x":12.5, "y":5.5}, - {"label":"KB4 (F0,F7)", "x":13.5, "y":5.5, "w":1.5}, - {"label":"KB3 (F0,B1)", "x":15.25, "y":5.5, "w":2}, - {"label":"KB1 (F0,B2)", "x":17.25, "y":5.5} + {"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": [6, 8], "x": 11, "y": 0}, + {"matrix": [6, 7], "x": 12, "y": 0}, + {"matrix": [6, 6], "x": 13, "y": 0}, + {"matrix": [6, 5], "x": 14, "y": 0}, + + {"matrix": [6, 3], "x": 15.25, "y": 0}, + {"matrix": [6, 2], "x": 16.25, "y": 0}, + {"matrix": [6, 1], "x": 17.25, "y": 0}, + {"matrix": [6, 0], "x": 18.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [7, 8], "x": 9, "y": 1.5}, + {"matrix": [7, 7], "x": 10, "y": 1.5}, + {"matrix": [7, 6], "x": 11, "y": 1.5}, + {"matrix": [7, 5], "x": 12, "y": 1.5}, + {"matrix": [7, 4], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 3], "x": 15.25, "y": 1.5}, + {"matrix": [7, 2], "x": 16.25, "y": 1.5}, + {"matrix": [7, 1], "x": 17.25, "y": 1.5}, + {"matrix": [7, 0], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [8, 8], "x": 9.5, "y": 2.5}, + {"matrix": [8, 7], "x": 10.5, "y": 2.5}, + {"matrix": [8, 6], "x": 11.5, "y": 2.5}, + {"matrix": [8, 5], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 3], "x": 15.25, "y": 2.5}, + {"matrix": [8, 2], "x": 16.25, "y": 2.5}, + {"matrix": [8, 1], "x": 17.25, "y": 2.5}, + {"matrix": [8, 0], "x": 18.25, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [9, 8], "x": 9.75, "y": 3.5}, + {"matrix": [9, 7], "x": 10.75, "y": 3.5}, + {"matrix": [9, 6], "x": 11.75, "y": 3.5}, + {"matrix": [9, 5], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [9, 3], "x": 15.25, "y": 3.5}, + {"matrix": [9, 2], "x": 16.25, "y": 3.5}, + {"matrix": [9, 1], "x": 17.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [10, 8], "x": 10.25, "y": 4.5}, + {"matrix": [10, 7], "x": 11.25, "y": 4.5}, + {"matrix": [10, 6], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [10, 3], "x": 15.25, "y": 4.5}, + {"matrix": [10, 2], "x": 16.25, "y": 4.5}, + {"matrix": [10, 1], "x": 17.25, "y": 4.5}, + {"matrix": [10, 0], "x": 18.25, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [11, 7], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [11, 6], "x": 12.5, "y": 5.5}, + {"matrix": [11, 4], "x": 13.5, "y": 5.5, "w": 1.5}, + + {"matrix": [11, 3], "x": 15.25, "y": 5.5, "w": 2}, + {"matrix": [11, 1], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/handwired/marauder/marauder.h b/keyboards/handwired/marauder/marauder.h deleted file mode 100644 index a8201a8db8f2..000000000000 --- a/keyboards/handwired/marauder/marauder.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 BB-66 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K68, K67, K66, K65, K63, K62, K61, K60, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K77, K76, K75, K74, K73, K72, K71, K70, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K86, K85, K84, K83, K82, K81, K80, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K96, K95, K93, K92, K91, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA6, KA3, KA2, KA1, KA0, \ - K50, K51, K52, K56, KB7, KB6, KB4, KB3, KB1 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO }, \ - { K60, K61, K62, K63, KC_NO, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { K80, K81, K82, K83, K84, K85, K86, K87, K88 }, \ - { KC_NO, K91, K92, K93, KC_NO, K95, K96, K97, K98 }, \ - { KA0, KA1, KA2, KA3, KC_NO, KC_NO, KA6, KA7, KA8 }, \ - { KC_NO, KB1, KC_NO, KB3, KB4, KC_NO, KB6, KB7, KC_NO }, \ -} diff --git a/keyboards/handwired/minorca/info.json b/keyboards/handwired/minorca/info.json index c7b463f22314..ba2b6d0ed59f 100644 --- a/keyboards/handwired/minorca/info.json +++ b/keyboards/handwired/minorca/info.json @@ -18,48 +18,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K0A", "x":10, "y":0}, - {"label":"K0B", "x":11, "y":0}, - {"label":"K10", "x":0, "y":1, "w":1.25}, - {"label":"K11", "x":1.25, "y":1}, - {"label":"K12", "x":2.25, "y":1}, - {"label":"K13", "x":3.25, "y":1}, - {"label":"K14", "x":4.25, "y":1}, - {"label":"K15", "x":5.25, "y":1}, - {"label":"K16", "x":6.25, "y":1}, - {"label":"K17", "x":7.25, "y":1}, - {"label":"K18", "x":8.25, "y":1}, - {"label":"K19", "x":9.25, "y":1}, - {"label":"K1B", "x":10.25, "y":1, "w":1.75}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K22", "x":1.75, "y":2}, - {"label":"K23", "x":2.75, "y":2}, - {"label":"K24", "x":3.75, "y":2}, - {"label":"K25", "x":4.75, "y":2}, - {"label":"K26", "x":5.75, "y":2}, - {"label":"K27", "x":6.75, "y":2}, - {"label":"K28", "x":7.75, "y":2}, - {"label":"K29", "x":8.75, "y":2}, - {"label":"K2A", "x":9.75, "y":2}, - {"label":"K2B", "x":10.75, "y":2, "w":1.25}, - {"label":"K30", "x":0, "y":3, "w":1.25}, - {"label":"K32", "x":1.25, "y":3, "w":1.25}, - {"label":"K33", "x":2.5, "y":3, "w":1.25}, - {"label":"K34", "x":3.75, "y":3, "w":2.25}, - {"label":"K37", "x":6, "y":3, "w":2.25}, - {"label":"K39", "x":8.25, "y":3, "w":1.25}, - {"label":"K3A", "x":9.5, "y":3}, - {"label":"K3B", "x":10.5, "y":3, "w":1.5} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 6, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.5, "y": 3}, + {"matrix": [3, 11], "x": 10.5, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/handwired/minorca/minorca.h b/keyboards/handwired/minorca/minorca.h deleted file mode 100644 index ca524caf5909..000000000000 --- a/keyboards/handwired/minorca/minorca.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K32, K33, K34, K37, K39, K3A, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B }, \ - { K30, KC_NO, K32, K33, K34, KC_NO, KC_NO, K37, KC_NO, K39, K3A, K3B } \ -} diff --git a/keyboards/handwired/not_so_minidox/info.json b/keyboards/handwired/not_so_minidox/info.json index dee4d76c50c6..b5298dfae4dc 100644 --- a/keyboards/handwired/not_so_minidox/info.json +++ b/keyboards/handwired/not_so_minidox/info.json @@ -21,55 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.25}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"x":8, "y":0.25}, - {"x":9, "y":0.125}, - {"x":10, "y":0}, - {"x":11, "y":0.125}, - {"x":12, "y":0.25}, - {"x":13, "y":0.375}, + {"matrix": [4, 5], "x": 8, "y": 0.25}, + {"matrix": [4, 4], "x": 9, "y": 0.125}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.125}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 0.375}, - {"x":0, "y":1.375}, - {"x":1, "y":1.25}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"x":8, "y":1.25}, - {"x":9, "y":1.125}, - {"x":10, "y":1}, - {"x":11, "y":1.125}, - {"x":12, "y":1.25}, - {"x":13, "y":1.375}, + {"matrix": [5, 5], "x": 8, "y": 1.25}, + {"matrix": [5, 4], "x": 9, "y": 1.125}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.125}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 1.375}, - {"x":0, "y":2.375}, - {"x":1, "y":2.25}, - {"x":2, "y":2.125}, - {"x":3, "y":2}, - {"x":4, "y":2.125}, - {"x":5, "y":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, - {"x":8, "y":2.25}, - {"x":9, "y":2.125}, - {"x":10, "y":2}, - {"x":11, "y":2.125}, - {"x":12, "y":2.25}, - {"x":13, "y":2.375}, + {"matrix": [6, 5], "x": 8, "y": 2.25}, + {"matrix": [6, 4], "x": 9, "y": 2.125}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.125}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 2.375}, - {"x":3.5, "y":4.75}, - {"x":4.5, "y":4.75}, - {"x":5.5, "y":3.75, "h":2}, + {"matrix": [3, 3], "x": 3.5, "y": 4.75}, + {"matrix": [3, 4], "x": 4.5, "y": 4.75}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75, "h": 2}, - {"x":7.5, "y":3.75, "h":2}, - {"x":8.5, "y":4.75}, - {"x":9.5, "y":4.75} + {"matrix": [7, 5], "x": 7.5, "y": 3.75, "h": 2}, + {"matrix": [7, 4], "x": 8.5, "y": 4.75}, + {"matrix": [7, 3], "x": 9.5, "y": 4.75} ] } } diff --git a/keyboards/handwired/not_so_minidox/not_so_minidox.h b/keyboards/handwired/not_so_minidox/not_so_minidox.h deleted file mode 100644 index 7c80dc9b3b27..000000000000 --- a/keyboards/handwired/not_so_minidox/not_so_minidox.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { XXX, XXX, XXX, LT1, LT2, LT3 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { XXX, XXX, XXX, RT1, RT2, RT3 } \ -} diff --git a/keyboards/handwired/oem_iso_fullsize/info.json b/keyboards/handwired/oem_iso_fullsize/info.json index 266d53ede207..e943b65643f8 100644 --- a/keyboards/handwired/oem_iso_fullsize/info.json +++ b/keyboards/handwired/oem_iso_fullsize/info.json @@ -18,111 +18,130 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (C0,C2)", "x":0, "y":0}, - {"label":"K01 (C0,C1)", "x":2, "y":0}, - {"label":"K02 (C0,E0)", "x":3, "y":0}, - {"label":"K03 (C0,D4)", "x":4, "y":0}, - {"label":"K04 (C0,D5)", "x":5, "y":0}, - {"label":"K05 (C0,A4)", "x":6.5, "y":0}, - {"label":"K06 (C0,A0)", "x":7.5, "y":0}, - {"label":"K07 (C0,B2)", "x":8.5, "y":0}, - {"label":"K08 (C0,B0)", "x":9.5, "y":0}, - {"label":"K09 (C0,E7)", "x":11, "y":0}, - {"label":"K0A (C0,E6)", "x":12, "y":0}, - {"label":"K0B (C0,D6)", "x":13, "y":0}, - {"label":"K0C (C0,B1)", "x":14, "y":0}, - {"label":"K0E (C0,D3)", "x":15.25, "y":0}, - {"label":"K0F (C0,D2)", "x":16.25, "y":0}, - {"label":"K0G (C0,B6)", "x":17.25, "y":0}, - {"label":"K10 (B4,C2)", "x":0, "y":1.5}, - {"label":"K11 (B4,C1)", "x":1, "y":1.5}, - {"label":"K12 (B4,E0)", "x":2, "y":1.5}, - {"label":"K13 (B4,D4)", "x":3, "y":1.5}, - {"label":"K14 (B4,D5)", "x":4, "y":1.5}, - {"label":"K15 (B4,A4)", "x":5, "y":1.5}, - {"label":"K16 (B4,A0)", "x":6, "y":1.5}, - {"label":"K17 (B4,B2)", "x":7, "y":1.5}, - {"label":"K18 (B4,B0)", "x":8, "y":1.5}, - {"label":"K19 (B4,E7)", "x":9, "y":1.5}, - {"label":"K1A (B4,E6)", "x":10, "y":1.5}, - {"label":"K1B (B4,D6)", "x":11, "y":1.5}, - {"label":"K1C (B4,B1)", "x":12, "y":1.5}, - {"label":"K1D (B4,B3)", "x":13, "y":1.5, "w":2}, - {"label":"K1E (B4,D3)", "x":15.25, "y":1.5}, - {"label":"K1F (B4,D2)", "x":16.25, "y":1.5}, - {"label":"K1G (B4,B6)", "x":17.25, "y":1.5}, - {"label":"K1H (B4,F7)", "x":18.5, "y":1.5}, - {"label":"K1I (B4,F0)", "x":19.5, "y":1.5}, - {"label":"K1J (B4,F1)", "x":20.5, "y":1.5}, - {"label":"K1K (B4,F2)", "x":21.5, "y":1.5}, - {"label":"K20 (F3,C2)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (F3,C1)", "x":1.5, "y":2.5}, - {"label":"K22 (F3,E0)", "x":2.5, "y":2.5}, - {"label":"K23 (F3,D4)", "x":3.5, "y":2.5}, - {"label":"K24 (F3,D5)", "x":4.5, "y":2.5}, - {"label":"K25 (F3,A4)", "x":5.5, "y":2.5}, - {"label":"K26 (F3,A0)", "x":6.5, "y":2.5}, - {"label":"K27 (F3,B2)", "x":7.5, "y":2.5}, - {"label":"K28 (F3,B0)", "x":8.5, "y":2.5}, - {"label":"K29 (F3,E7)", "x":9.5, "y":2.5}, - {"label":"K2A (F3,E6)", "x":10.5, "y":2.5}, - {"label":"K2B (F3,D6)", "x":11.5, "y":2.5}, - {"label":"K2C (F3,B1)", "x":12.5, "y":2.5}, - {"label":"K2D (F3,B3)", "x":13.75, "y":2.5, "w":1.25, "h":2}, - {"label":"K2E (F3,D3)", "x":15.25, "y":2.5}, - {"label":"K2F (F3,D2)", "x":16.25, "y":2.5}, - {"label":"K2G (F3,B6)", "x":17.25, "y":2.5}, - {"label":"K2H (F3,F7)", "x":18.5, "y":2.5}, - {"label":"K2I (F3,F0)", "x":19.5, "y":2.5}, - {"label":"K2J (F3,F1)", "x":20.5, "y":2.5}, - {"label":"K2K (F3,F2)", "x":21.5, "y":2.5, "h":2}, - {"label":"K30 (F4,C2)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (F4,C1)", "x":1.75, "y":3.5}, - {"label":"K32 (F4,E0)", "x":2.75, "y":3.5}, - {"label":"K33 (F4,D4)", "x":3.75, "y":3.5}, - {"label":"K34 (F4,D5)", "x":4.75, "y":3.5}, - {"label":"K35 (F4,A4)", "x":5.75, "y":3.5}, - {"label":"K36 (F4,A0)", "x":6.75, "y":3.5}, - {"label":"K37 (F4,B2)", "x":7.75, "y":3.5}, - {"label":"K38 (F4,B0)", "x":8.75, "y":3.5}, - {"label":"K39 (F4,E7)", "x":9.75, "y":3.5}, - {"label":"K3A (F4,E6)", "x":10.75, "y":3.5}, - {"label":"K3B (F4,D6)", "x":11.75, "y":3.5}, - {"label":"K3D (F4,B3)", "x":12.75, "y":3.5}, - {"label":"K3H (F4,F7)", "x":18.5, "y":3.5}, - {"label":"K3I (F4,F0)", "x":19.5, "y":3.5}, - {"label":"K3J (F4,F1)", "x":20.5, "y":3.5}, - {"label":"K40 (F5,C2)", "x":0, "y":4.5, "w":1.25}, - {"label":"K4E (F5,D3)", "x":1.25, "y":4.5}, - {"label":"K41 (F5,C1)", "x":2.25, "y":4.5}, - {"label":"K42 (F5,E0)", "x":3.25, "y":4.5}, - {"label":"K43 (F5,D4)", "x":4.25, "y":4.5}, - {"label":"K44 (F5,D5)", "x":5.25, "y":4.5}, - {"label":"K45 (F5,A4)", "x":6.25, "y":4.5}, - {"label":"K46 (F5,A0)", "x":7.25, "y":4.5}, - {"label":"K47 (F5,B2)", "x":8.25, "y":4.5}, - {"label":"K48 (F5,B0)", "x":9.25, "y":4.5}, - {"label":"K49 (F5,E7)", "x":10.25, "y":4.5}, - {"label":"K4A (F5,E6)", "x":11.25, "y":4.5}, - {"label":"K4B (F5,D6)", "x":12.25, "y":4.5, "w":2.75}, - {"label":"K4F (F5,D2)", "x":16.25, "y":4.5}, - {"label":"K4H (F5,F7)", "x":18.5, "y":4.5}, - {"label":"K4I (F5,F0)", "x":19.5, "y":4.5}, - {"label":"K4J (F5,F1)", "x":20.5, "y":4.5}, - {"label":"K4K (F5,F2)", "x":21.5, "y":4.5, "h":2}, - {"label":"K50 (F6,C2)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (F6,C1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (F6,E0)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K53 (F6,D4)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K54 (F6,D5)", "x":10, "y":5.5, "w":1.25}, - {"label":"K55 (F6,A4)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K56 (F6,A0)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K58 (F6,B0)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"K5E (F6,D3)", "x":15.25, "y":5.5}, - {"label":"K5F (F6,D2)", "x":16.25, "y":5.5}, - {"label":"K5G (F6,B6)", "x":17.25, "y":5.5}, - {"label":"K5I (F6,F0)", "x":18.5, "y":5.5, "w":2}, - {"label":"K5J (F6,F1)", "x":20.5, "y":5.5} + {"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.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [1, 19], "x": 20.5, "y": 1.5}, + {"matrix": [1, 20], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [2, 19], "x": 20.5, "y": 2.5}, + {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5}, + + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [3, 19], "x": 20.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 14], "x": 1.25, "y": 4.5}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [4, 19], "x": 20.5, "y": 4.5}, + {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5}, + + {"matrix": [5, 18], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [5, 19], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h b/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h deleted file mode 100644 index 4f8c898038f6..000000000000 --- a/keyboards/handwired/oem_iso_fullsize/oem_iso_fullsize.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2021 andresteare - * - * 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( \ - 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, K1H, K1I, K1J, K1K, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3H, K3I, K3J, \ - K40, K4E, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4F, K4H, K4I, K4J, K4K, \ - K50, K51, K52, K53, K54, K55, K56, K58, K5E, K5F, K5G, K5I, K5J \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, K0F, K0G, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, KC_NO, KC_NO, KC_NO, K3H, K3I, K3J, KC_NO }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, KC_NO, K4E, K4F, KC_NO, K4H, K4I, K4J, K4K }, \ - { K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K5E, K5F, K5G, KC_NO, K5I, K5J, KC_NO }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/handwired/ortho5x13/info.json b/keyboards/handwired/ortho5x13/info.json index b15b3fa61b8e..3fed9e246028 100644 --- a/keyboards/handwired/ortho5x13/info.json +++ b/keyboards/handwired/ortho5x13/info.json @@ -18,70 +18,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"[", "x":11, "y":1}, - {"label":"]", "x":12, "y":1}, - {"label":"`", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":";", "x":10, "y":2}, - {"label":",", "x":11, "y":2}, - {"label":"\\", "x":12, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6, "y":3}, - {"label":"M", "x":7, "y":3}, - {"label":",", "x":8, "y":3}, - {"label":".", "x":9, "y":3}, - {"label":"/", "x":10, "y":3}, - {"label":"Enter", "x":11, "y":3}, - {"label":"Up", "x":12, "y":3}, - {"label":"Hyper", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"GUI", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4, "w":2}, - {"label":"Raise", "x":7, "y":4}, - {"label":"Backspace", "x":8, "y":4}, - {"label":"Shift", "x":9, "y":4}, - {"label":"Left", "x":10, "y":4}, - {"label":"Right", "x":11, "y":4}, - {"label":"Down", "x":12, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4} ] } } diff --git a/keyboards/handwired/ortho5x13/ortho5x13.h b/keyboards/handwired/ortho5x13/ortho5x13.h deleted file mode 100644 index e946bea9c15b..000000000000 --- a/keyboards/handwired/ortho5x13/ortho5x13.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, \ - k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c }, \ - { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c } \ -} diff --git a/keyboards/handwired/ortho5x14/info.json b/keyboards/handwired/ortho5x14/info.json index 5faccec8afa5..67b4cc4c2e07 100644 --- a/keyboards/handwired/ortho5x14/info.json +++ b/keyboards/handwired/ortho5x14/info.json @@ -18,80 +18,78 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Delete", "x":0, "y":0}, - {"label":"Bkspc", "x":1, "y":0}, - {"label":"1", "x":2, "y":0}, - {"label":"2", "x":3, "y":0}, - {"label":"3", "x":4, "y":0}, - {"label":"4", "x":5, "y":0}, - {"label":"5", "x":6, "y":0}, - {"label":"6", "x":7, "y":0}, - {"label":"7", "x":8, "y":0}, - {"label":"8", "x":9, "y":0}, - {"label":"9", "x":10, "y":0}, - {"label":"0", "x":11, "y":0}, - {"label":"-", "x":12, "y":0}, - {"label":"=", "x":13, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, - {"label":"Home", "x":0, "y":1}, - {"label":"Tab", "x":1, "y":1}, - {"label":"Q", "x":2, "y":1}, - {"label":"W", "x":3, "y":1}, - {"label":"E", "x":4, "y":1}, - {"label":"R", "x":5, "y":1}, - {"label":"T", "x":6, "y":1}, - {"label":"Y", "x":7, "y":1}, - {"label":"U", "x":8, "y":1}, - {"label":"I", "x":9, "y":1}, - {"label":"O", "x":10, "y":1}, - {"label":"P", "x":11, "y":1}, - {"label":"[", "x":12, "y":1}, - {"label":"]", "x":13, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, - {"label":"PgUp", "x":0, "y":2}, - {"label":"Caps", "x":1, "y":2}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5, "y":2}, - {"label":"G", "x":6, "y":2}, - {"label":"H", "x":7, "y":2}, - {"label":"J", "x":8, "y":2}, - {"label":"K", "x":9, "y":2}, - {"label":"L", "x":10, "y":2}, - {"label":";", "x":11, "y":2}, - {"label":"'", "x":12, "y":2}, - {"label":"Enter", "x":13, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, - - {"label":"PgDn", "x":0, "y":3}, - {"label":"Shift", "x":1, "y":3}, - {"label":"Z", "x":2, "y":3}, - {"label":"X", "x":3, "y":3}, - {"label":"C", "x":4, "y":3}, - {"label":"V", "x":5, "y":3}, - {"label":"B", "x":6, "y":3}, - {"label":"N", "x":7, "y":3}, - {"label":"M", "x":8, "y":3}, - {"label":",", "x":9, "y":3}, - {"label":".", "x":10, "y":3}, - {"label":"/", "x":11, "y":3}, - {"label":"\\", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3}, - - {"label":"End", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Hyper", "x":2, "y":4}, - {"label":"Alt", "x":3, "y":4}, - {"label":"Lower", "x":4, "y":4}, - {"label":"Space", "x":5, "y":4, "w":2}, - {"label":"Space", "x":7, "y":4, "w":2}, - {"label":"Raise", "x":9, "y":4}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Prop", "x":11, "y":4}, - {"label":"Ctrl", "x":12, "y":4}, - {"label":"Esc", "x":13, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 8], "x": 7, "y": 4, "w": 2}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4} ] } } diff --git a/keyboards/handwired/ortho5x14/ortho5x14.h b/keyboards/handwired/ortho5x14/ortho5x14.h deleted file mode 100644 index 0c3d5b861e62..000000000000 --- a/keyboards/handwired/ortho5x14/ortho5x14.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Richard Nunez - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k44, k45, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \ - { k40, k41, k42, k43, k44, k45, KC_NO, KC_NO, k48, k49, k4a, k4b, k4c, k4d } \ -} diff --git a/keyboards/handwired/p65rgb/info.json b/keyboards/handwired/p65rgb/info.json index c752501362b5..cd5ae0243b5c 100644 --- a/keyboards/handwired/p65rgb/info.json +++ b/keyboards/handwired/p65rgb/info.json @@ -28,75 +28,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"~", "x":13, "y":0}, - {"label":"|", "x":14, "y":0}, - {"label":"Delete", "x":15, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"Backspace", "x":13.5, "y":1, "w":1.5}, - {"label":"PgUp", "x":15, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"PgDn", "x":15, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14, "y":3}, - {"label":"Fn", "x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Fn", "x":10, "y":4, "w":1.25}, - {"label":"Menu", "x":11.25, "y":4, "w":1.25}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/handwired/p65rgb/p65rgb.c b/keyboards/handwired/p65rgb/p65rgb.c index 5c045c2fc140..86bca2a7f98b 100644 --- a/keyboards/handwired/p65rgb/p65rgb.c +++ b/keyboards/handwired/p65rgb/p65rgb.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "p65rgb.h" +#include "quantum.h" led_config_t g_led_config = { { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 }, diff --git a/keyboards/handwired/p65rgb/p65rgb.h b/keyboards/handwired/p65rgb/p65rgb.h deleted file mode 100644 index fd7e216d13fa..000000000000 --- a/keyboards/handwired/p65rgb/p65rgb.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 marhalloweenvt - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - 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, k1e, k1f, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, K2e, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3c, k3e, k3f, \ - k40, k41, k42, k45, k49, k4a, k4c, k4e, k4f \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, KC_NO, k1e, k1f, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, KC_NO, K2e, k2f, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, KC_NO, k3c, KC_NO, k3e, k3f, KC_NO }, \ - { k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO, KC_NO, k49, k4a, KC_NO, k4c, KC_NO, k4e, k4f, KC_NO }, \ -} - diff --git a/keyboards/handwired/pilcrow/info.json b/keyboards/handwired/pilcrow/info.json index 28bb690c3cb5..0a826c6ba8bc 100644 --- a/keyboards/handwired/pilcrow/info.json +++ b/keyboards/handwired/pilcrow/info.json @@ -18,46 +18,49 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":0}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Y", "x":5, "y":0}, - {"label":"U", "x":6, "y":0}, - {"label":"I", "x":7, "y":0}, - {"label":"O", "x":8, "y":0}, - {"label":"P", "x":9, "y":0}, - {"label":"A", "x":0, "y":1}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"H", "x":5, "y":1}, - {"label":"J", "x":6, "y":1}, - {"label":"K", "x":7, "y":1}, - {"label":"L", "x":8, "y":1}, - {"label":";", "x":9, "y":1}, - {"label":"Z", "x":0, "y":2}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"N", "x":5, "y":2}, - {"label":"M", "x":6, "y":2}, - {"label":",", "x":7, "y":2}, - {"label":".", "x":8, "y":2}, - {"label":"/", "x":9, "y":2}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"Alt", "x":1, "y":3}, - {"label":"GUI", "x":2, "y":3}, - {"label":"MO(1)", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3}, - {"label":"Shift / Space", "x":5, "y":3}, - {"label":"MO(2)", "x":6, "y":3}, - {"label":"MO(3)", "x":7, "y":3}, - {"label":"Delete", "x":8, "y":3}, - {"label":"Esc", "x":9, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3} ] } } diff --git a/keyboards/handwired/pilcrow/pilcrow.h b/keyboards/handwired/pilcrow/pilcrow.h deleted file mode 100644 index 30576e85c030..000000000000 --- a/keyboards/handwired/pilcrow/pilcrow.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 } \ -} diff --git a/keyboards/handwired/pill60/info.json b/keyboards/handwired/pill60/info.json index 0c8f353bffd7..6cc337f8eee1 100644 --- a/keyboards/handwired/pill60/info.json +++ b/keyboards/handwired/pill60/info.json @@ -22,75 +22,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Enc", "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 0, "y": 0}, - {"label": "Esc", "x": 0, "y": 1}, - {"label": "1","x": 1, "y": 1}, - {"label": "2","x": 2, "y": 1}, - {"label": "3","x": 3, "y": 1}, - {"label": "4","x": 4, "y": 1}, - {"label": "5","x": 5, "y": 1}, - {"label": "6","x": 6, "y": 1}, - {"label": "7","x": 7, "y": 1}, - {"label": "8","x": 8, "y": 1}, - {"label": "9","x": 9, "y": 1}, - {"label": "0","x": 10, "y": 1}, - {"label": "-","x": 11, "y": 1}, - {"label": "=","x": 12, "y": 1}, - {"label": "\\","x": 13, "y": 1}, - {"label": "Del","x": 14, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "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, 8], "x": 8, "y": 1}, + {"matrix": [0, 9], "x": 9, "y": 1}, + {"matrix": [0, 10], "x": 10, "y": 1}, + {"matrix": [0, 11], "x": 11, "y": 1}, + {"matrix": [0, 12], "x": 12, "y": 1}, + {"matrix": [0, 13], "x": 13, "y": 1}, + {"matrix": [2, 13], "x": 14, "y": 1}, - {"label": "Tab","x": 0, "y": 2, "w": 1.5}, - {"label": "Q","x": 1.5, "y": 2}, - {"label": "W","x": 2.5, "y": 2}, - {"label": "E","x": 3.5, "y": 2}, - {"label": "R","x": 4.5, "y": 2}, - {"label": "T","x": 5.5, "y": 2}, - {"label": "Y","x": 6.5, "y": 2}, - {"label": "U","x": 7.5, "y": 2}, - {"label": "I","x": 8.5, "y": 2}, - {"label": "O","x": 9.5, "y": 2}, - {"label": "P","x": 10.5, "y": 2}, - {"label": "[","x": 11.5, "y": 2}, - {"label": "]","x": 12.5, "y": 2}, - {"label": "Backspace","x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 2}, + {"matrix": [1, 2], "x": 2.5, "y": 2}, + {"matrix": [1, 3], "x": 3.5, "y": 2}, + {"matrix": [1, 4], "x": 4.5, "y": 2}, + {"matrix": [1, 5], "x": 5.5, "y": 2}, + {"matrix": [1, 6], "x": 6.5, "y": 2}, + {"matrix": [1, 7], "x": 7.5, "y": 2}, + {"matrix": [1, 8], "x": 8.5, "y": 2}, + {"matrix": [1, 9], "x": 9.5, "y": 2}, + {"matrix": [1, 10], "x": 10.5, "y": 2}, + {"matrix": [1, 11], "x": 11.5, "y": 2}, + {"matrix": [1, 12], "x": 12.5, "y": 2}, + {"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5}, - {"label": "Caps","x": 0, "y": 3, "w": 1.75}, - {"label": "A","x": 1.75, "y": 3}, - {"label": "S","x": 2.75, "y": 3}, - {"label": "D","x": 3.75, "y": 3}, - {"label": "F","x": 4.75, "y": 3}, - {"label": "G","x": 5.75, "y": 3}, - {"label": "H","x": 6.75, "y": 3}, - {"label": "J","x": 7.75, "y": 3}, - {"label": "K","x": 8.75, "y": 3}, - {"label": "L","x": 9.75, "y": 3}, - {"label": ";","x": 10.75, "y": 3}, - {"label": "'","x": 11.75, "y": 3}, - {"label": "Enter","x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3}, + {"matrix": [2, 2], "x": 2.75, "y": 3}, + {"matrix": [2, 3], "x": 3.75, "y": 3}, + {"matrix": [2, 4], "x": 4.75, "y": 3}, + {"matrix": [2, 5], "x": 5.75, "y": 3}, + {"matrix": [2, 6], "x": 6.75, "y": 3}, + {"matrix": [2, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 8], "x": 8.75, "y": 3}, + {"matrix": [2, 9], "x": 9.75, "y": 3}, + {"matrix": [2, 10], "x": 10.75, "y": 3}, + {"matrix": [2, 11], "x": 11.75, "y": 3}, + {"matrix": [2, 12], "x": 12.75, "y": 3, "w": 2.25}, - {"label": "L Shift","x": 0, "y": 4, "w": 2.25}, - {"label": "Z","x": 2.25, "y": 4}, - {"label": "X","x": 3.25, "y": 4}, - {"label": "C","x": 4.25, "y": 4}, - {"label": "V","x": 5.25, "y": 4}, - {"label": "B","x": 6.25, "y": 4}, - {"label": "N","x": 7.25, "y": 4}, - {"label": "M","x": 8.25, "y": 4}, - {"label": ",","x": 9.25, "y": 4}, - {"label": ".","x": 10.25, "y": 4}, - {"label": "/","x": 11.25, "y": 4}, - {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75}, - {"label": "FN","x": 14, "y": 4}, + {"matrix": [3, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 4}, + {"matrix": [3, 2], "x": 3.25, "y": 4}, + {"matrix": [3, 3], "x": 4.25, "y": 4}, + {"matrix": [3, 4], "x": 5.25, "y": 4}, + {"matrix": [3, 5], "x": 6.25, "y": 4}, + {"matrix": [3, 6], "x": 7.25, "y": 4}, + {"matrix": [3, 7], "x": 8.25, "y": 4}, + {"matrix": [3, 8], "x": 9.25, "y": 4}, + {"matrix": [3, 9], "x": 10.25, "y": 4}, + {"matrix": [3, 10], "x": 11.25, "y": 4}, + {"matrix": [3, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 4}, - {"label": "L CTRL","x": 0, "y": 5, "w": 1.25}, - {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25}, - {"label": "L ALT","x": 2.5, "y": 5, "w": 1.25}, - {"label": "Space","x": 3.75, "y": 5, "w": 6.25}, - {"label": "R ALT","x": 10, "y": 5, "w": 1.25}, - {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25}, - {"label": "FN","x": 12.5, "y": 5, "w": 1.25}, - {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25} + {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 5, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 5, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 5, "w": 1.25} ] } } diff --git a/keyboards/handwired/pill60/pill60.h b/keyboards/handwired/pill60/pill60.h deleted file mode 100644 index e020f1eb75c5..000000000000 --- a/keyboards/handwired/pill60/pill60.h +++ /dev/null @@ -1,42 +0,0 @@ - /* Copyright 2020 Imam Rafii - * - * 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" - -/* LAYOUT - ENCODER - ESC| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = |BCKS | DEL - TAB| Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ - CAP| A | S | D | F | G | H | J | K | L | ; | ' | ENTER - LSHFT| Z | X | C | V | B | N | M | , | . | / | RSHIF | FN - LCT| WIN| ALT| ESPACE | ALT| WIN | MN| RCT| -*/ - -#define LAYOUT( \ - e00, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k47, k4a, k4b, k4c, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k0e }, \ - { k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, KC_NO }, \ - { k40, k41, k42, e00, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4e }\ -} diff --git a/keyboards/handwired/prime_exl/info.json b/keyboards/handwired/prime_exl/info.json index 01516ed006ef..9a4d4b963663 100644 --- a/keyboards/handwired/prime_exl/info.json +++ b/keyboards/handwired/prime_exl/info.json @@ -20,8 +20,98 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "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.5,"y":0}, {"x":7.5,"y":0}, {"x":8.5,"y":0}, {"x":9.5,"y":0}, {"x":10.5,"y":0}, {"x":11.5,"y":0}, {"x":13.75,"y":0}, {"x":14.75,"y":0}, {"x":15.75,"y":0}, {"x":16.75,"y":0}, {"x":17.75,"y":0}, {"x":18.75,"y":0,"w":2}, {"x":0,"y":1}, {"x":1,"y":1}, {"x":2,"y":1}, {"x":3,"y":1}, {"x":4,"y":1}, {"x":5,"y":1}, {"x":6.5,"y":1,"w":1.25}, {"x":7.75,"y":1}, {"x":8.75,"y":1}, {"x":9.75,"y":1}, {"x":10.75,"y":1}, {"x":11.75,"y":1}, {"x":14,"y":1}, {"x":15,"y":1}, {"x":16,"y":1}, {"x":17,"y":1}, {"x":18,"y":1}, {"x":19,"y":1,"w":1.75}, {"x":0,"y":2}, {"x":1,"y":2}, {"x":2,"y":2}, {"x":3,"y":2}, {"x":4,"y":2}, {"x":5,"y":2}, {"x":6.5,"y":2,"w":1.75}, {"x":8.25,"y":2}, {"x":9.25,"y":2}, {"x":10.25,"y":2}, {"x":11.25,"y":2}, {"x":12.25,"y":2}, {"x":13.5,"y":2}, {"x":14.5,"y":2}, {"x":15.5,"y":2}, {"x":16.5,"y":2}, {"x":17.5,"y":2}, {"x":18.5,"y":2}, {"x":19.5,"y":2,"w":1.25}, {"x":0,"y":3}, {"x":1,"y":3}, {"x":2,"y":3}, {"x":3,"y":3}, {"x":4,"y":3}, {"x":5,"y":3}, {"x":6.5,"y":3,"w":1.25}, {"x":7.75,"y":3,"w":1.25}, {"x":9,"y":3}, {"x":10,"y":3}, {"x":11,"y":3,"w":2}, {"x":13.5,"y":3,"w":2}, {"x":15.5,"y":3}, {"x":16.5,"y":3}, {"x":17.5,"y":3,"w":1.5}, {"x":19,"y":3,"w":1.5}, {"x":0,"y":4}, {"x":1,"y":4}, {"x":2,"y":4}, {"x":3,"y":4}, {"x":4,"y":4}, {"x":5,"y":4}] - } + "LAYOUT": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [5, 0], "x": 1, "y": 0}, + {"matrix": [4, 1], "x": 2, "y": 0}, + {"matrix": [5, 1], "x": 3, "y": 0}, + {"matrix": [4, 2], "x": 4, "y": 0}, + {"matrix": [5, 2], "x": 5, "y": 0}, + + {"matrix": [4, 3], "x": 6.5, "y": 0}, + {"matrix": [5, 3], "x": 7.5, "y": 0}, + {"matrix": [4, 4], "x": 8.5, "y": 0}, + {"matrix": [5, 4], "x": 9.5, "y": 0}, + {"matrix": [4, 5], "x": 10.5, "y": 0}, + {"matrix": [5, 5], "x": 11.5, "y": 0}, + + {"matrix": [4, 6], "x": 13.75, "y": 0}, + {"matrix": [5, 6], "x": 14.75, "y": 0}, + {"matrix": [4, 7], "x": 15.75, "y": 0}, + {"matrix": [5, 7], "x": 16.75, "y": 0}, + {"matrix": [4, 8], "x": 17.75, "y": 0}, + {"matrix": [5, 8], "x": 18.75, "y": 0, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 1}, + {"matrix": [6, 0], "x": 1, "y": 1}, + {"matrix": [3, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [3, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "x": 5, "y": 1}, + + {"matrix": [3, 3], "x": 6.5, "y": 1, "w": 1.25}, + {"matrix": [6, 3], "x": 7.75, "y": 1}, + {"matrix": [3, 4], "x": 8.75, "y": 1}, + {"matrix": [6, 4], "x": 9.75, "y": 1}, + {"matrix": [3, 5], "x": 10.75, "y": 1}, + {"matrix": [6, 5], "x": 11.75, "y": 1}, + + {"matrix": [3, 6], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [3, 7], "x": 16, "y": 1}, + {"matrix": [6, 7], "x": 17, "y": 1}, + {"matrix": [3, 8], "x": 18, "y": 1}, + {"matrix": [6, 8], "x": 19, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [7, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [7, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [7, 2], "x": 5, "y": 2}, + + {"matrix": [2, 3], "x": 6.5, "y": 2, "w": 1.75}, + {"matrix": [7, 3], "x": 8.25, "y": 2}, + {"matrix": [2, 4], "x": 9.25, "y": 2}, + {"matrix": [7, 4], "x": 10.25, "y": 2}, + {"matrix": [2, 5], "x": 11.25, "y": 2}, + {"matrix": [7, 5], "x": 12.25, "y": 2}, + + {"matrix": [8, 5], "x": 13.5, "y": 2}, + {"matrix": [2, 6], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + {"matrix": [2, 7], "x": 16.5, "y": 2}, + {"matrix": [7, 7], "x": 17.5, "y": 2}, + {"matrix": [2, 8], "x": 18.5, "y": 2}, + {"matrix": [7, 8], "x": 19.5, "y": 2, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 3}, + {"matrix": [8, 0], "x": 1, "y": 3}, + {"matrix": [1, 1], "x": 2, "y": 3}, + {"matrix": [8, 1], "x": 3, "y": 3}, + {"matrix": [1, 2], "x": 4, "y": 3}, + {"matrix": [8, 2], "x": 5, "y": 3}, + + {"matrix": [1, 3], "x": 6.5, "y": 3, "w": 1.25}, + {"matrix": [8, 3], "x": 7.75, "y": 3, "w": 1.25}, + {"matrix": [1, 4], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [1, 5], "x": 11, "y": 3, "w": 2}, + + {"matrix": [1, 6], "x": 13.5, "y": 3, "w": 2}, + {"matrix": [8, 6], "x": 15.5, "y": 3}, + {"matrix": [1, 7], "x": 16.5, "y": 3}, + {"matrix": [8, 7], "x": 17.5, "y": 3, "w": 1.5}, + {"matrix": [1, 8], "x": 19, "y": 3, "w": 1.5}, + + {"matrix": [0, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [0, 1], "x": 2, "y": 4}, + {"matrix": [9, 1], "x": 3, "y": 4}, + {"matrix": [0, 2], "x": 4, "y": 4}, + {"matrix": [9, 2], "x": 5, "y": 4} + ] + } } } diff --git a/keyboards/handwired/prime_exl/prime_exl.h b/keyboards/handwired/prime_exl/prime_exl.h deleted file mode 100644 index 1c9a8060fc69..000000000000 --- a/keyboards/handwired/prime_exl/prime_exl.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2018 Holten Campbell - * - * 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 XXX KC_NO - -#define LAYOUT( \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \ - k30, k60, k31, k61, k32, k62, k33, k63, k34, k64, k35, k65, k36, k66, k37, k67, k38, k68, \ - k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k85, k26, k76, k27, k77, k28, k78, \ - k10, k80, k11, k81, k12, k82, k13, k83, k14, k84, k15, k16, k86, k17, k87, k18, \ - k00, k90, k01, k91, k02, k92 \ -) { \ - { k00, k01, k02, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, XXX }, \ - { k90, k91, k92, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/promethium/info.json b/keyboards/handwired/promethium/info.json index 83f2477b3ed1..6daf5dd0c698 100644 --- a/keyboards/handwired/promethium/info.json +++ b/keyboards/handwired/promethium/info.json @@ -16,61 +16,65 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k11", "x": 0, "y": 0.5 }, - { "label": "k12", "x": 1, "y": 0.3 }, - { "label": "k13", "x": 2, "y": 0.15 }, - { "label": "k14", "x": 3, "y": 0 }, - { "label": "k15", "x": 4, "y": 0.15 }, - { "label": "k16", "x": 5, "y": 0.15 }, - { "label": "k17", "x": 10, "y": 0.15 }, - { "label": "k18", "x": 11, "y": 0.15 }, - { "label": "k19", "x": 12, "y": 0 }, - { "label": "k1a", "x": 13, "y": 0.15 }, - { "label": "k1b", "x": 14, "y": 0.3 }, - { "label": "k1c", "x": 15, "y": 0.5 }, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.3}, + {"matrix": [0, 2], "x": 2, "y": 0.15}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + {"matrix": [0, 5], "x": 5, "y": 0.15}, - { "label": "k21", "x": 0, "y": 1.5 }, - { "label": "k22", "x": 1, "y": 1.3 }, - { "label": "k23", "x": 2, "y": 1.15 }, - { "label": "k24", "x": 3, "y": 1 }, - { "label": "k25", "x": 4, "y": 1.15 }, - { "label": "k26", "x": 5, "y": 1.15 }, - { "label": "k27", "x": 10, "y": 1.15 }, - { "label": "k28", "x": 11, "y": 1.15 }, - { "label": "k29", "x": 12, "y": 1 }, - { "label": "k2a", "x": 13, "y": 1.15 }, - { "label": "k2b", "x": 14, "y": 1.3 }, - { "label": "k2c", "x": 15, "y": 1.5 }, + {"matrix": [4, 0], "x": 10, "y": 0.15}, + {"matrix": [4, 1], "x": 11, "y": 0.15}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0.15}, + {"matrix": [4, 4], "x": 14, "y": 0.3}, + {"matrix": [4, 5], "x": 15, "y": 0.5}, - { "label": "k31", "x": 0, "y": 2.5 }, - { "label": "k32", "x": 1, "y": 2.3 }, - { "label": "k33", "x": 2, "y": 2.15 }, - { "label": "k34", "x": 3, "y": 2 }, - { "label": "k35", "x": 4, "y": 2.15 }, - { "label": "k36", "x": 5, "y": 2.15 }, - { "label": "k37", "x": 10, "y": 2.15 }, - { "label": "k38", "x": 11, "y": 2.15 }, - { "label": "k39", "x": 12, "y": 2 }, - { "label": "k3a", "x": 13, "y": 2.15 }, - { "label": "k3b", "x": 14, "y": 2.3 }, - { "label": "k3c", "x": 15, "y": 2.5 }, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.3}, + {"matrix": [1, 2], "x": 2, "y": 1.15}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + {"matrix": [1, 5], "x": 5, "y": 1.15}, - { "label": "k41", "x": 0, "y": 3.5 }, - { "label": "k42", "x": 1, "y": 3.3 }, - { "label": "k43", "x": 2, "y": 3.15 }, - { "label": "k44", "x": 3, "y": 3 }, - { "label": "k45", "x": 4, "y": 3.15 }, - { "label": "k46", "x": 5, "y": 3.15 }, - { "label": "k47", "x": 10, "y": 3.15 }, - { "label": "k48", "x": 11, "y": 3.15 }, - { "label": "k49", "x": 12, "y": 3 }, - { "label": "k4a", "x": 13, "y": 3.15 }, - { "label": "k4b", "x": 14, "y": 3.3 }, - { "label": "k4c", "x": 15, "y": 3.5 }, + {"matrix": [5, 0], "x": 10, "y": 1.15}, + {"matrix": [5, 1], "x": 11, "y": 1.15}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1.15}, + {"matrix": [5, 4], "x": 14, "y": 1.3}, + {"matrix": [5, 5], "x": 15, "y": 1.5}, - { "label": "tp1", "x": 6.5, "y": 3.15 }, - { "label": "tp2", "x": 7.5, "y": 3.15 }, - { "label": "tp3", "x": 8.5, "y": 3.15 } + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.3}, + {"matrix": [2, 2], "x": 2, "y": 2.15}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + {"matrix": [2, 5], "x": 5, "y": 2.15}, + + {"matrix": [6, 0], "x": 10, "y": 2.15}, + {"matrix": [6, 1], "x": 11, "y": 2.15}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2.15}, + {"matrix": [6, 4], "x": 14, "y": 2.3}, + {"matrix": [6, 5], "x": 15, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.3}, + {"matrix": [3, 2], "x": 2, "y": 3.15}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.15}, + {"matrix": [3, 5], "x": 5, "y": 3.15}, + + {"matrix": [7, 0], "x": 10, "y": 3.15}, + {"matrix": [7, 1], "x": 11, "y": 3.15}, + {"matrix": [7, 2], "x": 12, "y": 3}, + {"matrix": [7, 3], "x": 13, "y": 3.15}, + {"matrix": [7, 4], "x": 14, "y": 3.3}, + {"matrix": [7, 5], "x": 15, "y": 3.5}, + + {"matrix": [8, 0], "x": 6.5, "y": 3.15}, + {"matrix": [8, 1], "x": 7.5, "y": 3.15}, + {"matrix": [8, 2], "x": 8.5, "y": 3.15} ] } } diff --git a/keyboards/handwired/promethium/keymaps/default/keymap.c b/keyboards/handwired/promethium/keymaps/default/keymap.c index 21dd99d95aef..100db976781e 100644 --- a/keyboards/handwired/promethium/keymaps/default/keymap.c +++ b/keyboards/handwired/promethium/keymaps/default/keymap.c @@ -13,13 +13,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#if defined(PRIYADI_PROMETHIUM) - #include "promethium.h" -#elif defined(PRIYADI_PLANCK) - #include "planck.h" -#else - #error "no keyboard defined" -#endif +#include QMK_KEYBOARD_H #include "action_layer.h" #ifdef AUDIO_ENABLE diff --git a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c index 1ebf63037bd1..1d299c229932 100644 --- a/keyboards/handwired/promethium/keymaps/priyadi/keymap.c +++ b/keyboards/handwired/promethium/keymaps/priyadi/keymap.c @@ -13,13 +13,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#if defined(PRIYADI_PROMETHIUM) - #include "promethium.h" -#elif defined(PRIYADI_PLANCK) - #include "planck.h" -#else - #error "no keyboard defined" -#endif +#include QMK_KEYBOARD_H #include "action_layer.h" #ifdef AUDIO_ENABLE diff --git a/keyboards/handwired/promethium/promethium.h b/keyboards/handwired/promethium/promethium.h index 0d594a7942e4..b4dd2cd5ffd0 100644 --- a/keyboards/handwired/promethium/promethium.h +++ b/keyboards/handwired/promethium/promethium.h @@ -3,23 +3,3 @@ #include "quantum.h" void battery_poll(uint8_t level); - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k50, k51, k52, k53, k54, k55, \ - k20, k21, k22, k23, k24, k25, k60, k61, k62, k63, k64, k65, \ - k30, k31, k32, k33, k34, k35, k70, k71, k72, k73, k74, k75, \ - tp1, tp2, tp3 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { k40, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { tp1, tp2, tp3, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/pteron/info.json b/keyboards/handwired/pteron/info.json index 94dbc9dcfc0c..c8b5e9d4d8c5 100644 --- a/keyboards/handwired/pteron/info.json +++ b/keyboards/handwired/pteron/info.json @@ -18,71 +18,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K000", "x":0, "y":0.75}, - {"label":"K001", "x":1, "y":0.75}, - {"label":"K002", "x":2, "y":0.25}, - {"label":"K003", "x":3, "y":0}, - {"label":"K004", "x":4, "y":0.35}, - {"label":"K005", "x":5, "y":0.45}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.45}, - {"label":"K006", "x":11, "y":0.45}, - {"label":"K007", "x":12, "y":0.35}, - {"label":"K008", "x":13, "y":0}, - {"label":"K009", "x":14, "y":0.25}, - {"label":"K010", "x":15, "y":0.75}, - {"label":"K011", "x":16, "y":0.75}, + {"matrix": [0, 6], "x": 11, "y": 0.45}, + {"matrix": [0, 7], "x": 12, "y": 0.35}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0.25}, + {"matrix": [0, 10], "x": 15, "y": 0.75}, + {"matrix": [0, 11], "x": 16, "y": 0.75}, - {"label":"K100", "x":0, "y":1.75}, - {"label":"K101", "x":1, "y":1.75}, - {"label":"K102", "x":2, "y":1.25}, - {"label":"K103", "x":3, "y":1}, - {"label":"K104", "x":4, "y":1.35}, - {"label":"K105", "x":5, "y":1.45}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.45}, - {"label":"K106", "x":11, "y":1.45}, - {"label":"K107", "x":12, "y":1.35}, - {"label":"K108", "x":13, "y":1}, - {"label":"K109", "x":14, "y":1.25}, - {"label":"K110", "x":15, "y":1.75}, - {"label":"K111", "x":16, "y":1.75}, + {"matrix": [1, 6], "x": 11, "y": 1.45}, + {"matrix": [1, 7], "x": 12, "y": 1.35}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [1, 10], "x": 15, "y": 1.75}, + {"matrix": [1, 11], "x": 16, "y": 1.75}, - {"label":"K200", "x":0, "y":2.75}, - {"label":"K201", "x":1, "y":2.75}, - {"label":"K202", "x":2, "y":2.25}, - {"label":"K203", "x":3, "y":2}, - {"label":"K204", "x":4, "y":2.35}, - {"label":"K205", "x":5, "y":2.45}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.45}, - {"label":"K206", "x":11, "y":2.45}, - {"label":"K207", "x":12, "y":2.35}, - {"label":"K208", "x":13, "y":2}, - {"label":"K209", "x":14, "y":2.25}, - {"label":"K210", "x":15, "y":2.75}, - {"label":"K211", "x":16, "y":2.75}, + {"matrix": [2, 6], "x": 11, "y": 2.45}, + {"matrix": [2, 7], "x": 12, "y": 2.35}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2.25}, + {"matrix": [2, 10], "x": 15, "y": 2.75}, + {"matrix": [2, 11], "x": 16, "y": 2.75}, - {"label":"K300", "x":0, "y":3.75}, - {"label":"K301", "x":1, "y":3.75}, - {"label":"K302", "x":2, "y":3.25}, - {"label":"K303", "x":3, "y":3}, - {"label":"K304", "x":4, "y":3.35}, - {"label":"K305", "x":5, "y":3.45}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.45}, - {"label":"K306", "x":11, "y":3.45}, - {"label":"K307", "x":12, "y":3.35}, - {"label":"K308", "x":13, "y":3}, - {"label":"K309", "x":14, "y":3.25}, - {"label":"K310", "x":15, "y":3.75}, - {"label":"K311", "x":16, "y":3.75}, + {"matrix": [3, 6], "x": 11, "y": 3.45}, + {"matrix": [3, 7], "x": 12, "y": 3.35}, + {"matrix": [3, 8], "x": 13, "y": 3}, + {"matrix": [3, 9], "x": 14, "y": 3.25}, + {"matrix": [3, 10], "x": 15, "y": 3.75}, + {"matrix": [3, 11], "x": 16, "y": 3.75}, - {"label":"K402", "x":4, "y":4.35}, - {"label":"K403", "x":5, "y":4.45}, - {"label":"K404", "x":6, "y":4.65}, - {"label":"K405", "x":7, "y":4.95}, + {"matrix": [4, 2], "x": 4, "y": 4.35}, + {"matrix": [4, 3], "x": 5, "y": 4.45}, + {"matrix": [4, 4], "x": 6, "y": 4.65}, + {"matrix": [4, 5], "x": 7, "y": 4.95}, - {"label":"K406", "x":9, "y":4.95}, - {"label":"K407", "x":10, "y":4.65}, - {"label":"K408", "x":11, "y":4.45}, - {"label":"K409", "x":12, "y":4.35} + {"matrix": [4, 6], "x": 9, "y": 4.95}, + {"matrix": [4, 7], "x": 10, "y": 4.65}, + {"matrix": [4, 8], "x": 11, "y": 4.45}, + {"matrix": [4, 9], "x": 12, "y": 4.35} ] } } diff --git a/keyboards/handwired/pteron/pteron.h b/keyboards/handwired/pteron/pteron.h deleted file mode 100644 index f29c2619af01..000000000000 --- a/keyboards/handwired/pteron/pteron.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K402, K403, K404, K405, K406, K407, K408, K409 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/pteron44/info.json b/keyboards/handwired/pteron44/info.json index 3f89bef56185..da32096bf12d 100644 --- a/keyboards/handwired/pteron44/info.json +++ b/keyboards/handwired/pteron44/info.json @@ -18,57 +18,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75}, - {"x":1, "y":0.75}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.35}, - {"x":5, "y":0.45}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.45}, - {"x":11, "y":0.45}, - {"x":12, "y":0.35}, - {"x":13, "y":0}, - {"x":14, "y":0.25}, - {"x":15, "y":0.75}, - {"x":16, "y":0.75}, + {"matrix": [0, 6], "x": 11, "y": 0.45}, + {"matrix": [0, 7], "x": 12, "y": 0.35}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0.25}, + {"matrix": [0, 10], "x": 15, "y": 0.75}, + {"matrix": [0, 11], "x": 16, "y": 0.75}, - {"x":0, "y":1.75}, - {"x":1, "y":1.75}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.35}, - {"x":5, "y":1.45}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.45}, - {"x":11, "y":1.45}, - {"x":12, "y":1.35}, - {"x":13, "y":1}, - {"x":14, "y":1.25}, - {"x":15, "y":1.75}, - {"x":16, "y":1.75}, + {"matrix": [1, 6], "x": 11, "y": 1.45}, + {"matrix": [1, 7], "x": 12, "y": 1.35}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [1, 10], "x": 15, "y": 1.75}, + {"matrix": [1, 11], "x": 16, "y": 1.75}, - {"x":0, "y":2.75}, - {"x":1, "y":2.75}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.35}, - {"x":5, "y":2.45}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.45}, - {"x":11, "y":2.45}, - {"x":12, "y":2.35}, - {"x":13, "y":2}, - {"x":14, "y":2.25}, - {"x":15, "y":2.75}, - {"x":16, "y":2.75}, + {"matrix": [2, 6], "x": 11, "y": 2.45}, + {"matrix": [2, 7], "x": 12, "y": 2.35}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2.25}, + {"matrix": [2, 10], "x": 15, "y": 2.75}, + {"matrix": [2, 11], "x": 16, "y": 2.75}, - {"x":4, "y":3.35}, - {"x":5, "y":3.45}, - {"x":6, "y":3.65}, - {"x":7, "y":3.95}, + {"matrix": [3, 2], "x": 4, "y": 3.35}, + {"matrix": [3, 3], "x": 5, "y": 3.45}, + {"matrix": [3, 4], "x": 6, "y": 3.65}, + {"matrix": [3, 5], "x": 7, "y": 3.95}, - {"x":9, "y":3.95}, - {"x":10, "y":3.65}, - {"x":11, "y":3.45}, - {"x":12, "y":3.35} + {"matrix": [3, 6], "x": 9, "y": 3.95}, + {"matrix": [3, 7], "x": 10, "y": 3.65}, + {"matrix": [3, 8], "x": 11, "y": 3.45}, + {"matrix": [3, 9], "x": 12, "y": 3.35} ] } } diff --git a/keyboards/handwired/pteron44/pteron44.h b/keyboards/handwired/pteron44/pteron44.h deleted file mode 100644 index 971822331395..000000000000 --- a/keyboards/handwired/pteron44/pteron44.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Fidel Coria - * - * 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( \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K402, K403, K404, K405, K406, K407, K408, K409 \ -) { \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { KC_NO, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO } \ -} diff --git a/keyboards/handwired/retro_refit/info.json b/keyboards/handwired/retro_refit/info.json index cd7e8c111512..c7cef78c1989 100644 --- a/keyboards/handwired/retro_refit/info.json +++ b/keyboards/handwired/retro_refit/info.json @@ -18,87 +18,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"Num Lock", "x":11.5, "y":0}, - {"label":"Scroll Lock", "x":12.5, "y":0}, - {"label":"Print Screen", "x":13.5, "y":0}, - {"label":"Pause", "x":14.5, "y":0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":1.5}, - {"label":"Home", "x":14.5, "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":"Page Up", "x":14.5, "y":2.5}, - {"label":"Ctrl", "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":"Enter", "x":12.75, "y":3.5, "w":1.75}, - {"label":"Page Down", "x":14.5, "y":3.5}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"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":"Shift", "x":12.25, "y":4.5, "w":1.25}, - {"label":"Up", "x":13.5, "y":4.5}, - {"label":"End", "x":14.5, "y":4.5}, - {"label":"Alt", "x":0, "y":5.5, "w":1.25}, - {"label":"Caps Lock", "x":1.25, "y":5.5, "w":1.25}, - {"label":"\\", "x":2.5, "y":5.5}, - {"label":"Space", "x":3.5, "y":5.5, "w":7}, - {"label":"Insert", "x":10.5, "y":5.5}, - {"label":"Delete", "x":11.5, "y":5.5}, - {"label":"Left", "x":12.5, "y":5.5}, - {"label":"Down", "x":13.5, "y":5.5}, - {"label":"Right", "x":14.5, "y":5.5} + {"matrix": [7, 7], "x": 0, "y": 0}, + {"matrix": [0, 5], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 0], "x": 6, "y": 0}, + {"matrix": [10, 7], "x": 7, "y": 0}, + {"matrix": [10, 6], "x": 8, "y": 0}, + {"matrix": [10, 5], "x": 9, "y": 0}, + {"matrix": [10, 4], "x": 10, "y": 0}, + + {"matrix": [10, 3], "x": 11.5, "y": 0}, + {"matrix": [10, 2], "x": 12.5, "y": 0}, + {"matrix": [1, 1], "x": 13.5, "y": 0}, + {"matrix": [9, 4], "x": 14.5, "y": 0}, + + {"matrix": [2, 7], "x": 0, "y": 1.5}, + {"matrix": [7, 6], "x": 1, "y": 1.5}, + {"matrix": [7, 5], "x": 2, "y": 1.5}, + {"matrix": [7, 4], "x": 3, "y": 1.5}, + {"matrix": [7, 3], "x": 4, "y": 1.5}, + {"matrix": [7, 2], "x": 5, "y": 1.5}, + {"matrix": [7, 1], "x": 6, "y": 1.5}, + {"matrix": [7, 0], "x": 7, "y": 1.5}, + {"matrix": [6, 7], "x": 8, "y": 1.5}, + {"matrix": [6, 6], "x": 9, "y": 1.5}, + {"matrix": [6, 5], "x": 10, "y": 1.5}, + {"matrix": [6, 4], "x": 11, "y": 1.5}, + {"matrix": [6, 3], "x": 12, "y": 1.5}, + {"matrix": [6, 2], "x": 13, "y": 1.5, "w": 1.5}, + {"matrix": [10, 1], "x": 14.5, "y": 1.5}, + + {"matrix": [6, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [6, 0], "x": 1.5, "y": 2.5}, + {"matrix": [5, 7], "x": 2.5, "y": 2.5}, + {"matrix": [5, 6], "x": 3.5, "y": 2.5}, + {"matrix": [5, 5], "x": 4.5, "y": 2.5}, + {"matrix": [5, 4], "x": 5.5, "y": 2.5}, + {"matrix": [5, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 2], "x": 7.5, "y": 2.5}, + {"matrix": [5, 1], "x": 8.5, "y": 2.5}, + {"matrix": [5, 0], "x": 9.5, "y": 2.5}, + {"matrix": [4, 7], "x": 10.5, "y": 2.5}, + {"matrix": [4, 6], "x": 11.5, "y": 2.5}, + {"matrix": [4, 5], "x": 12.5, "y": 2.5}, + {"matrix": [9, 7], "x": 14.5, "y": 2.5}, + + {"matrix": [4, 3], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 3.5}, + {"matrix": [4, 1], "x": 2.75, "y": 3.5}, + {"matrix": [4, 0], "x": 3.75, "y": 3.5}, + {"matrix": [3, 7], "x": 4.75, "y": 3.5}, + {"matrix": [3, 6], "x": 5.75, "y": 3.5}, + {"matrix": [3, 5], "x": 6.75, "y": 3.5}, + {"matrix": [3, 4], "x": 7.75, "y": 3.5}, + {"matrix": [3, 3], "x": 8.75, "y": 3.5}, + {"matrix": [3, 2], "x": 9.75, "y": 3.5}, + {"matrix": [3, 1], "x": 10.75, "y": 3.5}, + {"matrix": [3, 0], "x": 11.75, "y": 3.5}, + {"matrix": [4, 4], "x": 12.75, "y": 3.5, "w": 1.75}, + {"matrix": [8, 7], "x": 14.5, "y": 3.5}, + + {"matrix": [2, 6], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [2, 4], "x": 2.25, "y": 4.5}, + {"matrix": [2, 3], "x": 3.25, "y": 4.5}, + {"matrix": [2, 2], "x": 4.25, "y": 4.5}, + {"matrix": [2, 1], "x": 5.25, "y": 4.5}, + {"matrix": [2, 0], "x": 6.25, "y": 4.5}, + {"matrix": [1, 7], "x": 7.25, "y": 4.5}, + {"matrix": [1, 6], "x": 8.25, "y": 4.5}, + {"matrix": [1, 5], "x": 9.25, "y": 4.5}, + {"matrix": [1, 4], "x": 10.25, "y": 4.5}, + {"matrix": [1, 3], "x": 11.25, "y": 4.5}, + {"matrix": [1, 2], "x": 12.25, "y": 4.5, "w": 1.25}, + {"matrix": [10, 0], "x": 13.5, "y": 4.5}, + {"matrix": [9, 1], "x": 14.5, "y": 4.5}, + + {"matrix": [1, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [0, 6], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5.5}, + {"matrix": [0, 7], "x": 3.5, "y": 5.5, "w": 7}, + {"matrix": [8, 6], "x": 10.5, "y": 5.5}, + {"matrix": [8, 5], "x": 11.5, "y": 5.5}, + {"matrix": [9, 5], "x": 12.5, "y": 5.5}, + {"matrix": [9, 0], "x": 13.5, "y": 5.5}, + {"matrix": [9, 3], "x": 14.5, "y": 5.5} ] } } diff --git a/keyboards/handwired/retro_refit/readme.md b/keyboards/handwired/retro_refit/readme.md index 8dfca7b10b33..6ecaa6e65ebb 100644 --- a/keyboards/handwired/retro_refit/readme.md +++ b/keyboards/handwired/retro_refit/readme.md @@ -4,34 +4,6 @@ The retro refit keyboard used a Teensy to replace the original controller on a 3 [Image Gallery](https://imgur.com/a/08Fyj) -This keyboard uses a LAYOUT macro that is a great example of using a non-standard row-column matrix. The keyboard in question had 11 rows and 8 columns, but the rows were not all horizontal, and the columns were not all vertical. For example, row 2 contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and"Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", "Left Alt", "Up Arrow", and "Down Arrow". - -The macro makes programming the keys easier and in a more straight-forward manner because it realigns the keys into a 6x15 sensible keyboard layout instead of the obtuse 11x8 matrix. Each Kxy corresponds to a key in row x column y. - -``` -#define LAYOUT( \ - K77, K05, K04, K03, K02, K01, K00, KA7, KA6, KA5, KA4, KA3, KA2, K11, K94, \ - K27, K76, K75, K74, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, KA1, \ - K61, K60, K57, K56, K55, K54, K53, K52, K51, K50, K47, K46, K45, K97, \ - K43, K42, K41, K40, K37, K36, K35, K34, K33, K32, K31, K30, K44, K87, \ - K26, K24, K23, K22, K21, K20, K17, K16, K15, K14, K13, K12, KA0, K91, \ - K10, K06, K25, K07, K86, K85, K95, K90, K93 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K85, K86, K87 }, \ - { K90, K91, KC_NO, K93, K94, K95, KC_NO, K97 }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \ -} -``` - - Keyboard Maintainer: [The QMK Community](https://github.com/qmk) Hardware Supported: Leading Edge D3 386 keyboard, Teensy diff --git a/keyboards/handwired/retro_refit/retro_refit.c b/keyboards/handwired/retro_refit/retro_refit.c index 2a5476e40cc9..b7e1ec03fa24 100644 --- a/keyboards/handwired/retro_refit/retro_refit.c +++ b/keyboards/handwired/retro_refit/retro_refit.c @@ -1,4 +1,4 @@ -#include "retro_refit.h" +#include "quantum.h" #include "led.h" void matrix_init_kb(void) { diff --git a/keyboards/handwired/retro_refit/retro_refit.h b/keyboards/handwired/retro_refit/retro_refit.h deleted file mode 100644 index ad1c567a8436..000000000000 --- a/keyboards/handwired/retro_refit/retro_refit.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "quantum.h" - -// This macro is an example of using a non-standard row-column matrix. The -// keyboard in question had 11 rows and 8 columns, but the rows were not all -// horizontal, and the columns were not all vertical. For example, row 2 -// contained "Print Screen", "N", "M", ",", ".", "/", "Right Shift", and -// "Left Alt". Column 0 contained "F6", "7", "O", "'", "Q", "D", "B", -// "Left Alt", "Up Arrow", and "Down Arrow". -// -// The macro makes programming the keys easier and in a more straight-forward -// manner because it realigns the keys into a 6x15 sensible keyboard layout -// instead of the obtuse 11x8 matrix. - -#define LAYOUT( \ - K77, K05, K04, K03, K02, K01, K00, KA7, KA6, KA5, KA4, KA3, KA2, K11, K94, \ - K27, K76, K75, K74, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, KA1, \ - K61, K60, K57, K56, K55, K54, K53, K52, K51, K50, K47, K46, K45, K97, \ - K43, K42, K41, K40, K37, K36, K35, K34, K33, K32, K31, K30, K44, K87, \ - K26, K24, K23, K22, K21, K20, K17, K16, K15, K14, K13, K12, KA0, K91, \ - K10, K06, K25, K07, K86, K85, K95, K90, K93 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, 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 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K85, K86, K87 }, \ - { K90, K91, KC_NO, K93, K94, K95, KC_NO, K97 }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \ -} diff --git a/keyboards/handwired/selene/info.json b/keyboards/handwired/selene/info.json index 8c617b015b2e..7f0f34555e6c 100644 --- a/keyboards/handwired/selene/info.json +++ b/keyboards/handwired/selene/info.json @@ -20,117 +20,137 @@ "bootloader": "stm32-dfu", "board": "QMK_PROTON_C", "layouts": { - "LAYOUT": { - "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":"Print", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"Out", "x":18.5, "y":0}, - {"label":"+", "x":19.5, "y":0}, - {"label":"-", "x":20.5, "y":0}, - {"label":"~", "x":21.5, "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":"", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Pg Up", "x":17.25, "y":1.5}, - {"label":"Num", "x":18.5, "y":1.5}, - {"label":"\u00f7", "x":19.5, "y":1.5}, - {"label":"\u00d7", "x":20.5, "y":1.5}, - {"label":"-", "x":21.5, "y":1.5}, - {"label":"", "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":"Pg Dn", "x":17.25, "y":2.5}, - {"label":"7", "x":18.5, "y":2.5}, - {"label":"8", "x":19.5, "y":2.5}, - {"label":"9", "x":20.5, "y":2.5}, - {"label":"+", "x":21.5, "y":2.5, "h":2}, - {"label":"\u21e9", "x":0, "y":3.5, "w":1.25}, - {"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":"", "x":12.75, "y":3.5, "w":2.25}, - {"label":"4", "x":18.5, "y":3.5}, - {"label":"5", "x":19.5, "y":3.5}, - {"label":"6", "x":20.5, "y":3.5}, - {"label":"\u21e7", "x":0, "y":4.5, "w":2.25}, - {"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":"\u21e7", "x":12.25, "y":4.5, "w":2.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, - {"label":"1", "x":18.5, "y":4.5}, - {"label":"2", "x":19.5, "y":4.5}, - {"label":"3", "x":20.5, "y":4.5}, - {"label":"", "x":21.5, "y":4.5, "h":2}, - {"label":"Control", "x":0, "y":5.5, "w":1.25}, - {"label":"Super", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Super", "x":11.25, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, - {"label":"Control", "x":13.75, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5}, - {"label":"0", "x":18.5, "y":5.5}, - {"label":"00", "x":19.5, "y":5.5}, - {"label":".", "x":20.5, "y":5.5}] - } + "LAYOUT": { + "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": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + {"matrix": [0, 19], "x": 20.5, "y": 0}, + {"matrix": [0, 20], "x": 21.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + {"matrix": [1, 19], "x": 20.5, "y": 1.5}, + {"matrix": [1, 20], "x": 21.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + {"matrix": [2, 19], "x": 20.5, "y": 2.5}, + {"matrix": [2, 20], "x": 21.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.25}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + {"matrix": [3, 19], "x": 20.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + {"matrix": [4, 19], "x": 20.5, "y": 4.5}, + {"matrix": [4, 20], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5}, + + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5}, + {"matrix": [5, 19], "x": 20.5, "y": 5.5} + ] + } } } diff --git a/keyboards/handwired/selene/selene.h b/keyboards/handwired/selene/selene.h index 1cffc76c1bad..bcd4215e3660 100644 --- a/keyboards/handwired/selene/selene.h +++ b/keyboards/handwired/selene/selene.h @@ -21,19 +21,3 @@ #define NUM_LOCK_PIN A0 #define CAPS_LOCK_PIN A2 #define SCROLL_LOCK_PIN A1 - -#define LAYOUT( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K317, K318, K319, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K412, K415, K417, K418, K419, K420, \ - K500, K501, K502, K505, K509, K510, K511, K513, K514, K515, K516, K517, K518, K519 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, K020 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, KC_NO, KC_NO, K317, K318, K319, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, K412, KC_NO, KC_NO, K415, KC_NO, K417, K418, K419, K420 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, KC_NO, K513, K514, K515, K516, K517, K518, K519, KC_NO } \ -} diff --git a/keyboards/handwired/slash/info.json b/keyboards/handwired/slash/info.json index ffd76babc15b..070cbb2c7502 100644 --- a/keyboards/handwired/slash/info.json +++ b/keyboards/handwired/slash/info.json @@ -18,67 +18,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":1.75, "y":0}, - {"label":"1", "x":2.75, "y":0}, - {"label":"2", "x":3.75, "y":0}, - {"label":"3", "x":4.75, "y":0}, - {"label":"4", "x":5.75, "y":0}, - {"label":"5", "x":6.75, "y":0}, - {"label":"6", "x":7.75, "y":0}, - {"label":"7", "x":8.75, "y":0}, - {"label":"8", "x":9.75, "y":0}, - {"label":"9", "x":10.75, "y":0}, - {"label":"0", "x":11.75, "y":0}, - {"label":"-", "x":12.75, "y":0}, - {"label":"=", "x":13.75, "y":0}, - {"label":"Backspace", "x":14.75, "y":0, "w":2}, - {"label":"Tab", "x":1.25, "y":1, "w":1.5}, - {"label":"Q", "x":2.75, "y":1}, - {"label":"W", "x":3.75, "y":1}, - {"label":"E", "x":4.75, "y":1}, - {"label":"R", "x":5.75, "y":1}, - {"label":"T", "x":6.75, "y":1}, - {"label":"Y", "x":7.75, "y":1}, - {"label":"U", "x":8.75, "y":1}, - {"label":"I", "x":9.75, "y":1}, - {"label":"O", "x":10.75, "y":1}, - {"label":"P", "x":11.75, "y":1}, - {"label":"[", "x":12.75, "y":1}, - {"label":"]", "x":13.75, "y":1}, - {"label":"\\", "x":14.75, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":1, "y":2, "w":1.75}, - {"label":"A", "x":2.75, "y":2}, - {"label":"S", "x":3.75, "y":2}, - {"label":"D", "x":4.75, "y":2}, - {"label":"F", "x":5.75, "y":2}, - {"label":"G", "x":6.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";", "x":11.75, "y":2}, - {"label":"'", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0.5, "y":3, "w":2.25}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":3.75, "y":3}, - {"label":"C", "x":4.75, "y":3}, - {"label":"V", "x":5.75, "y":3}, - {"label":"B", "x":6.75, "y":3}, - {"label":"N", "x":7.75, "y":3}, - {"label":"M", "x":8.75, "y":3}, - {"label":",", "x":9.75, "y":3}, - {"label":".", "x":10.75, "y":3}, - {"label":"/", "x":11.75, "y":3}, - {"label":"Shift", "x":12.75, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"GUI", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"GUI", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"matrix": [0, 0], "x": 1.75, "y": 0}, + {"matrix": [1, 0], "x": 2.75, "y": 0}, + {"matrix": [0, 1], "x": 3.75, "y": 0}, + {"matrix": [1, 1], "x": 4.75, "y": 0}, + {"matrix": [0, 2], "x": 5.75, "y": 0}, + {"matrix": [1, 2], "x": 6.75, "y": 0}, + {"matrix": [0, 3], "x": 7.75, "y": 0}, + {"matrix": [1, 3], "x": 8.75, "y": 0}, + {"matrix": [0, 4], "x": 9.75, "y": 0}, + {"matrix": [1, 4], "x": 10.75, "y": 0}, + {"matrix": [0, 5], "x": 11.75, "y": 0}, + {"matrix": [1, 5], "x": 12.75, "y": 0}, + {"matrix": [0, 6], "x": 13.75, "y": 0}, + {"matrix": [1, 6], "x": 14.75, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 2.75, "y": 1}, + {"matrix": [2, 1], "x": 3.75, "y": 1}, + {"matrix": [3, 1], "x": 4.75, "y": 1}, + {"matrix": [2, 2], "x": 5.75, "y": 1}, + {"matrix": [3, 2], "x": 6.75, "y": 1}, + {"matrix": [2, 3], "x": 7.75, "y": 1}, + {"matrix": [3, 3], "x": 8.75, "y": 1}, + {"matrix": [2, 4], "x": 9.75, "y": 1}, + {"matrix": [3, 4], "x": 10.75, "y": 1}, + {"matrix": [2, 5], "x": 11.75, "y": 1}, + {"matrix": [3, 5], "x": 12.75, "y": 1}, + {"matrix": [2, 6], "x": 13.75, "y": 1}, + {"matrix": [3, 6], "x": 14.75, "y": 1, "w": 1.5}, + + {"matrix": [5, 0], "x": 1, "y": 2, "w": 1.75}, + {"matrix": [4, 0], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 1], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 2], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 5], "x": 12.75, "y": 2}, + {"matrix": [5, 6], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [7, 0], "x": 0.5, "y": 3, "w": 2.25}, + {"matrix": [6, 0], "x": 2.75, "y": 3}, + {"matrix": [7, 1], "x": 3.75, "y": 3}, + {"matrix": [6, 1], "x": 4.75, "y": 3}, + {"matrix": [7, 2], "x": 5.75, "y": 3}, + {"matrix": [6, 2], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [6, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 4], "x": 9.75, "y": 3}, + {"matrix": [6, 4], "x": 10.75, "y": 3}, + {"matrix": [7, 5], "x": 11.75, "y": 3}, + {"matrix": [6, 5], "x": 12.75, "y": 3, "w": 2.75}, + + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 7], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [5, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [3, 7], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [2, 7], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [7, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [6, 6], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/slash/slash.h b/keyboards/handwired/slash/slash.h deleted file mode 100644 index 6c1342d6b263..000000000000 --- a/keyboards/handwired/slash/slash.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2019 asdftemp - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, \ - k40, k41, k42, k43, k44, k45, k46, k47 \ -) \ -{ \ - { k00, k02, k04, k06, k08, k0A, k0C, KC_NO }, \ - { k01, k03, k05, k07, k09, k0B, k0D, KC_NO }, \ - { k10, k12, k14, k16, k18, k1A, k1C, k45 }, \ - { k11, k13, k15, k17, k19, k1B, k1D, k44 }, \ - { k21, k23, k25, k27, k29, k2B, KC_NO, k42 }, \ - { k20, k22, k24, k26, k28, k2A, k2C, k43 }, \ - { k31, k33, k35, k37, k39, k3B, k47, k40 }, \ - { k30, k32, k34, k36, k38, k3A, k46, k41 } \ -} diff --git a/keyboards/handwired/space_oddity/info.json b/keyboards/handwired/space_oddity/info.json index 48fe44be74e6..b0e72ccabdc3 100644 --- a/keyboards/handwired/space_oddity/info.json +++ b/keyboards/handwired/space_oddity/info.json @@ -18,71 +18,76 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Macro 0", "x":0, "y":0, "w":2}, - {"label":"Macro 1", "x":2, "y":0, "w":2}, - {"label":"Macro 2", "x":4, "y":0, "w":2}, - {"label":"Macro 3", "x":6, "y":0, "w":2}, - {"label":"Macro 4", "x":8, "y":0, "w":2}, - {"label":"Dynamic Macro 1", "x":10, "y":0, "w":2}, - {"label":"Dynamic Macro 2", "x":12, "y":0, "w":2}, - {"label":"~", "x":0, "y":1, "w":2}, - {"label":"!", "x":2, "y":1}, - {"label":"@", "x":3, "y":1}, - {"label":"#", "x":4, "y":1}, - {"label":"$", "x":5, "y":1}, - {"label":"%", "x":6, "y":1}, - {"label":"^", "x":7, "y":1}, - {"label":"&", "x":8, "y":1}, - {"label":"*", "x":9, "y":1}, - {"label":"(", "x":10, "y":1}, - {"label":")", "x":11, "y":1}, - {"label":"Backspace", "x":12, "y":1, "w":2}, - {"label":"Tab", "x":0, "y":2, "w":2}, - {"label":"Q", "x":2, "y":2}, - {"label":"W", "x":3, "y":2}, - {"label":"E", "x":4, "y":2}, - {"label":"R", "x":5, "y":2}, - {"label":"T", "x":6, "y":2}, - {"label":"Y", "x":7, "y":2}, - {"label":"U", "x":8, "y":2}, - {"label":"I", "x":9, "y":2}, - {"label":"O", "x":10, "y":2}, - {"label":"P", "x":11, "y":2}, - {"label":"_", "x":12, "y":2, "w":2}, - {"label":"Esc (Ctrl)", "x":0, "y":3, "w":2}, - {"label":"A", "x":2, "y":3}, - {"label":"S", "x":3, "y":3}, - {"label":"D", "x":4, "y":3}, - {"label":"F", "x":5, "y":3}, - {"label":"G", "x":6, "y":3}, - {"label":"H", "x":7, "y":3}, - {"label":"J", "x":8, "y":3}, - {"label":"K", "x":9, "y":3}, - {"label":"L", "x":10, "y":3}, - {"label":":", "x":11, "y":3}, - {"label":"\"", "x":12, "y":3, "w":2}, - {"label":"Caps Lock (Shift)", "x":0.25, "y":4, "w":1.75}, - {"label":"Z", "x":2, "y":4}, - {"label":"X", "x":3, "y":4}, - {"label":"C", "x":4, "y":4}, - {"label":"V", "x":5, "y":4}, - {"label":"B", "x":6, "y":4}, - {"label":"N", "x":7, "y":4}, - {"label":"M", "x":8, "y":4}, - {"label":"<", "x":9, "y":4}, - {"label":">", "x":10, "y":4}, - {"label":"?", "x":11, "y":4}, - {"label":"Enter (Shift)", "x":12, "y":4, "w":1.75}, - {"label":"MO(2)", "x":1, "y":5}, - {"label":"MO(1)", "x":2, "y":5}, - {"label":"GUI", "x":3, "y":5}, - {"label":"Alt", "x":4, "y":5}, - {"label":"Ctrl", "x":5, "y":5, "w":2}, - {"label":"Space", "x":7, "y":5, "w":2}, - {"label":"Left (Alt)", "x":9, "y":5}, - {"label":"Right (Hyper)", "x":10, "y":5}, - {"label":"Up (MO(1))", "x":11, "y":5}, - {"label":"Down (MO(2))", "x":12, "y":5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 2}, + {"matrix": [0, 2], "x": 2, "y": 0, "w": 2}, + {"matrix": [0, 4], "x": 4, "y": 0, "w": 2}, + {"matrix": [0, 6], "x": 6, "y": 0, "w": 2}, + {"matrix": [0, 8], "x": 8, "y": 0, "w": 2}, + {"matrix": [0, 10], "x": 10, "y": 0, "w": 2}, + {"matrix": [0, 11], "x": 12, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 2}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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": [2, 11], "x": 12, "y": 2, "w": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3, "w": 2}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4}, + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [4, 7], "x": 8, "y": 4}, + {"matrix": [4, 8], "x": 9, "y": 4}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4, "w": 1.75}, + + {"matrix": [5, 0], "x": 1, "y": 5}, + {"matrix": [5, 1], "x": 2, "y": 5}, + {"matrix": [5, 2], "x": 3, "y": 5}, + {"matrix": [5, 3], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5, "w": 2}, + {"matrix": [5, 7], "x": 7, "y": 5, "w": 2}, + {"matrix": [5, 8], "x": 9, "y": 5}, + {"matrix": [5, 9], "x": 10, "y": 5}, + {"matrix": [5, 10], "x": 11, "y": 5}, + {"matrix": [5, 11], "x": 12, "y": 5} ] } } diff --git a/keyboards/handwired/space_oddity/space_oddity.h b/keyboards/handwired/space_oddity/space_oddity.h deleted file mode 100644 index d35bfea58777..000000000000 --- a/keyboards/handwired/space_oddity/space_oddity.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K002, K004, K006, K008, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, \ - K500, K501, K502, K503, K505, K507, K508, K509, K510, K511 \ -) { \ - { K000, KC_NO, K002, KC_NO, K004, KC_NO, K006, KC_NO, K008, KC_NO, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411 }, \ - { K500, K501, K502, K503, KC_NO, K505, KC_NO, K507, K508, K509, K510, K511 } \ -} diff --git a/keyboards/handwired/split65/info.json b/keyboards/handwired/split65/info.json index c766f894e180..14b83bd47aa5 100644 --- a/keyboards/handwired/split65/info.json +++ b/keyboards/handwired/split65/info.json @@ -7,85 +7,5 @@ "vid": "0x4A57", "pid": "0x0000", "device_version": "0.0.1" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"`\u00ac", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2\"", "x":2, "y":0}, - {"label":"3\u00a3", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":8, "y":0}, - {"label":"8*", "x":9, "y":0}, - {"label":"9(", "x":10, "y":0}, - {"label":"0)", "x":11, "y":0}, - {"label":"-_", "x":12, "y":0}, - {"label":"=+", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2}, - {"label":"Insert", "x":16, "y":0}, - - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"[{", "x":12.5, "y":1}, - {"label":"]}", "x":13.5, "y":1}, - {"label":"Delete", "x":16, "y":1}, - - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";:", "x":11.75, "y":2}, - {"label":"'@", "x":12.75, "y":2}, - {"label":"#~", "x":13.75, "y":2}, - {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2}, - {"label":"Page Up", "x":16, "y":2}, - - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",<", "x":10.25, "y":3}, - {"label":".>", "x":11.25, "y":3}, - {"label":"/?", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":1.75}, - {"label":"Up", "x":15, "y":3}, - {"label":"Page Down", "x":16, "y":3}, - - {"label":"Ctrl", "x":0.25, "y":4, "w":1.25}, - {"label":"Win", "x":1.5, "y":4, "w":1.25}, - {"label":"Alt", "x":2.75, "y":4, "w":1.25}, - {"label":"Space", "x":4, "y":4, "w":2.75}, - {"label":"Enter", "x":8, "y":4, "w":2.25}, - {"label":"AltGr", "x":10.25, "y":4}, - {"label":"Lower", "x":11.25, "y":4}, - {"label":"Raise", "x":12.25, "y":4}, - {"label":"Left", "x":14, "y":4}, - {"label":"Down", "x":15, "y":4}, - {"label":"Right", "x":16, "y":4} - ] - } } } diff --git a/keyboards/handwired/split65/promicro/info.json b/keyboards/handwired/split65/promicro/info.json index 56d2dcb9ab74..e1540d99a2c9 100644 --- a/keyboards/handwired/split65/promicro/info.json +++ b/keyboards/handwired/split65/promicro/info.json @@ -8,5 +8,91 @@ "soft_serial_pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0, "w": 2}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [9, 7], "x": 7.75, "y": 2}, + {"matrix": [7, 7], "x": 8.75, "y": 2}, + {"matrix": [7, 6], "x": 9.75, "y": 2}, + {"matrix": [7, 5], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2}, + {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + + {"matrix": [8, 7], "x": 8.25, "y": 3}, + {"matrix": [8, 6], "x": 9.25, "y": 3}, + {"matrix": [8, 5], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 3], "x": 12.25, "y": 3}, + {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + + {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25}, + {"matrix": [9, 5], "x": 10.25, "y": 4}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 3], "x": 12.25, "y": 4}, + + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/split65/promicro/promicro.h b/keyboards/handwired/split65/promicro/promicro.h deleted file mode 100644 index 8c4e656cf276..000000000000 --- a/keyboards/handwired/split65/promicro/promicro.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 - * - * 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( \ - L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \ - ) \ - { \ - {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \ - {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \ - {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \ - {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \ - {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \ - {R00, R01, R02, R03, R04, R05, R06, R07}, \ - {R10, R11, R12, R13, R14, R15, R16, R17}, \ - {R20, R21, R22, R23, R24, R25, R26, R27}, \ - {R30, R31, R32, R33, R34, R35, R36, R37}, \ - {R40, R41, R42, R43, R44, R45, R46, R47} \ - } diff --git a/keyboards/handwired/split65/stm32/info.json b/keyboards/handwired/split65/stm32/info.json index e2c0a634f320..b9956ed7abcb 100644 --- a/keyboards/handwired/split65/stm32/info.json +++ b/keyboards/handwired/split65/stm32/info.json @@ -9,5 +9,91 @@ }, "processor": "STM32F303", "bootloader": "stm32-dfu", - "board": "QMK_PROTON_C" + "board": "QMK_PROTON_C", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [5, 7], "x": 8, "y": 0}, + {"matrix": [5, 6], "x": 9, "y": 0}, + {"matrix": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0, "w": 2}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 7], "x": 7.5, "y": 1}, + {"matrix": [6, 6], "x": 8.5, "y": 1}, + {"matrix": [6, 5], "x": 9.5, "y": 1}, + {"matrix": [6, 4], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 2], "x": 12.5, "y": 1}, + {"matrix": [6, 1], "x": 13.5, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [9, 7], "x": 7.75, "y": 2}, + {"matrix": [7, 7], "x": 8.75, "y": 2}, + {"matrix": [7, 6], "x": 9.75, "y": 2}, + {"matrix": [7, 5], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2}, + {"matrix": [7, 1], "x": 14.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + + {"matrix": [8, 7], "x": 8.25, "y": 3}, + {"matrix": [8, 6], "x": 9.25, "y": 3}, + {"matrix": [8, 5], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 3], "x": 12.25, "y": 3}, + {"matrix": [8, 2], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.75}, + + {"matrix": [9, 6], "x": 8, "y": 4, "w": 2.25}, + {"matrix": [9, 5], "x": 10.25, "y": 4}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 3], "x": 12.25, "y": 4}, + + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} + ] + } + } } diff --git a/keyboards/handwired/split65/stm32/stm32.h b/keyboards/handwired/split65/stm32/stm32.h deleted file mode 100644 index be3dd1639b85..000000000000 --- a/keyboards/handwired/split65/stm32/stm32.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020-2021 PercyJW-2 - * - * 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( \ - L00, L01, L02, L03, L04, L05, L06, R07, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R47, R27, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, R46, R45, R44, R43, R42, R41, R40 \ - ) \ - { \ - {L00, L01, L02, L03, L04, L05, L06, KC_NO}, \ - {L10, L11, L12, L13, L14, L15, KC_NO, KC_NO}, \ - {L20, L21, L22, L23, L24, L25, KC_NO, KC_NO}, \ - {L30, L31, L32, L33, L34, L35, L36, KC_NO}, \ - {L40, L41, L42, KC_NO, L43, KC_NO, KC_NO, KC_NO}, \ - {R00, R01, R02, R03, R04, R05, R06, R07}, \ - {R10, R11, R12, R13, R14, R15, R16, R17}, \ - {R20, R21, R22, R23, R24, R25, R26, R27}, \ - {R30, R31, R32, R33, R34, R35, R36, R37}, \ - {R40, R41, R42, R43, R44, R45, R46, R47} \ - } diff --git a/keyboards/handwired/stef9998/split_5x7/info.json b/keyboards/handwired/stef9998/split_5x7/info.json index 91b6cd39c560..f1471efe8ed3 100644 --- a/keyboards/handwired/stef9998/split_5x7/info.json +++ b/keyboards/handwired/stef9998/split_5x7/info.json @@ -27,86 +27,83 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"F1", "x":6, "y":0}, + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "1", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "2", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "3", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "4", "matrix": [0, 4], "x": 4, "y": 0}, + {"label": "5", "matrix": [0, 5], "x": 5, "y": 0}, + {"label": "F1", "matrix": [0, 6], "x": 6, "y": 0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"[", "x":6, "y":1}, + {"label": "Tab", "matrix": [5, 6], "x": 0, "y": 1}, + {"label": "Q", "matrix": [5, 5], "x": 1, "y": 1}, + {"label": "W", "matrix": [5, 4], "x": 2, "y": 1}, + {"label": "E", "matrix": [5, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [5, 2], "x": 4, "y": 1}, + {"label": "T", "matrix": [5, 1], "x": 5, "y": 1}, + {"label": "[", "matrix": [5, 0], "x": 6, "y": 1}, - {"label":"Caps Lock", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"=", "x":6, "y":2}, + {"label": "Caps Lock", "matrix": [1, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [1, 1], "x": 1, "y": 2}, + {"label": "S", "matrix": [1, 2], "x": 2, "y": 2}, + {"label": "D", "matrix": [1, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [1, 4], "x": 4, "y": 2}, + {"label": "G", "matrix": [1, 5], "x": 5, "y": 2}, + {"label": "=", "matrix": [1, 6], "x": 6, "y": 2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"F3", "x":6, "y":3}, + {"label": "Shift", "matrix": [6, 6], "x": 0, "y": 3}, + {"label": "Z", "matrix": [6, 5], "x": 1, "y": 3}, + {"label": "X", "matrix": [6, 4], "x": 2, "y": 3}, + {"label": "C", "matrix": [6, 3], "x": 3, "y": 3}, + {"label": "V", "matrix": [6, 2], "x": 4, "y": 3}, + {"label": "B", "matrix": [6, 1], "x": 5, "y": 3}, + {"label": "F3", "matrix": [6, 0], "x": 6, "y": 3}, - {"label":"Ctrl", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Gui", "x":2, "y":4, "w":1.25}, - {"label":"Alt", "x":3.25, "y":4, "w":1.25}, - {"label":"Space", "x":4.5, "y":4, "w":1.5}, - {"label":"F5", "x":6, "y":4}, + {"label": "Ctrl", "matrix": [2, 0], "x": 0, "y": 4}, + {"label": "Ctrl", "matrix": [2, 1], "x": 1, "y": 4}, + {"label": "Gui", "matrix": [2, 2], "x": 2, "y": 4, "w": 1.25}, + {"label": "Alt", "matrix": [2, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"label": "Space", "matrix": [2, 4], "x": 4.5, "y": 4, "w": 1.5}, + {"label": "F5", "matrix": [2, 5], "x": 6, "y": 4}, + {"label": "F2", "matrix": [2, 6], "x": 14, "y": 0}, + {"label": "6", "matrix": [7, 6], "x": 9, "y": 0}, + {"label": "7", "matrix": [7, 5], "x": 10, "y": 0}, + {"label": "8", "matrix": [7, 4], "x": 11, "y": 0}, + {"label": "9", "matrix": [7, 3], "x": 12, "y": 0}, + {"label": "0", "matrix": [7, 2], "x": 13, "y": 0}, + {"label": "Backspace", "matrix": [7, 1], "x": 14, "y": 0}, - {"label":"F2", "x":14, "y":0}, - {"label":"6", "x":9, "y":0}, - {"label":"7", "x":10, "y":0}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, + {"label": "]", "matrix": [7, 0], "x": 8, "y": 1}, + {"label": "Y", "matrix": [3, 0], "x": 9, "y": 1}, + {"label": "U", "matrix": [3, 1], "x": 10, "y": 1}, + {"label": "I", "matrix": [3, 2], "x": 11, "y": 1}, + {"label": "O", "matrix": [3, 3], "x": 12, "y": 1}, + {"label": "P", "matrix": [3, 4], "x": 13, "y": 1}, + {"label": "\\", "matrix": [3, 5], "x": 14, "y": 1}, - {"label":"]", "x":8, "y":1}, - {"label":"Y", "x":9, "y":1}, - {"label":"U", "x":10, "y":1}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1}, - {"label":"P", "x":13, "y":1}, - {"label":"\\", "x":14, "y":1}, - - {"label":"-", "x":8, "y":2}, - {"label":"H", "x":9, "y":2}, - {"label":"J", "x":10, "y":2}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2}, - {"label":";", "x":13, "y":2}, - {"label":"Enter", "x":14, "y":2}, - - {"label":"F4", "x":8, "y":3}, - {"label":"N", "x":9, "y":3}, - {"label":"M", "x":10, "y":3}, - {"label":",", "x":11, "y":3}, - {"label":".", "x":12, "y":3}, - {"label":"/", "x":13, "y":3}, - {"label":"Shift", "x":14, "y":3}, - - {"label":"F5", "x":8, "y":4}, - {"label":"Space", "x":9, "y":4, "w":1.5}, - {"label":"AltGr", "x":10.5, "y":4, "w":1.25}, - {"label":"Fn", "x":11.75, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13, "y":4}, - {"label":"Ctrl", "x":13, "y":4} + {"label": "-", "matrix": [3, 6], "x": 8, "y": 2}, + {"label": "H", "matrix": [8, 6], "x": 9, "y": 2}, + {"label": "J", "matrix": [8, 5], "x": 10, "y": 2}, + {"label": "K", "matrix": [8, 4], "x": 11, "y": 2}, + {"label": "L", "matrix": [8, 3], "x": 12, "y": 2}, + {"label": ";", "matrix": [8, 2], "x": 13, "y": 2}, + {"label": "Enter", "matrix": [8, 1], "x": 14, "y": 2}, + {"label": "F4", "matrix": [8, 0], "x": 8, "y": 3}, + {"label": "N", "matrix": [4, 0], "x": 9, "y": 3}, + {"label": "M", "matrix": [4, 1], "x": 10, "y": 3}, + {"label": ",", "matrix": [4, 2], "x": 11, "y": 3}, + {"label": ".", "matrix": [4, 3], "x": 12, "y": 3}, + {"label": "/", "matrix": [4, 5], "x": 13, "y": 3}, + {"label": "Shift", "matrix": [4, 6], "x": 14, "y": 3}, + {"label": "F5", "matrix": [9, 6], "x": 8, "y": 4}, + {"label": "Space", "matrix": [9, 5], "x": 9, "y": 4, "w": 1.5}, + {"label": "AltGr", "matrix": [9, 3], "x": 10.5, "y": 4, "w": 1.25}, + {"label": "Fn", "matrix": [9, 2], "x": 11.75, "y": 4, "w": 1.25}, + {"label": "Ctrl", "matrix": [9, 1], "x": 13, "y": 4}, + {"label": "Ctrl", "matrix": [9, 0], "x": 13, "y": 4} ] } } diff --git a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h b/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h deleted file mode 100644 index 828c515484ef..000000000000 --- a/keyboards/handwired/stef9998/split_5x7/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright 2022 stef9998 - -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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, \ - k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \ - k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, \ - k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, \ - k56, k57, k58, k59, k61, k62, k63, k64, k66, k67, k68, k69 \ -) \ -{ \ - { k00, k01, k02, k03, k04 , k05, k06 }, \ - { k14, k15, k16, k17, k18 , k19, k20 }, \ - { k28, k29, k30, k31, k32 , k33, k34 }, \ - { k42, k43, k44, k45, k46 , k47, k48 }, \ - { k56, k57, k58, k59, KC_NO, k61, k62 }, \ - { k13, k12, k11, k10, k09 , k08, k07 }, \ - { k27, k26, k25, k24, k23 , k22, k21 }, \ - { k41, k40, k39, k38, k37 , k36, k35 }, \ - { k55, k54, k53, k52, k51 , k50, k49 }, \ - { k69, k68, k67, k66, KC_NO, k64, k63 } \ -} diff --git a/keyboards/handwired/swiftrax/beegboy/beegboy.h b/keyboards/handwired/swiftrax/beegboy/beegboy.h deleted file mode 100644 index 0b95ddc2cecb..000000000000 --- a/keyboards/handwired/swiftrax/beegboy/beegboy.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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 XXX KC_NO - -#define LAYOUT( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k67, k77, k68, \ - k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k86, k96, k87, k97, k88, k98, \ - ka0, kb0, ka1, ka2, ka4, ka5, ka6, kb6, ka7, kb7, ka8 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \ - { k90, k91, k92, k93, k94, XXX, k96, k97, k98 }, \ - { ka0, ka1, ka2, XXX, ka4, ka5, ka6, ka7, ka8 }, \ - { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7, XXX } \ -} diff --git a/keyboards/handwired/swiftrax/beegboy/info.json b/keyboards/handwired/swiftrax/beegboy/info.json index 29fc7ddddabe..a8aecb81b464 100644 --- a/keyboards/handwired/swiftrax/beegboy/info.json +++ b/keyboards/handwired/swiftrax/beegboy/info.json @@ -18,109 +18,121 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"1,0", "x":1.25, "y":0}, - {"label":"0,1", "x":2.25, "y":0}, - {"label":"1,1", "x":3.25, "y":0}, - {"label":"0,2", "x":4.25, "y":0}, - {"label":"1,2", "x":5.5, "y":0}, - {"label":"0,3", "x":6.5, "y":0}, - {"label":"1,3", "x":7.5, "y":0}, - {"label":"0,4", "x":8.5, "y":0}, - {"label":"1,4", "x":9.75, "y":0}, - {"label":"0,5", "x":10.75, "y":0}, - {"label":"1,5", "x":11.75, "y":0}, - {"label":"0,6", "x":12.75, "y":0}, - {"label":"1,6", "x":14, "y":0}, - {"label":"0,7", "x":15.5, "y":0}, - {"label":"1,7", "x":16.5, "y":0}, - {"label":"0,8", "x":17.5, "y":0}, - {"label":"1,8", "x":18.5, "y":0}, - - {"label":"2,0", "x":0, "y":1.25}, - {"label":"3,0", "x":1, "y":1.25}, - {"label":"2,1", "x":2, "y":1.25}, - {"label":"3,1", "x":3, "y":1.25}, - {"label":"2,2", "x":4, "y":1.25}, - {"label":"3,2", "x":5, "y":1.25}, - {"label":"2,3", "x":6, "y":1.25}, - {"label":"3,3", "x":7, "y":1.25}, - {"label":"2,4", "x":8, "y":1.25}, - {"label":"3,4", "x":9, "y":1.25}, - {"label":"2,5", "x":10, "y":1.25}, - {"label":"3,5", "x":11, "y":1.25}, - {"label":"2,6", "x":12, "y":1.25}, - {"label":"3,6", "x":13, "y":1.25, "w":2}, - {"label":"2,7", "x":15.5, "y":1.25}, - {"label":"3,7", "x":16.5, "y":1.25}, - {"label":"2,8", "x":17.5, "y":1.25}, - {"label":"3,8", "x":18.5, "y":1.25}, - - {"label":"4,0", "x":0, "y":2.25, "w":1.5}, - {"label":"5,0", "x":1.5, "y":2.25}, - {"label":"4,1", "x":2.5, "y":2.25}, - {"label":"5,1", "x":3.5, "y":2.25}, - {"label":"4,2", "x":4.5, "y":2.25}, - {"label":"5,2", "x":5.5, "y":2.25}, - {"label":"4,3", "x":6.5, "y":2.25}, - {"label":"5,3", "x":7.5, "y":2.25}, - {"label":"4,4", "x":8.5, "y":2.25}, - {"label":"5,4", "x":9.5, "y":2.25}, - {"label":"4,5", "x":10.5, "y":2.25}, - {"label":"5,5", "x":11.5, "y":2.25}, - {"label":"4,6", "x":12.5, "y":2.25}, - {"label":"5,6", "x":13.5, "y":2.25, "w":1.5}, - {"label":"4,7", "x":15.5, "y":2.25}, - {"label":"5,7", "x":16.5, "y":2.25}, - {"label":"4,8", "x":17.5, "y":2.25}, - {"label":"5,8", "x":18.5, "y":2.25, "h":2}, - - {"label":"6,0", "x":0, "y":3.25, "w":1.75}, - {"label":"7,0", "x":1.75, "y":3.25}, - {"label":"6,1", "x":2.75, "y":3.25}, - {"label":"7,1", "x":3.75, "y":3.25}, - {"label":"6,2", "x":4.75, "y":3.25}, - {"label":"7,2", "x":5.75, "y":3.25}, - {"label":"6,3", "x":6.75, "y":3.25}, - {"label":"7,3", "x":7.75, "y":3.25}, - {"label":"6,4", "x":8.75, "y":3.25}, - {"label":"7,4", "x":9.75, "y":3.25}, - {"label":"6,5", "x":10.75, "y":3.25}, - {"label":"7,5", "x":11.75, "y":3.25}, - {"label":"7,6", "x":12.75, "y":3.25, "w":2.25}, - {"label":"6,7", "x":15.5, "y":3.25}, - {"label":"7,7", "x":16.5, "y":3.25}, - {"label":"6,8", "x":17.5, "y":3.25}, - - {"label":"8,0", "x":0, "y":4.25, "w":2.25}, - {"label":"9,0", "x":2.25, "y":4.25}, - {"label":"8,1", "x":3.25, "y":4.25}, - {"label":"9,1", "x":4.25, "y":4.25}, - {"label":"8,2", "x":5.25, "y":4.25}, - {"label":"9,2", "x":6.25, "y":4.25}, - {"label":"8,3", "x":7.25, "y":4.25}, - {"label":"9,3", "x":8.25, "y":4.25}, - {"label":"8,4", "x":9.25, "y":4.25}, - {"label":"9,4", "x":10.25, "y":4.25}, - {"label":"8,5", "x":11.25, "y":4.25}, - {"label":"8,6", "x":12.25, "y":4.25, "w":1.75}, - {"label":"9,6", "x":14.25, "y":4.5}, - {"label":"8,7", "x":15.5, "y":4.25}, - {"label":"9,7", "x":16.5, "y":4.25}, - {"label":"8,8", "x":17.5, "y":4.25}, - {"label":"9,8", "x":18.5, "y":4.25, "h":2}, - - {"label":"10,0", "x":0, "y":5.25, "w":1.25}, - {"label":"11,0", "x":1.25, "y":5.25, "w":1.25}, - {"label":"10,1", "x":2.5, "y":5.25, "w":1.25}, - {"label":"10,2", "x":3.75, "y":5.25, "w":6.25}, - {"label":"10,4", "x":10, "y":5.25, "w":1.5}, - {"label":"10,5", "x":11.5, "y":5.25, "w":1.5}, - {"label":"10,6", "x":13.25, "y":5.5}, - {"label":"11,6", "x":14.25, "y":5.5}, - {"label":"10,7", "x":15.25, "y":5.5}, - {"label":"11,7", "x":16.5, "y":5.25}, - {"label":"10,8", "x":17.5, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 0}, + {"matrix": [0, 1], "x": 2.25, "y": 0}, + {"matrix": [1, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 4.25, "y": 0}, + + {"matrix": [1, 2], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + + {"matrix": [1, 4], "x": 9.75, "y": 0}, + {"matrix": [0, 5], "x": 10.75, "y": 0}, + {"matrix": [1, 5], "x": 11.75, "y": 0}, + {"matrix": [0, 6], "x": 12.75, "y": 0}, + + {"matrix": [1, 6], "x": 14, "y": 0}, + + {"matrix": [0, 7], "x": 15.5, "y": 0}, + {"matrix": [1, 7], "x": 16.5, "y": 0}, + {"matrix": [0, 8], "x": 17.5, "y": 0}, + {"matrix": [1, 8], "x": 18.5, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + {"matrix": [3, 3], "x": 7, "y": 1.25}, + {"matrix": [2, 4], "x": 8, "y": 1.25}, + {"matrix": [3, 4], "x": 9, "y": 1.25}, + {"matrix": [2, 5], "x": 10, "y": 1.25}, + {"matrix": [3, 5], "x": 11, "y": 1.25}, + {"matrix": [2, 6], "x": 12, "y": 1.25}, + {"matrix": [3, 6], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [2, 7], "x": 15.5, "y": 1.25}, + {"matrix": [3, 7], "x": 16.5, "y": 1.25}, + {"matrix": [2, 8], "x": 17.5, "y": 1.25}, + {"matrix": [3, 8], "x": 18.5, "y": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"matrix": [4, 3], "x": 6.5, "y": 2.25}, + {"matrix": [5, 3], "x": 7.5, "y": 2.25}, + {"matrix": [4, 4], "x": 8.5, "y": 2.25}, + {"matrix": [5, 4], "x": 9.5, "y": 2.25}, + {"matrix": [4, 5], "x": 10.5, "y": 2.25}, + {"matrix": [5, 5], "x": 11.5, "y": 2.25}, + {"matrix": [4, 6], "x": 12.5, "y": 2.25}, + {"matrix": [5, 6], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.5, "y": 2.25}, + {"matrix": [5, 7], "x": 16.5, "y": 2.25}, + {"matrix": [4, 8], "x": 17.5, "y": 2.25}, + {"matrix": [5, 8], "x": 18.5, "y": 2.25, "h": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + {"matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"matrix": [6, 4], "x": 8.75, "y": 3.25}, + {"matrix": [7, 4], "x": 9.75, "y": 3.25}, + {"matrix": [6, 5], "x": 10.75, "y": 3.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3.25}, + {"matrix": [7, 6], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [6, 7], "x": 15.5, "y": 3.25}, + {"matrix": [7, 7], "x": 16.5, "y": 3.25}, + {"matrix": [6, 8], "x": 17.5, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.25}, + {"matrix": [8, 1], "x": 3.25, "y": 4.25}, + {"matrix": [9, 1], "x": 4.25, "y": 4.25}, + {"matrix": [8, 2], "x": 5.25, "y": 4.25}, + {"matrix": [9, 2], "x": 6.25, "y": 4.25}, + {"matrix": [8, 3], "x": 7.25, "y": 4.25}, + {"matrix": [9, 3], "x": 8.25, "y": 4.25}, + {"matrix": [8, 4], "x": 9.25, "y": 4.25}, + {"matrix": [9, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [9, 6], "x": 14.25, "y": 4.5}, + + {"matrix": [8, 7], "x": 15.5, "y": 4.25}, + {"matrix": [9, 7], "x": 16.5, "y": 4.25}, + {"matrix": [8, 8], "x": 17.5, "y": 4.25}, + {"matrix": [9, 8], "x": 18.5, "y": 4.25, "h": 2}, + + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [10, 2], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [10, 4], "x": 10, "y": 5.25, "w": 1.5}, + {"matrix": [10, 5], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"matrix": [10, 6], "x": 13.25, "y": 5.5}, + {"matrix": [11, 6], "x": 14.25, "y": 5.5}, + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + + {"matrix": [11, 7], "x": 16.5, "y": 5.25}, + {"matrix": [10, 8], "x": 17.5, "y": 5.25} ] } } diff --git a/keyboards/handwired/swiftrax/pandamic/info.json b/keyboards/handwired/swiftrax/pandamic/info.json index 253e20b71554..97ea8928cc85 100644 --- a/keyboards/handwired/swiftrax/pandamic/info.json +++ b/keyboards/handwired/swiftrax/pandamic/info.json @@ -22,7 +22,110 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":18.25, "y":0}, {"x":19.75, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1, "h":2}, {"x":4.25, "y":1, "w":1.5}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1}, {"x":17.75, "y":1, "w":1.5}, {"x":19.75, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":4.25, "y":2, "w":1.75}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2, "w":2.25}, {"x":19.75, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "h":2}, {"x":4.25, "y":3, "w":1.25}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3}, {"x":16.5, "y":3, "w":1.75}, {"x":18.5, "y":3.25}, {"x":19.75, "y":3}, {"x":0, "y":4, "w":2}, {"x":2, "y":4}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4, "w":1.25}, {"x":6.75, "y":4, "w":1.25}, {"x":8, "y":4, "w":6.25}, {"x":14.25, "y":4}, {"x":15.25, "y":4}, {"x":16.25, "y":4}, {"x":17.5, "y":4.25}, {"x":18.5, "y":4.25}, {"x":19.5, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + + {"matrix": [0, 2], "x": 4.25, "y": 0}, + {"matrix": [1, 2], "x": 5.25, "y": 0}, + {"matrix": [0, 3], "x": 6.25, "y": 0}, + {"matrix": [1, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [1, 4], "x": 9.25, "y": 0}, + {"matrix": [0, 5], "x": 10.25, "y": 0}, + {"matrix": [1, 5], "x": 11.25, "y": 0}, + {"matrix": [0, 6], "x": 12.25, "y": 0}, + {"matrix": [1, 6], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [1, 7], "x": 15.25, "y": 0}, + {"matrix": [0, 8], "x": 16.25, "y": 0}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + {"matrix": [0, 9], "x": 18.25, "y": 0}, + + {"matrix": [1, 9], "x": 19.75, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1, "h": 2}, + + {"matrix": [2, 2], "x": 4.25, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 5.75, "y": 1}, + {"matrix": [2, 3], "x": 6.75, "y": 1}, + {"matrix": [3, 3], "x": 7.75, "y": 1}, + {"matrix": [2, 4], "x": 8.75, "y": 1}, + {"matrix": [3, 4], "x": 9.75, "y": 1}, + {"matrix": [2, 5], "x": 10.75, "y": 1}, + {"matrix": [3, 5], "x": 11.75, "y": 1}, + {"matrix": [2, 6], "x": 12.75, "y": 1}, + {"matrix": [3, 6], "x": 13.75, "y": 1}, + {"matrix": [2, 7], "x": 14.75, "y": 1}, + {"matrix": [3, 7], "x": 15.75, "y": 1}, + {"matrix": [2, 8], "x": 16.75, "y": 1}, + {"matrix": [3, 8], "x": 17.75, "y": 1, "w": 1.5}, + + {"matrix": [3, 9], "x": 19.75, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + + {"matrix": [4, 2], "x": 4.25, "y": 2, "w": 1.75}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [5, 5], "x": 12, "y": 2}, + {"matrix": [4, 6], "x": 13, "y": 2}, + {"matrix": [5, 6], "x": 14, "y": 2}, + {"matrix": [4, 7], "x": 15, "y": 2}, + {"matrix": [5, 7], "x": 16, "y": 2}, + {"matrix": [5, 8], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [5, 9], "x": 19.75, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 1], "x": 3, "y": 3, "h": 2}, + + {"matrix": [6, 2], "x": 4.25, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 5.5, "y": 3}, + {"matrix": [6, 3], "x": 6.5, "y": 3}, + {"matrix": [7, 3], "x": 7.5, "y": 3}, + {"matrix": [6, 4], "x": 8.5, "y": 3}, + {"matrix": [7, 4], "x": 9.5, "y": 3}, + {"matrix": [6, 5], "x": 10.5, "y": 3}, + {"matrix": [7, 5], "x": 11.5, "y": 3}, + {"matrix": [6, 6], "x": 12.5, "y": 3}, + {"matrix": [7, 6], "x": 13.5, "y": 3}, + {"matrix": [6, 7], "x": 14.5, "y": 3}, + {"matrix": [7, 7], "x": 15.5, "y": 3}, + {"matrix": [6, 8], "x": 16.5, "y": 3, "w": 1.75}, + + {"matrix": [6, 9], "x": 18.5, "y": 3.25}, + + {"matrix": [7, 9], "x": 19.75, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [8, 1], "x": 2, "y": 4}, + {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 5.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 8, "y": 4, "w": 6.25}, + + {"matrix": [8, 7], "x": 14.25, "y": 4}, + {"matrix": [9, 7], "x": 15.25, "y": 4}, + {"matrix": [8, 8], "x": 16.25, "y": 4}, + + {"matrix": [9, 8], "x": 17.5, "y": 4.25}, + {"matrix": [8, 9], "x": 18.5, "y": 4.25}, + {"matrix": [9, 9], "x": 19.5, "y": 4.25} + ] } } } diff --git a/keyboards/handwired/swiftrax/pandamic/pandamic.h b/keyboards/handwired/swiftrax/pandamic/pandamic.h deleted file mode 100644 index 9fbb78427e83..000000000000 --- a/keyboards/handwired/swiftrax/pandamic/pandamic.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 swiftrax - * - * 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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - K000, K100, K001, K101, K002, K102, K003, K103, K004, K104, K005, K105, K006, K106, K007, K107, K008, K108, K009, K109,\ - K200, K300, K201, K301, K202, K302, K203, K303, K204, K304, K205, K305, K206, K306, K207, K307, K208, K308, K309,\ - K400, K500, K401, K402, K502, K403, K503, K404, K504, K405, K505, K406, K506, K407, K507, K508, K509,\ - K600, K700, K601, K701, K602, K702, K603, K703, K604, K704, K605, K705, K606, K706, K607, K707, K608, K609, K709,\ - K800, K801, K802, K902, K803, K805, K807, K907, K808, K908, K809, K909 \ -) { \ - {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, XXX},\ - {K300, K301, K302, K303, K304, K305, K306, K307, K308, K309},\ - {K400, K401, K402, K403, K404, K405, K406, K407, XXX, XXX},\ - {K500, XXX, 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, XXX, K709},\ - {K800, K801, K802, K803, XXX, K805, XXX, K807, K808, K809},\ - { XXX, XXX, K902, XXX, XXX, XXX, XXX, K907, K908, K909} \ -} diff --git a/keyboards/handwired/swiftrax/unsplit/info.json b/keyboards/handwired/swiftrax/unsplit/info.json index ea28d0d9c5a4..b651d2983565 100644 --- a/keyboards/handwired/swiftrax/unsplit/info.json +++ b/keyboards/handwired/swiftrax/unsplit/info.json @@ -18,57 +18,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75}, - {"x":1, "y":0.75}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.25}, - {"x":5, "y":0.375}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.375}, - {"x":11, "y":0.375}, - {"x":12, "y":0.25}, - {"x":13, "y":0}, - {"x":14, "y":0.25}, - {"x":15, "y":0.75}, - {"x":16, "y":0.75}, + {"matrix": [0, 6], "x": 11, "y": 0.375}, + {"matrix": [0, 7], "x": 12, "y": 0.25}, + {"matrix": [0, 8], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "y": 0.25}, + {"matrix": [0, 10], "x": 15, "y": 0.75}, + {"matrix": [0, 11], "x": 16, "y": 0.75}, - {"x":0, "y":1.75}, - {"x":1, "y":1.75}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.25}, - {"x":5, "y":1.375}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.375}, - {"x":11, "y":1.375}, - {"x":12, "y":1.25}, - {"x":13, "y":1}, - {"x":14, "y":1.25}, - {"x":15, "y":1.75}, - {"x":16, "y":1.75}, + {"matrix": [1, 6], "x": 11, "y": 1.375}, + {"matrix": [1, 7], "x": 12, "y": 1.25}, + {"matrix": [1, 8], "x": 13, "y": 1}, + {"matrix": [1, 9], "x": 14, "y": 1.25}, + {"matrix": [1, 10], "x": 15, "y": 1.75}, + {"matrix": [1, 11], "x": 16, "y": 1.75}, - {"x":0, "y":2.75}, - {"x":1, "y":2.75}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.25}, - {"x":5, "y":2.375}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.375}, - {"x":11, "y":2.375}, - {"x":12, "y":2.25}, - {"x":13, "y":2}, - {"x":14, "y":2.25}, - {"x":15, "y":2.75}, - {"x":16, "y":2.75}, + {"matrix": [2, 6], "x": 11, "y": 2.375}, + {"matrix": [2, 7], "x": 12, "y": 2.25}, + {"matrix": [2, 8], "x": 13, "y": 2}, + {"matrix": [2, 9], "x": 14, "y": 2.25}, + {"matrix": [2, 10], "x": 15, "y": 2.75}, + {"matrix": [2, 11], "x": 16, "y": 2.75}, - {"x":2.5, "y":3.25}, - {"x":3.5, "y":3.25}, - {"x":4.5, "y":3.5}, - {"x":5.5, "y":3.75}, + {"matrix": [3, 2], "x": 2.5, "y": 3.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3.5}, + {"matrix": [3, 5], "x": 5.5, "y": 3.75}, - {"x":10.5, "y":3.75}, - {"x":11.5, "y":3.5}, - {"x":12.5, "y":3.25}, - {"x":13.5, "y":3.25} + {"matrix": [3, 6], "x": 10.5, "y": 3.75}, + {"matrix": [3, 7], "x": 11.5, "y": 3.5}, + {"matrix": [3, 8], "x": 12.5, "y": 3.25}, + {"matrix": [3, 9], "x": 13.5, "y": 3.25} ] } } diff --git a/keyboards/handwired/swiftrax/unsplit/unsplit.h b/keyboards/handwired/swiftrax/unsplit/unsplit.h deleted file mode 100644 index 79109edb7ba1..000000000000 --- a/keyboards/handwired/swiftrax/unsplit/unsplit.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2020 Swiftrax - -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" - -// readability -#define XXX KC_NO - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K011, K012, K013, K014, K015, K016, \ - K100, K101, K102, K103, K104, K105, K111, K112, K113, K114, K115, K116, \ - K200, K201, K202, K203, K204, K205, K211, K212, K213, K214, K215, K216, \ - K402, K403, K404, K405, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K011, K012, K013, K014, K015, K016 }, \ - { K100, K101, K102, K103, K104, K105, K111, K112, K113, K114, K115, K116 }, \ - { K200, K201, K202, K203, K204, K205, K211, K212, K213, K214, K215, K216 }, \ - { XXX, XXX, K402, K403, K404, K405, K411, K412, K413, K414, XXX, XXX } \ -} diff --git a/keyboards/handwired/symmetric70_proto/info.json b/keyboards/handwired/symmetric70_proto/info.json index 36828784c4f8..9be776f41c45 100644 --- a/keyboards/handwired/symmetric70_proto/info.json +++ b/keyboards/handwired/symmetric70_proto/info.json @@ -10,80 +10,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0, "w":1.25}, - {"label":"L01", "x":1.25, "y":0}, - {"label":"L02", "x":2.25, "y":0}, - {"label":"L03", "x":3.25, "y":0}, - {"label":"L04", "x":4.25, "y":0}, - {"label":"L05", "x":5.25, "y":0}, - {"label":"L06", "x":6.25, "y":0}, - {"label":"R06", "x":8.75, "y":0}, - {"label":"R05", "x":9.75, "y":0}, - {"label":"R04", "x":10.75, "y":0}, - {"label":"R03", "x":11.75, "y":0}, - {"label":"R02", "x":12.75, "y":0}, - {"label":"R01", "x":13.75, "y":0}, - {"label":"R00", "x":14.75, "y":0, "w":1.25}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - {"label":"L16", "x":6.5, "y":1}, - {"label":"R16", "x":8.5, "y":1}, - {"label":"R15", "x":9.5, "y":1}, - {"label":"R14", "x":10.5, "y":1}, - {"label":"R13", "x":11.5, "y":1}, - {"label":"R12", "x":12.5, "y":1}, - {"label":"R11", "x":13.5, "y":1}, - {"label":"R10", "x":14.5, "y":1, "w":1.5}, + {"matrix": [0, 9], "x": 8.75, "y": 0}, + {"matrix": [0, 10], "x": 9.75, "y": 0}, + {"matrix": [0, 11], "x": 10.75, "y": 0}, + {"matrix": [0, 12], "x": 11.75, "y": 0}, + {"matrix": [0, 13], "x": 12.75, "y": 0}, + {"matrix": [0, 14], "x": 13.75, "y": 0}, + {"matrix": [0, 15], "x": 14.75, "y": 0, "w": 1.25}, - {"label":"L20", "x":0, "y":2, "w":1.25}, - {"label":"L21", "x":1.25, "y":2}, - {"label":"L22", "x":2.25, "y":2}, - {"label":"L23", "x":3.25, "y":2}, - {"label":"L24", "x":4.25, "y":2}, - {"label":"L25", "x":5.25, "y":2}, - {"label":"L26", "x":6.25, "y":2}, - {"label":"R26", "x":8.75, "y":2}, - {"label":"R25", "x":9.75, "y":2}, - {"label":"R24", "x":10.75, "y":2}, - {"label":"R23", "x":11.75, "y":2}, - {"label":"R22", "x":12.75, "y":2}, - {"label":"R21", "x":13.75, "y":2}, - {"label":"R20", "x":14.75, "y":2, "w":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"L36", "x":6, "y":3}, - {"label":"L37", "x":7, "y":3}, - {"label":"R37", "x":8, "y":3}, - {"label":"R36", "x":9, "y":3}, - {"label":"R35", "x":10, "y":3}, - {"label":"R34", "x":11, "y":3}, - {"label":"R33", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R31", "x":14, "y":3}, - {"label":"R30", "x":15, "y":3}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1}, + {"matrix": [1, 15], "x": 14.5, "y": 1, "w": 1.5}, - {"label":"L40", "x":0, "y":4, "w":1.75}, - {"label":"L42", "x":1.75, "y":4, "w":1.25}, - {"label":"L43", "x":3, "y":4, "w":1.25}, - {"label":"L44", "x":4.25, "y":4}, - {"label":"L45", "x":5.25, "y":4, "w":1.25}, - {"label":"L47", "x":6.5, "y":4, "w":1.5}, - {"label":"R47", "x":8, "y":4, "w":1.5}, - {"label":"R45", "x":9.5, "y":4, "w":1.25}, - {"label":"R44", "x":10.75, "y":4}, - {"label":"R43", "x":11.75, "y":4, "w":1.25}, - {"label":"R42", "x":13, "y":4, "w":1.25}, - {"label":"R40", "x":14.25, "y":4, "w":1.75} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2}, + {"matrix": [2, 15], "x": 14.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 6.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 8], "x": 8, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 10.75, "y": 4}, + {"matrix": [4, 12], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [4, 15], "x": 14.25, "y": 4, "w": 1.75} ] } } diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c index daab4f09937c..f954a388b569 100644 --- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.c +++ b/keyboards/handwired/symmetric70_proto/symmetric70_proto.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "symmetric70_proto.h" +#include "quantum.h" __attribute__((weak)) void keyboard_post_init_user(void) { // Customise these values to desired behaviour diff --git a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h b/keyboards/handwired/symmetric70_proto/symmetric70_proto.h deleted file mode 100644 index 4a8539b50c54..000000000000 --- a/keyboards/handwired/symmetric70_proto/symmetric70_proto.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 mtei - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, R30, \ - L40, L42, L43, L44, L45, L47, R47, R45, R44, R43, R42, R40 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, KC_NO, KC_NO, R06, R05, R04, R03, R02, R01, R00 }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO, KC_NO, R16, R15, R14, R13, R12, R11, R10 }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO, R26, R25, R24, R23, R22, R21, R20 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { L40, KC_NO, L42, L43, L44, L45, KC_NO, L47, R47, KC_NO, R45, R44, R43, R42, KC_NO, R40 } \ -} diff --git a/keyboards/handwired/t111/info.json b/keyboards/handwired/t111/info.json index f232a0ea33b8..d3bc56857a67 100644 --- a/keyboards/handwired/t111/info.json +++ b/keyboards/handwired/t111/info.json @@ -17,7 +17,128 @@ "bootloader": "stm32duino", "layouts": { "LAYOUT": { - "layout": [{"label":"Break", "x":0, "y":0}, {"label":"PF1", "x":2, "y":0}, {"label":"PF2", "x":3, "y":0}, {"label":"PF3", "x":4, "y":0}, {"label":"PF4", "x":5, "y":0}, {"label":"PF5", "x":6, "y":0}, {"label":"PF6", "x":7, "y":0}, {"label":"PF7", "x":8, "y":0}, {"label":"PF8", "x":9, "y":0}, {"label":"PF9", "x":10, "y":0}, {"label":"PF10", "x":11, "y":0}, {"label":"PF11", "x":12, "y":0}, {"label":"PF12", "x":13, "y":0}, {"label":"PF13", "x":14, "y":0}, {"label":"PF14", "x":15, "y":0}, {"label":"PF15", "x":16, "y":0}, {"label":"PF16", "x":17, "y":0}, {"label":"Esc", "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":"~", "x":13, "y":1.5}, {"label":"bkspc", "x":14, "y":1.5, "w":1.25}, {"label":"Ins", "x":15.5, "y":1.5}, {"label":"Cls", "x":16.5, "y":1.5}, {"label":"*", "x":17.75, "y":1.5}, {"label":"/", "x":18.75, "y":1.5}, {"label":"+", "x":19.75, "y":1.5}, {"label":"-", "x":20.75, "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":"El", "x":15.5, "y":2.5}, {"label":"Dup", "x":16.5, "y":2.5}, {"label":"7", "x":17.75, "y":2.5}, {"label":"8", "x":18.75, "y":2.5}, {"label":"9", "x":19.75, "y":2.5}, {"label":"=", "x":20.75, "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":"|", "x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":2.5, "w":1.5, "h":2}, {"label":"Del", "x":15.5, "y":3.5}, {"label":"Home", "x":16.5, "y":3.5}, {"label":"4", "x":17.75, "y":3.5}, {"label":"5", "x":18.75, "y":3.5}, {"label":"6", "x":19.75, "y":3.5}, {"label":",", "x":20.75, "y":3.5}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"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}, {"x":12.25, "y":4.5}, {"label":"Shift", "x":13.25, "y":4.5, "w":2}, {"label":"\u0432\u2020\u2018", "x":15.5, "y":4.5}, {"label":"\u0432\u2020\u201c", "x":16.5, "y":4.5}, {"label":"1", "x":17.75, "y":4.5}, {"label":"2", "x":18.75, "y":4.5}, {"label":"3", "x":19.75, "y":4.5}, {"label":"Enter", "x":20.75, "y":4.5, "h":2}, {"label":"Caps", "x":1.75, "y":5.5}, {"label":"Graph", "x":2.75, "y":5.5, "w":1.5}, {"x":4.25, "y":5.5, "w":8}, {"label":"Alt", "x":12.25, "y":5.5, "w":1.5}, {"label":"\u0432\u2020\u0452", "x":15.5, "y":5.5}, {"label":"\u0432\u2020\u2019", "x":16.5, "y":5.5}, {"label":"0", "x":17.75, "y":5.5, "w":2}, {"label":".", "x":19.75, "y":5.5}] + "layout": [ + {"matrix": [3, 0], "x": 0, "y": 0}, + + {"matrix": [4, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [2, 1], "x": 4, "y": 0}, + {"matrix": [3, 1], "x": 5, "y": 0}, + {"matrix": [4, 1], "x": 6, "y": 0}, + {"matrix": [5, 1], "x": 7, "y": 0}, + {"matrix": [6, 1], "x": 8, "y": 0}, + {"matrix": [7, 1], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [2, 2], "x": 12, "y": 0}, + {"matrix": [3, 2], "x": 13, "y": 0}, + {"matrix": [4, 2], "x": 14, "y": 0}, + {"matrix": [5, 2], "x": 15, "y": 0}, + {"matrix": [6, 2], "x": 16, "y": 0}, + {"matrix": [7, 2], "x": 17, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 3], "x": 1, "y": 1.5}, + {"matrix": [2, 3], "x": 2, "y": 1.5}, + {"matrix": [3, 3], "x": 3, "y": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 1.5}, + {"matrix": [5, 3], "x": 5, "y": 1.5}, + {"matrix": [6, 3], "x": 6, "y": 1.5}, + {"matrix": [7, 3], "x": 7, "y": 1.5}, + {"matrix": [0, 3], "x": 8, "y": 1.5}, + {"matrix": [1, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 4], "x": 10, "y": 1.5}, + {"matrix": [3, 4], "x": 11, "y": 1.5}, + {"matrix": [4, 4], "x": 12, "y": 1.5}, + {"matrix": [5, 4], "x": 13, "y": 1.5}, + {"matrix": [5, 8], "x": 14, "y": 1.5, "w": 1.25}, + + {"matrix": [6, 4], "x": 15.5, "y": 1.5}, + {"matrix": [7, 4], "x": 16.5, "y": 1.5}, + + {"matrix": [1, 5], "x": 17.75, "y": 1.5}, + {"matrix": [0, 6], "x": 18.75, "y": 1.5}, + {"matrix": [7, 6], "x": 19.75, "y": 1.5}, + {"matrix": [6, 6], "x": 20.75, "y": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [1, 7], "x": 1.5, "y": 2.5}, + {"matrix": [2, 7], "x": 2.5, "y": 2.5}, + {"matrix": [3, 7], "x": 3.5, "y": 2.5}, + {"matrix": [4, 7], "x": 4.5, "y": 2.5}, + {"matrix": [5, 7], "x": 5.5, "y": 2.5}, + {"matrix": [6, 7], "x": 6.5, "y": 2.5}, + {"matrix": [7, 7], "x": 7.5, "y": 2.5}, + {"matrix": [0, 7], "x": 8.5, "y": 2.5}, + {"matrix": [1, 8], "x": 9.5, "y": 2.5}, + {"matrix": [2, 8], "x": 10.5, "y": 2.5}, + {"matrix": [3, 8], "x": 11.5, "y": 2.5}, + {"matrix": [4, 8], "x": 12.5, "y": 2.5}, + + {"matrix": [6, 8], "x": 15.5, "y": 2.5}, + {"matrix": [7, 8], "x": 16.5, "y": 2.5}, + + {"matrix": [1, 11], "x": 17.75, "y": 2.5}, + {"matrix": [0, 0], "x": 18.75, "y": 2.5}, + {"matrix": [7, 0], "x": 19.75, "y": 2.5}, + {"matrix": [6, 0], "x": 20.75, "y": 2.5}, + + {"matrix": [0, 10], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [1, 9], "x": 1.75, "y": 3.5}, + {"matrix": [2, 9], "x": 2.75, "y": 3.5}, + {"matrix": [3, 9], "x": 3.75, "y": 3.5}, + {"matrix": [4, 9], "x": 4.75, "y": 3.5}, + {"matrix": [5, 9], "x": 5.75, "y": 3.5}, + {"matrix": [6, 9], "x": 6.75, "y": 3.5}, + {"matrix": [7, 9], "x": 7.75, "y": 3.5}, + {"matrix": [0, 9], "x": 8.75, "y": 3.5}, + {"matrix": [1, 10], "x": 9.75, "y": 3.5}, + {"matrix": [2, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 10], "x": 11.75, "y": 3.5}, + {"matrix": [4, 10], "x": 12.75, "y": 3.5}, + {"matrix": [5, 10], "x": 13.75, "y": 2.5, "w": 1.5, "h": 2}, + + {"matrix": [6, 10], "x": 15.5, "y": 3.5}, + {"matrix": [7, 10], "x": 16.5, "y": 3.5}, + + {"matrix": [2, 11], "x": 17.75, "y": 3.5}, + {"matrix": [3, 11], "x": 18.75, "y": 3.5}, + {"matrix": [4, 11], "x": 19.75, "y": 3.5}, + {"matrix": [5, 11], "x": 20.75, "y": 3.5}, + + {"matrix": [0, 13], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [1, 12], "x": 2.25, "y": 4.5}, + {"matrix": [2, 12], "x": 3.25, "y": 4.5}, + {"matrix": [3, 12], "x": 4.25, "y": 4.5}, + {"matrix": [4, 12], "x": 5.25, "y": 4.5}, + {"matrix": [5, 12], "x": 6.25, "y": 4.5}, + {"matrix": [6, 12], "x": 7.25, "y": 4.5}, + {"matrix": [7, 12], "x": 8.25, "y": 4.5}, + {"matrix": [0, 12], "x": 9.25, "y": 4.5}, + {"matrix": [1, 13], "x": 10.25, "y": 4.5}, + {"matrix": [2, 13], "x": 11.25, "y": 4.5}, + {"matrix": [3, 13], "x": 12.25, "y": 4.5}, + {"matrix": [0, 4], "x": 13.25, "y": 4.5, "w": 2}, + + {"matrix": [6, 13], "x": 15.5, "y": 4.5}, + {"matrix": [7, 13], "x": 16.5, "y": 4.5}, + + {"matrix": [2, 5], "x": 17.75, "y": 4.5}, + {"matrix": [3, 5], "x": 18.75, "y": 4.5}, + {"matrix": [4, 5], "x": 19.75, "y": 4.5}, + {"matrix": [5, 5], "x": 20.75, "y": 4.5, "h": 2}, + + {"matrix": [0, 8], "x": 1.75, "y": 5.5}, + {"matrix": [0, 11], "x": 2.75, "y": 5.5, "w": 1.5}, + {"matrix": [5, 0], "x": 4.25, "y": 5.5, "w": 8}, + {"matrix": [0, 5], "x": 12.25, "y": 5.5, "w": 1.5}, + + {"matrix": [6, 11], "x": 15.5, "y": 5.5}, + {"matrix": [7, 11], "x": 16.5, "y": 5.5}, + + {"matrix": [6, 5], "x": 17.75, "y": 5.5, "w": 2}, + {"matrix": [7, 5], "x": 19.75, "y": 5.5} + ] } } } diff --git a/keyboards/handwired/t111/t111.h b/keyboards/handwired/t111/t111.h deleted file mode 100644 index 35651f635db3..000000000000 --- a/keyboards/handwired/t111/t111.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2020 DmNosachev - * - * 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 XXX KC_NO - -/* -,-------------------------------------------------------------------------------------------------------------------------------------. -|break| | PF1 | PF2 | PF3 | PF4 | PF5 | PF6 | PF7 | PF8 | PF9 | PF10| PF11| PF12| PF13| PF14| PF15| PF16| | -|-------------------------------------------------------------------------------------------------------------------------------------| -| esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | ~ |backspc| | ins | cls | | * | / | + | - | -|-------------------------------------------------------------------------------------------------------------------------------------| -| tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | enter | el | dup | | 7 | 8 | 9 | = | -|-------------------------------------------------------------------------------- |--------------------------------------| -| ctrl | A | S | D | F | G | H | J | K | L | ;: | '" | |\ | | del | home| | 4 | 5 | 6 | , | -|-------------------------------------------------------------------------------------------------------------------------------------| -| shift | Z | X | C | V | B | N | M | , | . | /? |blank| shift | up | down| | 1 | 2 | 3 |enter| -|-------------------------------------------------------------------------------------------------------------------------------| | -| | caps| graph | Space | alt | | left|right| | 0 | . | | -`-------------------------------------------------------------------------------------------------------------------------------------' -*/ - -#define LAYOUT( \ - K30, K40, K11, K21, K31, K41, K51, K61, K71, K01, K12, K22, K32, K42, K52, K62, K72, \ - K20, K13, K23, K33, K43, K53, K63, K73, K03, K14, K24, K34, K44, K54, K58, K64, K74, K15, K06, K76, K66, \ - K10, K17, K27, K37, K47, K57, K67, K77, K07, K18, K28, K38, K48, K68, K78, K1B, K00, K70, K60, \ - K0A, K19, K29, K39, K49, K59, K69, K79, K09, K1A, K2A, K3A, K4A, K5A, K6A, K7A, K2B, K3B, K4B, K5B, \ - K0D, K1C, K2C, K3C, K4C, K5C, K6C, K7C, K0C, K1D, K2D, K3D, K04, K6D, K7D, K25, K35, K45, K55, \ - K08, K0B, K50, K05, K6B, K7B, K65, K75 \ -) \ -{ \ -/* 0 */ { K00, K01, XXX, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ -/* 1 */ { K10, K11, K12, K13, K14, K15, XXX, K17, K18, K19, K1A, K1B, K1C, K1D }, \ -/* 2 */ { K20, K21, K22, K23, K24, K25, XXX, K27, K28, K29, K2A, K2B, K2C, K2D }, \ -/* 3 */ { K30, K31, K32, K33, K34, K35, XXX, K37, K38, K39, K3A, K3B, K3C, K3D }, \ -/* 4 */ { K40, K41, K42, K43, K44, K45, XXX, K47, K48, K49, K4A, K4B, K4C, XXX }, \ -/* 5 */ { K50, K51, K52, K53, K54, K55, XXX, K57, K58, K59, K5A, K5B, K5C, XXX }, \ -/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, K6C, K6D }, \ -/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77, K78, K79, K7A, K7B, K7C, K7D } \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D */ diff --git a/keyboards/handwired/terminus_mini/info.json b/keyboards/handwired/terminus_mini/info.json index bb8214b97daa..6948b13edc7b 100644 --- a/keyboards/handwired/terminus_mini/info.json +++ b/keyboards/handwired/terminus_mini/info.json @@ -18,52 +18,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Del", "x":11, "y":0}, - {"label":"Backspace", "x":0, "y":1}, - {"label":"A", "x":1, "y":1}, - {"label":"S", "x":2, "y":1}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1}, - {"label":"G", "x":5, "y":1}, - {"label":"H", "x":6, "y":1}, - {"label":"J", "x":7, "y":1}, - {"label":"K", "x":8, "y":1}, - {"label":"L", "x":9, "y":1}, - {"label":";", "x":10, "y":1}, - {"label":"'", "x":11, "y":1}, - {"label":"Left Shift / (", "x":0, "y":2}, - {"label":"Z", "x":1, "y":2}, - {"label":"X", "x":2, "y":2}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2}, - {"label":"B", "x":5, "y":2}, - {"label":"N", "x":6, "y":2}, - {"label":"M", "x":7, "y":2}, - {"label":",", "x":8, "y":2}, - {"label":".", "x":9, "y":2}, - {"label":"/", "x":10, "y":2}, - {"label":"Right Shift / )", "x":11, "y":2}, - {"label":"LCtrl", "x":0, "y":3}, - {"label":"GUI", "x":1, "y":3}, - {"label":"Lower", "x":2, "y":3}, - {"label":"LAlt", "x":3, "y":3}, - {"label":"Space / Lower", "x":4, "y":3, "w":2}, - {"label":"Enter / Raise", "x":6, "y":3, "w":2}, - {"label":"MO(_FUNCTION)", "x":8, "y":3}, - {"label":"MO(_MOUSE)", "x":9, "y":3}, - {"label":"App", "x":10, "y":3}, - {"label":"RCtrl", "x":11, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 5], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/handwired/terminus_mini/terminus_mini.h b/keyboards/handwired/terminus_mini/terminus_mini.h deleted file mode 100644 index f498313cbbe0..000000000000 --- a/keyboards/handwired/terminus_mini/terminus_mini.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2017 James Morgan - * - * 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 XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The following is an example using the Terminus Mini layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - 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, k35, k37, k38, k39, k3A, k3B \ -) { \ - { 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, XXX, k35, XXX, k37, k38, k39, k3A, k3B } \ -} - -#define KC_ KC_TRNS diff --git a/keyboards/handwired/traveller/info.json b/keyboards/handwired/traveller/info.json index b6598be8e83f..91fe9e1cf441 100644 --- a/keyboards/handwired/traveller/info.json +++ b/keyboards/handwired/traveller/info.json @@ -21,63 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 1.2}, - {"x": 1, "y": 0.8}, - {"x": 2, "y": 0.4}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.4}, - {"x": 5, "y": 0.8}, + {"matrix": [0, 0], "x": 0, "y": 1.2}, + {"matrix": [0, 1], "x": 1, "y": 0.8}, + {"matrix": [0, 2], "x": 2, "y": 0.4}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + {"matrix": [0, 5], "x": 5, "y": 0.8}, - {"x": 9, "y": 0.8}, - {"x": 10, "y": 0.4}, - {"x": 11, "y": 0}, - {"x": 12, "y": 0.4}, - {"x": 13, "y": 0.8}, - {"x": 14, "y": 1.2}, + {"matrix": [0, 7], "x": 9, "y": 0.8}, + {"matrix": [0, 8], "x": 10, "y": 0.4}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.4}, + {"matrix": [0, 11], "x": 13, "y": 0.8}, + {"matrix": [0, 12], "x": 14, "y": 1.2}, - {"x": 0, "y": 2.2}, - {"x": 1, "y": 1.8}, - {"x": 2, "y": 1.4}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.4}, - {"x": 5, "y": 1.8}, + {"matrix": [1, 0], "x": 0, "y": 2.2}, + {"matrix": [1, 1], "x": 1, "y": 1.8}, + {"matrix": [1, 2], "x": 2, "y": 1.4}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + {"matrix": [1, 5], "x": 5, "y": 1.8}, - {"x": 9, "y": 1.8}, - {"x": 10, "y": 1.4}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1.4}, - {"x": 13, "y": 1.8}, - {"x": 14, "y": 2.2}, + {"matrix": [1, 7], "x": 9, "y": 1.8}, + {"matrix": [1, 8], "x": 10, "y": 1.4}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.4}, + {"matrix": [1, 11], "x": 13, "y": 1.8}, + {"matrix": [1, 12], "x": 14, "y": 2.2}, - {"x": 0, "y": 3.2}, - {"x": 1, "y": 2.8}, - {"x": 2, "y": 2.4}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.4}, - {"x": 5, "y": 2.8}, + {"matrix": [2, 0], "x": 0, "y": 3.2}, + {"matrix": [2, 1], "x": 1, "y": 2.8}, + {"matrix": [2, 2], "x": 2, "y": 2.4}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + {"matrix": [2, 5], "x": 5, "y": 2.8}, - {"x": 9, "y": 2.8}, - {"x": 10, "y": 2.4}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2.4}, - {"x": 13, "y": 2.8}, - {"x": 14, "y": 3.2}, + {"matrix": [2, 7], "x": 9, "y": 2.8}, + {"matrix": [2, 8], "x": 10, "y": 2.4}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.4}, + {"matrix": [2, 11], "x": 13, "y": 2.8}, + {"matrix": [2, 12], "x": 14, "y": 3.2}, - {"x": 0, "y": 4.2}, - {"x": 1, "y": 3.8}, - {"x": 2, "y": 3.4}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.4}, - {"x": 5, "y": 3.8}, - {"x": 6, "y": 3.05, "h": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 4.2}, + {"matrix": [3, 1], "x": 1, "y": 3.8}, + {"matrix": [3, 2], "x": 2, "y": 3.4}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.4}, + {"matrix": [3, 5], "x": 5, "y": 3.8}, + {"matrix": [2, 6], "x": 6, "y": 3.05, "h": 1.5}, - {"x": 8, "y": 3.05, "h": 1.5}, - {"x": 9, "y": 3.8}, - {"x": 10, "y": 3.4}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3.4}, - {"x": 13, "y": 3.8}, - {"x": 14, "y": 4.2} + {"matrix": [3, 6], "x": 8, "y": 3.05, "h": 1.5}, + {"matrix": [3, 7], "x": 9, "y": 3.8}, + {"matrix": [3, 8], "x": 10, "y": 3.4}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.4}, + {"matrix": [3, 11], "x": 13, "y": 3.8}, + {"matrix": [3, 12], "x": 14, "y": 4.2} ] } } diff --git a/keyboards/handwired/traveller/traveller.c b/keyboards/handwired/traveller/traveller.c index 409abe7d14cf..91c6f603b1ac 100644 --- a/keyboards/handwired/traveller/traveller.c +++ b/keyboards/handwired/traveller/traveller.c @@ -1,4 +1,4 @@ -#include "traveller.h" +#include "quantum.h" void matrix_init_kb(void) { // put your keyboard start-up code here diff --git a/keyboards/handwired/traveller/traveller.h b/keyboards/handwired/traveller/traveller.h deleted file mode 100644 index f78abe46aad2..000000000000 --- a/keyboards/handwired/traveller/traveller.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0C, \ - k10, k11, k12, k13, k14, k15, k17, k18, k19, k1A, k1B, k1C, \ - k20, k21, k22, k23, k24, k25, k27, k28, k29, k2A, k2B, k2C, \ - k30, k31, k32, k33, k34, k35, k26, k36, k37, k38, k39, k3A, k3B, k3C \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, k07, k08, k09, k0A, k0B, k0C }, \ - { k10, k11, k12, k13, k14, k15, XXX, k17, k18, k19, k1A, k1B, k1C }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C } \ -} diff --git a/keyboards/handwired/tsubasa/info.json b/keyboards/handwired/tsubasa/info.json index c78a1532a7b2..351731a6139d 100644 --- a/keyboards/handwired/tsubasa/info.json +++ b/keyboards/handwired/tsubasa/info.json @@ -32,65 +32,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"!", "x":0.5, "y":0}, - {"label":"@", "x":1.5, "y":0}, - {"label":"#", "x":2.5, "y":0}, - {"label":"$", "x":3.5, "y":0}, - {"label":"%", "x":4.5, "y":0}, - {"label":"^", "x":5.5, "y":0}, - {"label":"&", "x":9.5, "y":0}, - {"label":"*", "x":10.5, "y":0}, - {"label":"(", "x":11.5, "y":0}, - {"label":")", "x":12.5, "y":0}, - {"label":"_", "x":13.5, "y":0}, - {"label":"+", "x":14.5, "y":0}, - {"label":"TAB", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":9, "y":1}, - {"label":"U", "x":10, "y":1}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1}, - {"label":"P", "x":13, "y":1}, - {"label":"{", "x":14, "y":1}, - {"label":"Caps Lock", "x":0.25, "y":2}, - {"label":"A", "x":1.25, "y":2}, - {"label":"S", "x":2.25, "y":2}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2}, - {"label":"G", "x":5.25, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":":", "x":13.25, "y":2}, - {"label":"\"", "x":14.25, "y":2}, - {"label":"}", "x":15, "y":1}, - {"label":"SHIFT", "x":0.75, "y":3}, - {"label":"Z", "x":1.75, "y":3}, - {"label":"X", "x":2.75, "y":3}, - {"label":"C", "x":3.75, "y":3}, - {"label":"V", "x":4.75, "y":3}, - {"label":"B", "x":5.75, "y":3}, - {"label":"Encoder Mode", "x":8.75, "y":3}, - {"label":"N", "x":9.75, "y":3}, - {"label":"M", "x":10.75, "y":3}, - {"label":"<", "x":11.75, "y":3}, - {"label":">", "x":12.75, "y":3}, - {"label":"?", "x":13.75, "y":3}, - {"label":"Esc", "x":2.25, "y":4}, - {"label":"Super", "x":3.25, "y":4}, - {"label":"Alt", "x":4.25, "y":4.25}, - {"label":"Space", "x":5.25, "y":4.5}, - {"label":"Shift", "x":6.25, "y":4.75}, - {"label":"BS", "x":8.25, "y":4.75}, - {"label":"Enter", "x":9.25, "y":4.5}, - {"label":"Fn", "x":10.25, "y":4.25}, - {"label":"|", "x":11.25, "y":4}, - {"label":"~", "x":12.25, "y":4} + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [5, 0], "x": 9.5, "y": 0}, + {"matrix": [5, 1], "x": 10.5, "y": 0}, + {"matrix": [5, 2], "x": 11.5, "y": 0}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 4], "x": 13.5, "y": 0}, + {"matrix": [5, 5], "x": 14.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 9, "y": 1}, + {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 4], "x": 13, "y": 1}, + {"matrix": [6, 5], "x": 14, "y": 1}, + + {"matrix": [8, 5], "x": 0.25, "y": 2}, + {"matrix": [2, 0], "x": 1.25, "y": 2}, + {"matrix": [2, 1], "x": 2.25, "y": 2}, + {"matrix": [2, 2], "x": 3.25, "y": 2}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + + {"matrix": [2, 5], "x": 9.25, "y": 2}, + {"matrix": [7, 0], "x": 10.25, "y": 2}, + {"matrix": [7, 1], "x": 11.25, "y": 2}, + {"matrix": [7, 2], "x": 12.25, "y": 2}, + {"matrix": [7, 3], "x": 13.25, "y": 2}, + {"matrix": [7, 4], "x": 14.25, "y": 2}, + {"matrix": [7, 5], "x": 15, "y": 1}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + + {"matrix": [9, 0], "x": 8.75, "y": 3}, + {"matrix": [8, 0], "x": 9.75, "y": 3}, + {"matrix": [8, 1], "x": 10.75, "y": 3}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 4], "x": 13.75, "y": 3}, + + {"matrix": [4, 0], "x": 2.25, "y": 4}, + {"matrix": [4, 1], "x": 3.25, "y": 4}, + {"matrix": [4, 2], "x": 4.25, "y": 4.25}, + {"matrix": [4, 3], "x": 5.25, "y": 4.5}, + {"matrix": [4, 4], "x": 6.25, "y": 4.75}, + + {"matrix": [9, 1], "x": 8.25, "y": 4.75}, + {"matrix": [9, 2], "x": 9.25, "y": 4.5}, + {"matrix": [9, 3], "x": 10.25, "y": 4.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4}, + {"matrix": [9, 5], "x": 12.25, "y": 4} ] } } diff --git a/keyboards/handwired/tsubasa/tsubasa.c b/keyboards/handwired/tsubasa/tsubasa.c index 78d27b57a8aa..75bb92dc17d2 100644 --- a/keyboards/handwired/tsubasa/tsubasa.c +++ b/keyboards/handwired/tsubasa/tsubasa.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "tsubasa.h" +#include "quantum.h" #ifdef OLED_ENABLE static void render_scrl(void) { diff --git a/keyboards/handwired/tsubasa/tsubasa.h b/keyboards/handwired/tsubasa/tsubasa.h deleted file mode 100644 index ff7bfa75a469..000000000000 --- a/keyboards/handwired/tsubasa/tsubasa.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 @kuriatsu - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R35, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R40, R30, R31, R32, R33, R34, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, KC_NO }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 } \ -} - diff --git a/keyboards/handwired/twadlee/tp69/info.json b/keyboards/handwired/twadlee/tp69/info.json index 75c11c44c2de..afd79a9bcc67 100644 --- a/keyboards/handwired/twadlee/tp69/info.json +++ b/keyboards/handwired/twadlee/tp69/info.json @@ -17,7 +17,81 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "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}, {"x":14.5, "y":1, "w":1.5}, {"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":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":2.25}, {"x":0, "y":3, "w":2.25}, {"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}, {"x":13.25, "y":3, "w":2.75}, {"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":2}, {"x":5.75, "y":4}, {"x":6.75, "y":4}, {"x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"x":11, "y":4, "w":1.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4, "w":1.25}, {"x":14.75, "y":4, "w":1.25}] + "layout": [ + {"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": [5, 0], "x": 8, "y": 0}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 7], "x": 5.75, "y": 2}, + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [8, 1], "x": 8.25, "y": 3}, + {"matrix": [8, 2], "x": 9.25, "y": 3}, + {"matrix": [8, 3], "x": 10.25, "y": 3}, + {"matrix": [8, 4], "x": 11.25, "y": 3}, + {"matrix": [8, 5], "x": 12.25, "y": 3}, + {"matrix": [8, 6], "x": 13.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4}, + {"matrix": [9, 1], "x": 7.75, "y": 4}, + {"matrix": [9, 2], "x": 8.75, "y": 4, "w": 2.25}, + {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 14.75, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/handwired/twadlee/tp69/tp69.h b/keyboards/handwired/twadlee/tp69/tp69.h deleted file mode 100644 index 31c03eb70b7f..000000000000 --- a/keyboards/handwired/twadlee/tp69/tp69.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 Tracy Wadleigh - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54, k55, k56, k57, \ - k10, k11, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65, k66, k67, \ - k20, k21, k23, k24, k25, k27, /**/ k70, k71, k72, k73, k74, k75, k77, \ - k30, k32, k33, k34, k35, k36, k37, k81, k82, k83, k84, k85, k86, \ - k40, k41, k43, k44, k46, k47, k91, k92, k94, k95, k96, k97 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07}, \ - { k10, k11, KC_NO, k13, k14, k15, k16, k17}, \ - { k20, k21, KC_NO, k23, k24, k25, KC_NO, k27}, \ - { k30, KC_NO, k32, k33, k34, k35, k36, k37}, \ - { k40, k41, KC_NO, k43, k44, KC_NO, k46, k47}, \ - { k50, k51, k52, k53, k54, k55, k56, k57}, \ - { k60, k61, k62, k63, k64, k65, k66, k67}, \ - { k70, k71, k72, k73, k74, k75, KC_NO, k77}, \ - {KC_NO, k81, k82, k83, k84, k85, k86, KC_NO}, \ - {KC_NO, k91, k92, KC_NO, k94, k95, k96, k97} \ -} diff --git a/keyboards/handwired/unicomp_mini_m/info.json b/keyboards/handwired/unicomp_mini_m/info.json index 9dd8d59b59a0..0b110c98bdb3 100644 --- a/keyboards/handwired/unicomp_mini_m/info.json +++ b/keyboards/handwired/unicomp_mini_m/info.json @@ -24,102 +24,110 @@ "layouts": { "LAYOUT": { "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":"Pause / SysReq", "x":15.5, "y":0}, - {"label":"Scroll Lock / Num Lock", "x":16.5, "y":0}, - {"label":"Pause / Reset", "x":17.5, "y":0}, + {"matrix": [0, 1], "x": 0, "y": 0}, - {"label":"`", "x":0, "y":2}, - {"label":"1", "x":1, "y":2}, - {"label":"2", "x":2, "y":2}, - {"label":"3", "x":3, "y":2}, - {"label":"4", "x":4, "y":2}, - {"label":"5", "x":5, "y":2}, - {"label":"6", "x":6, "y":2}, - {"label":"7", "x":7, "y":2}, - {"label":"8", "x":8, "y":2}, - {"label":"9", "x":9, "y":2}, - {"label":"0", "x":10, "y":2}, - {"label":"-", "x":11, "y":2}, - {"label":"=", "x":12, "y":2}, - {"label":"No", "x":13, "y":2}, - {"label":"Backspace", "x":14, "y":2}, - {"label":"Insert", "x":15.5, "y":2}, - {"label":"Home", "x":16.5, "y":2}, - {"label":"Page Up", "x":17.5, "y":2}, + {"matrix": [2, 2], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 5], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, - {"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":"Delete", "x":15.5, "y":3}, - {"label":"End", "x":16.5, "y":3}, - {"label":"Page Down", "x":17.5, "y":3}, + {"matrix": [1, 8], "x": 6.5, "y": 0}, + {"matrix": [3, 8], "x": 7.5, "y": 0}, + {"matrix": [4, 8], "x": 8.5, "y": 0}, + {"matrix": [5, 8], "x": 9.5, "y": 0}, - {"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":"No", "x":12.75, "y":4}, - {"label":"Enter", "x":13.75, "y":4, "w":1.25}, + {"matrix": [6, 8], "x": 11, "y": 0}, + {"matrix": [6, 10], "x": 12, "y": 0}, + {"matrix": [6, 11], "x": 13, "y": 0}, + {"matrix": [7, 11], "x": 14, "y": 0}, - {"label":"Shift", "x":0, "y":5, "w":1.25}, - {"label":"No", "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":"No", "x":12.25, "y":5}, - {"label":"Shift", "x":13.25, "y":5, "w":1.75}, - {"label":"Up", "x":16.5, "y":5}, + {"matrix": [6, 13], "x": 15.5, "y": 0}, + {"matrix": [7, 13], "x": 16.5, "y": 0}, + {"matrix": [11, 15], "x": 17.5, "y": 0}, - {"label":"Ctrl", "x":0, "y":6, "w":1.5}, - {"label":"GUI", "x":1.5, "y":6}, - {"label":"Alt", "x":2.5, "y":6, "w":1.5}, - {"label":"Space", "x":4, "y":6, "w":6}, - {"label":"Alt", "x":10, "y":6}, - {"label":"GUI", "x":11, "y":6, "w":1.5}, - {"label":"App", "x":12.5, "y":6}, - {"label":"Ctrl", "x":13.5, "y":6, "w":1.5}, - {"label":"Left", "x":15.5, "y":6}, - {"label":"Down", "x":16.5, "y":6}, - {"label":"Right", "x":17.5, "y":6} + {"matrix": [0, 0], "x": 0, "y": 2}, + {"matrix": [3, 2], "x": 1, "y": 2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [7, 2], "x": 3, "y": 2}, + {"matrix": [4, 2], "x": 4, "y": 2}, + {"matrix": [0, 2], "x": 5, "y": 2}, + {"matrix": [1, 7], "x": 6, "y": 2}, + {"matrix": [5, 7], "x": 7, "y": 2}, + {"matrix": [10, 7], "x": 8, "y": 2}, + {"matrix": [9, 7], "x": 9, "y": 2}, + {"matrix": [8, 7], "x": 10, "y": 2}, + {"matrix": [6, 12], "x": 11, "y": 2}, + {"matrix": [6, 9], "x": 12, "y": 2}, + {"matrix": [7, 12], "x": 13, "y": 2}, + {"matrix": [8, 9], "x": 14, "y": 2}, + + {"matrix": [8, 12], "x": 15.5, "y": 2}, + {"matrix": [9, 13], "x": 16.5, "y": 2}, + {"matrix": [10, 12], "x": 17.5, "y": 2}, + + {"matrix": [2, 12], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 3}, + {"matrix": [5, 2], "x": 2.5, "y": 3}, + {"matrix": [10, 2], "x": 3.5, "y": 3}, + {"matrix": [9, 2], "x": 4.5, "y": 3}, + {"matrix": [8, 2], "x": 5.5, "y": 3}, + {"matrix": [3, 7], "x": 6.5, "y": 3}, + {"matrix": [6, 7], "x": 7.5, "y": 3}, + {"matrix": [7, 7], "x": 8.5, "y": 3}, + {"matrix": [4, 7], "x": 9.5, "y": 3}, + {"matrix": [0, 7], "x": 10.5, "y": 3}, + {"matrix": [5, 9], "x": 11.5, "y": 3}, + {"matrix": [10, 9], "x": 12.5, "y": 3}, + {"matrix": [9, 9], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [11, 13], "x": 15.5, "y": 3}, + {"matrix": [8, 11], "x": 16.5, "y": 3}, + {"matrix": [10, 13], "x": 17.5, "y": 3}, + + {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [2, 11], "x": 1.75, "y": 4}, + {"matrix": [2, 0], "x": 2.75, "y": 4}, + {"matrix": [2, 1], "x": 3.75, "y": 4}, + {"matrix": [2, 3], "x": 4.75, "y": 4}, + {"matrix": [2, 4], "x": 5.75, "y": 4}, + {"matrix": [11, 5], "x": 6.75, "y": 4}, + {"matrix": [11, 8], "x": 7.75, "y": 4}, + {"matrix": [11, 6], "x": 8.75, "y": 4}, + {"matrix": [11, 9], "x": 9.75, "y": 4}, + {"matrix": [11, 10], "x": 10.75, "y": 4}, + {"matrix": [11, 12], "x": 11.75, "y": 4}, + {"matrix": [1, 13], "x": 12.75, "y": 4}, + {"matrix": [0, 13], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 5}, + {"matrix": [2, 5], "x": 2.25, "y": 5}, + {"matrix": [2, 8], "x": 3.25, "y": 5}, + {"matrix": [2, 6], "x": 4.25, "y": 5}, + {"matrix": [2, 9], "x": 5.25, "y": 5}, + {"matrix": [2, 10], "x": 6.25, "y": 5}, + {"matrix": [11, 11], "x": 7.25, "y": 5}, + {"matrix": [11, 0], "x": 8.25, "y": 5}, + {"matrix": [11, 1], "x": 9.25, "y": 5}, + {"matrix": [11, 3], "x": 10.25, "y": 5}, + {"matrix": [11, 4], "x": 11.25, "y": 5}, + {"matrix": [0, 3], "x": 12.25, "y": 5}, + {"matrix": [1, 15], "x": 13.25, "y": 5, "w": 1.75}, + + {"matrix": [8, 10], "x": 16.5, "y": 5}, + + {"matrix": [4, 14], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [3, 11], "x": 1.5, "y": 6}, + {"matrix": [0, 12], "x": 2.5, "y": 6, "w": 1.5}, + {"matrix": [10, 0], "x": 4, "y": 6, "w": 6}, + {"matrix": [9, 3], "x": 10, "y": 6}, + {"matrix": [5, 10], "x": 11, "y": 6, "w": 1.5}, + {"matrix": [10, 4], "x": 12.5, "y": 6}, + {"matrix": [1, 14], "x": 13.5, "y": 6, "w": 1.5}, + + {"matrix": [9, 4], "x": 15.5, "y": 6}, + {"matrix": [10, 11], "x": 16.5, "y": 6}, + {"matrix": [10, 10], "x": 17.5, "y": 6} ] } } diff --git a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h b/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h deleted file mode 100644 index 8e426da0510e..000000000000 --- a/keyboards/handwired/unicomp_mini_m/unicomp_mini_m.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 stevendlander - * - * 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" - -/* This a shortcut to help you visually see your layout. - * The first section contains "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J, K0K \ -) \ -{ \ -/* 00 */ { K4A, K5A, K4F, K1M, K5C, K5D, K5E, K3K, KC_NO, KC_NO, KC_NO, KC_NO, K0C, K2N, KC_NO, KC_NO }, \ -/* 01 */ { K2A, K1B, K3B, KC_NO, KC_NO, KC_NO, KC_NO, K4G, K5F, KC_NO, KC_NO, KC_NO, KC_NO, K2M, K0H, K1N, }, \ -/* 02 */ { K2C, K2D, K5B, K2E, K2F, K1C, K1E, KC_NO, K1D, K1F, K1G, K2B, K3A, KC_NO, KC_NO, KC_NO }, \ -/* 03 */ { KC_NO, KC_NO, K4B, KC_NO, KC_NO, KC_NO, KC_NO, K3G, K5G, KC_NO, KC_NO, K0B, KC_NO, KC_NO, KC_NO, KC_NO }, \ -/* 04 */ { KC_NO, KC_NO, K4E, KC_NO, KC_NO, KC_NO, KC_NO, K3J, K5H, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0A, K1A, }, \ -/* 05 */ { KC_NO, KC_NO, K3C, KC_NO, KC_NO, KC_NO, KC_NO, K4H, K5I, K3L, K0F, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -/* 06 */ { KC_NO, KC_NO, K4C, KC_NO, KC_NO, KC_NO, KC_NO, K3H, K5J, K4M, K5K, K5L, K4L, K5N, KC_NO, KC_NO }, \ -/* 07 */ { KC_NO, KC_NO, K4D, KC_NO, KC_NO, KC_NO, KC_NO, K3I, KC_NO, KC_NO, KC_NO, K5M, K4N, K5O, KC_NO, KC_NO }, \ -/* 08 */ { KC_NO, KC_NO, K3F, KC_NO, KC_NO, KC_NO, KC_NO, K4K, KC_NO, K4O, K1O, K3P, K4P, KC_NO, KC_NO, KC_NO }, \ -/* 09 */ { KC_NO, KC_NO, K3E, K0E, K0I, KC_NO, KC_NO, K4J, KC_NO, K3N, KC_NO, KC_NO, KC_NO, K4Q, KC_NO, KC_NO }, \ -/* 0A */ { K0D, KC_NO, K3D, KC_NO, K0G, KC_NO, KC_NO, K4I, KC_NO, K3M, K0K, K0J, K4R, K3Q, KC_NO, KC_NO }, \ -/* 0B */ { K1I, K1J, KC_NO, K1K, K1L, K2G, K2I, KC_NO, K2H, K2J, K2K, K1H, K2L, K3O, KC_NO, K5P, }, \ -} -/* 0 1 2 3 4 5 6 7 8 9 A B C D E F */ diff --git a/keyboards/handwired/unk/rev1/info.json b/keyboards/handwired/unk/rev1/info.json index da8c72203f31..162faca32cb7 100644 --- a/keyboards/handwired/unk/rev1/info.json +++ b/keyboards/handwired/unk/rev1/info.json @@ -30,85 +30,85 @@ "layouts": { "LAYOUT": { "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}, + {"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}, - {"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, "w": 2}, + {"matrix": [5, 1], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 5], "x": 13, "y": 0}, + {"matrix": [5, 6], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0, "w": 2}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1, "w": 1.5}, - {"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}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.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}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1, "w": 1.5}, + {"matrix": [6, 0], "x": 8.5, "y": 1}, + {"matrix": [6, 1], "x": 9.5, "y": 1}, + {"matrix": [6, 2], "x": 10.5, "y": 1}, + {"matrix": [6, 3], "x": 11.5, "y": 1}, + {"matrix": [6, 4], "x": 12.5, "y": 1}, + {"matrix": [6, 5], "x": 13.5, "y": 1}, + {"matrix": [6, 6], "x": 14.5, "y": 1}, + {"matrix": [6, 7], "x": 15.5, "y": 1, "w": 1.5}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2, "w": 1.75}, - {"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}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.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}, - {"x": 14.75, "y": 2, "w": 2.25}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 2}, + {"matrix": [7, 7], "x": 14.75, "y": 2, "w": 2.25}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3, "w": 2.25}, - {"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}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, - {"x": 9.25, "y": 3}, - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3}, - {"x": 13.25, "y": 3}, - {"x": 14.25, "y": 3, "w": 1.75}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 5], "x": 13.25, "y": 3}, + {"matrix": [8, 6], "x": 14.25, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 16, "y": 3}, - {"x": 16, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4, "w": 1.25}, - {"x": 2.25, "y": 4, "w": 1.25}, - {"x": 3.5, "y": 4, "w": 1.25}, - {"x": 4.75, "y": 4}, - {"x": 5.75, "y": 4, "w": 2.25}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2.25}, - {"x": 9, "y": 4, "w": 2.25}, - {"x": 11.25, "y": 4, "w": 1.25}, - {"x": 12.5, "y": 4, "w": 1.25}, - {"x": 13.75, "y": 4, "w": 1.25}, - {"x": 15, "y": 4}, - {"x": 16, "y": 4} + {"matrix": [9, 2], "x": 9, "y": 4, "w": 2.25}, + {"matrix": [9, 3], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 15, "y": 4}, + {"matrix": [9, 7], "x": 16, "y": 4} ] } } diff --git a/keyboards/handwired/unk/rev1/rev1.h b/keyboards/handwired/unk/rev1/rev1.h deleted file mode 100644 index 7f3992eebcf4..000000000000 --- a/keyboards/handwired/unk/rev1/rev1.h +++ /dev/null @@ -1,28 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K71, K72, K73, K74, K75, K76, K77, \ - K10, K11, K12, K13, K14, K15, K16, K80, K81, K82, K83, K84, K85, K86, K87, \ - K20, K21, K22, K23, K24, K25, K26, K91, K92, K93, K94, K95, K96, K97, \ - K30, K31, K32, K33, K34, K35, K36, K101, K102, K103, K104, K105, K106, K107, \ - K40, K41, K42, K43, K44, K45, K112, K113, K114, K115, K116, K117 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05, K06, K07}, \ - { K10, K11, K12, K13, K14, K15, K16, KC_NO}, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO}, \ - { K30, K31, K32, K33, K34, K35, K36, KC_NO}, \ - { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO}, \ -\ - { KC_NO, K71, K72, K73, K74, K75, K76, K77}, \ - { K80, K81, K82, K83, K84, K85, K86, K87}, \ - { KC_NO, K91, K92, K93, K94, K95, K96, K97}, \ - { KC_NO, K101, K102, K103, K104, K105, K106, K107}, \ - { KC_NO, KC_NO, K112, K113, K114, K115, K116, K117} \ - } - -/* -*/ - diff --git a/keyboards/handwired/videowriter/info.json b/keyboards/handwired/videowriter/info.json index bc04ac2b8a93..14c33f399f47 100644 --- a/keyboards/handwired/videowriter/info.json +++ b/keyboards/handwired/videowriter/info.json @@ -21,13 +21,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"menu", "x":1, "y":1, "h":0.75}, {"label":"print", "x":2, "y":1, "h":0.75}, {"label":"spell", "x":3, "y":1, "h":0.75}, {"label":"page", "x":4.5, "y":1, "h":0.75}, {"label":"center", "x":5.5, "y":1, "h":0.75}, {"label":"split", "x":6.5, "y":1, "h":0.75}, {"label":"find", "x":7.5, "y":1, "h":0.75}, {"label":"copy", "x":9, "y":1, "h":0.75}, {"label":"move", "x":10, "y":1, "h":0.75}, {"label":"go to", "x":11, "y":1, "h":0.75}, - {"label":"left", "x":13, "y":0.5}, {"label":"down", "x":14, "y":1}, {"label":"up", "x":14, "y":0}, {"label":"right", "x":15, "y":0.5}, - {"label":"del", "x":0, "y":2.5}, {"label":"1", "x":1, "y":2.5}, {"label":"2", "x":2, "y":2.5}, {"label":"3", "x":3, "y":2.5}, {"label":"4", "x":4, "y":2.5}, {"label":"5", "x":5, "y":2.5}, {"label":"6", "x":6, "y":2.5}, {"label":"7", "x":7, "y":2.5}, {"label":"8", "x":8, "y":2.5}, {"label":"9", "x":9, "y":2.5}, {"label":"0", "x":10, "y":2.5}, {"label":"-", "x":11, "y":2.5}, {"label":"=", "x":12, "y":2.5}, {"label":"backspace", "x":13, "y":2.5, "w":1.5}, {"label":"do", "x":15, "y":2.5, "h":1.33}, - {"label":"tab", "x":0, "y":3.5, "w":1.5}, {"label":"Q", "x":1.5, "y":3.5}, {"label":"W", "x":2.5, "y":3.5}, {"label":"E", "x":3.5, "y":3.5}, {"label":"R", "x":4.5, "y":3.5}, {"label":"T", "x":5.5, "y":3.5}, {"label":"Y", "x":6.5, "y":3.5}, {"label":"U", "x":7.5, "y":3.5}, {"label":"I", "x":8.5, "y":3.5}, {"label":"O", "x":9.5, "y":3.5}, {"label":"P", "x":10.5, "y":3.5}, {"label":"[", "x":11.5, "y":3.5}, {"label":"]", "x":12.5, "y":3.5}, {"label":"help", "x":15, "y":3.833, "h":1.33}, - {"label":"caps lock", "x":0, "y":4.5, "w":1.75}, {"label":"A", "x":1.75, "y":4.5}, {"label":"S", "x":2.75, "y":4.5}, {"label":"D", "x":3.75, "y":4.5}, {"label":"F", "x":4.75, "y":4.5}, {"label":"G", "x":5.75, "y":4.5}, {"label":"H", "x":6.75, "y":4.5}, {"label":"J", "x":7.75, "y":4.5}, {"label":"K", "x":8.75, "y":4.5}, {"label":"L", "x":9.75, "y":4.5}, {"label":";", "x":10.75, "y":4.5}, {"label":"'", "x":11.75, "y":4.5}, {"label":"return", "x":12.75, "y":4.5, "w":1.75}, {"label":"undo", "x":15, "y":5.167, "h":1.33}, - {"label":"shift", "x":0, "y":5.5, "w":2.25}, {"label":"Z", "x":2.25, "y":5.5}, {"label":"X", "x":3.25, "y":5.5}, {"label":"C", "x":4.25, "y":5.5}, {"label":"V", "x":5.25, "y":5.5}, {"label":"B", "x":6.25, "y":5.5}, {"label":"N", "x":7.25, "y":5.5}, {"label":"M", "x":8.25, "y":5.5}, {"label":"<", "x":9.25, "y":5.5}, {"label":">", "x":10.25, "y":5.5}, {"label":"?", "x":11.25, "y":5.5}, {"label":"shift", "x":12.25, "y":5.5, "w":2.25}, - {"label":"style", "x":1.25, "y":6.5, "w":1.5}, {"label":"space", "x":2.75, "y":6.5, "w":9}, {"label":"insert", "x":11.75, "y":6.5, "w":1.5} + {"matrix": [1, 7], "x": 1, "y": 1, "h": 0.75}, + {"matrix": [1, 6], "x": 2, "y": 1, "h": 0.75}, + {"matrix": [1, 5], "x": 3, "y": 1, "h": 0.75}, + + {"matrix": [1, 4], "x": 4.5, "y": 1, "h": 0.75}, + {"matrix": [1, 3], "x": 5.5, "y": 1, "h": 0.75}, + {"matrix": [1, 2], "x": 6.5, "y": 1, "h": 0.75}, + {"matrix": [1, 1], "x": 7.5, "y": 1, "h": 0.75}, + + {"matrix": [1, 0], "x": 9, "y": 1, "h": 0.75}, + {"matrix": [2, 7], "x": 10, "y": 1, "h": 0.75}, + {"matrix": [2, 6], "x": 11, "y": 1, "h": 0.75}, + + {"matrix": [8, 0], "x": 13, "y": 0.5}, + {"matrix": [9, 7], "x": 14, "y": 1}, + {"matrix": [8, 1], "x": 14, "y": 0}, + {"matrix": [9, 6], "x": 15, "y": 0.5}, + + {"matrix": [2, 5], "x": 0, "y": 2.5}, + {"matrix": [2, 4], "x": 1, "y": 2.5}, + {"matrix": [2, 3], "x": 2, "y": 2.5}, + {"matrix": [2, 2], "x": 3, "y": 2.5}, + {"matrix": [2, 1], "x": 4, "y": 2.5}, + {"matrix": [2, 0], "x": 5, "y": 2.5}, + {"matrix": [3, 7], "x": 6, "y": 2.5}, + {"matrix": [3, 6], "x": 7, "y": 2.5}, + {"matrix": [3, 5], "x": 8, "y": 2.5}, + {"matrix": [3, 4], "x": 9, "y": 2.5}, + {"matrix": [3, 3], "x": 10, "y": 2.5}, + {"matrix": [3, 2], "x": 11, "y": 2.5}, + {"matrix": [3, 1], "x": 12, "y": 2.5}, + {"matrix": [3, 0], "x": 13, "y": 2.5, "w": 1.5}, + + {"matrix": [9, 5], "x": 15, "y": 2.5, "h": 1.33}, + + {"matrix": [4, 7], "x": 0, "y": 3.5, "w": 1.5}, + {"matrix": [4, 6], "x": 1.5, "y": 3.5}, + {"matrix": [4, 5], "x": 2.5, "y": 3.5}, + {"matrix": [4, 4], "x": 3.5, "y": 3.5}, + {"matrix": [4, 3], "x": 4.5, "y": 3.5}, + {"matrix": [4, 2], "x": 5.5, "y": 3.5}, + {"matrix": [4, 1], "x": 6.5, "y": 3.5}, + {"matrix": [4, 0], "x": 7.5, "y": 3.5}, + {"matrix": [5, 7], "x": 8.5, "y": 3.5}, + {"matrix": [5, 6], "x": 9.5, "y": 3.5}, + {"matrix": [5, 5], "x": 10.5, "y": 3.5}, + {"matrix": [5, 4], "x": 11.5, "y": 3.5}, + {"matrix": [5, 3], "x": 12.5, "y": 3.5}, + + {"matrix": [9, 4], "x": 15, "y": 3.833, "h": 1.33}, + + {"matrix": [0, 7], "x": 0, "y": 4.5, "w": 1.75}, + {"matrix": [5, 1], "x": 1.75, "y": 4.5}, + {"matrix": [5, 0], "x": 2.75, "y": 4.5}, + {"matrix": [6, 7], "x": 3.75, "y": 4.5}, + {"matrix": [6, 6], "x": 4.75, "y": 4.5}, + {"matrix": [6, 5], "x": 5.75, "y": 4.5}, + {"matrix": [6, 4], "x": 6.75, "y": 4.5}, + {"matrix": [6, 3], "x": 7.75, "y": 4.5}, + {"matrix": [6, 2], "x": 8.75, "y": 4.5}, + {"matrix": [6, 1], "x": 9.75, "y": 4.5}, + {"matrix": [6, 0], "x": 10.75, "y": 4.5}, + {"matrix": [7, 7], "x": 11.75, "y": 4.5}, + {"matrix": [5, 2], "x": 12.75, "y": 4.5, "w": 1.75}, + + {"matrix": [9, 3], "x": 15, "y": 5.167, "h": 1.33}, + + {"matrix": [0, 6], "x": 0, "y": 5.5, "w": 2.25}, + {"matrix": [7, 6], "x": 2.25, "y": 5.5}, + {"matrix": [7, 5], "x": 3.25, "y": 5.5}, + {"matrix": [7, 4], "x": 4.25, "y": 5.5}, + {"matrix": [7, 3], "x": 5.25, "y": 5.5}, + {"matrix": [7, 2], "x": 6.25, "y": 5.5}, + {"matrix": [7, 1], "x": 7.25, "y": 5.5}, + {"matrix": [7, 0], "x": 8.25, "y": 5.5}, + {"matrix": [8, 7], "x": 9.25, "y": 5.5}, + {"matrix": [8, 6], "x": 10.25, "y": 5.5}, + {"matrix": [8, 5], "x": 11.25, "y": 5.5}, + {"matrix": [9, 2], "x": 12.25, "y": 5.5, "w": 2.25}, + + {"matrix": [8, 4], "x": 1.25, "y": 6.5, "w": 1.5}, + {"matrix": [8, 3], "x": 2.75, "y": 6.5, "w": 9}, + {"matrix": [8, 2], "x": 11.75, "y": 6.5, "w": 1.5} ] } } diff --git a/keyboards/handwired/videowriter/videowriter.h b/keyboards/handwired/videowriter/videowriter.h deleted file mode 100644 index f06a5d50aad7..000000000000 --- a/keyboards/handwired/videowriter/videowriter.h +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2019 DmNosachev - * - * 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 XXX KC_NO - -/* - * ,---------------------------------------------------------------------------------------. - * | ,----------------. ,-----------------------. ,--------------. | up | | - * | |menu|print|spell| |page|center|split|find | |copy|move|goto| |left|down|right| - * |---------------------------------------------------------------------------------------| - * |del| 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | BSp| do | - * |---------------------------------------------------------------------------------------| - * |Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | help| - * |-----------------------------------------------------------------------------' |-----| - * |Caps | A | S | D | F | G | H | J | K | L | ; | " | return | undo| - * |---------------------------------------------------------------------------------------| - * | Shift | Z | X | C | V | B | N | M | < | > | ? | Shift | | - * '---------------------------------------------------------------------------------------' - * | style| Space | insert| - * '------------------------------------------------------------------' - */ - -#define LAYOUT( \ - K17, K16, K15, K14, K13, K12, K11, K10, K27, K26, K80, K97, K81, K96, \ - K25, K24, K23, K22, K21, K20, K37, K36, K35, K34, K33, K32, K31, K30, K95, \ - K47, K46, K45, K44, K43, K42, K41, K40, K57, K56, K55, K54, K53, K94, \ - K07, K51, K50, K67, K66, K65, K64, K63, K62, K61, K60, K77, K52, K93, \ - K06, K76, K75, K74, K73, K72, K71, K70, K87, K86, K85, K92, \ - K84, K83, K82 \ -) \ -{ \ - { XXX, XXX, XXX, XXX, XXX, XXX, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, 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, K84, K85, K86, K87 }, \ - { XXX, XXX, K92, K93, K94, K95, K96, K97 } \ -} diff --git a/keyboards/handwired/xealous/rev1/info.json b/keyboards/handwired/xealous/rev1/info.json index 20840f38260f..7401cb24c981 100644 --- a/keyboards/handwired/xealous/rev1/info.json +++ b/keyboards/handwired/xealous/rev1/info.json @@ -18,78 +18,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, + {"matrix": [0, 7], "x": 0, "y": 0}, + {"matrix": [0, 6], "x": 1, "y": 0}, + {"matrix": [0, 5], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [0, 1], "x": 6, "y": 0}, + {"matrix": [5, 6], "x": 7, "y": 0}, + {"matrix": [5, 5], "x": 8, "y": 0}, + {"matrix": [5, 4], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 1], "x": 12, "y": 0}, + {"matrix": [5, 0], "x": 13, "y": 0, "w": 2}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, + {"matrix": [1, 7], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 6], "x": 1.5, "y": 1}, + {"matrix": [1, 5], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 2], "x": 5.5, "y": 1}, + {"matrix": [6, 7], "x": 6.5, "y": 1}, + {"matrix": [6, 6], "x": 7.5, "y": 1}, + {"matrix": [6, 5], "x": 8.5, "y": 1}, + {"matrix": [6, 4], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 2], "x": 11.5, "y": 1}, + {"matrix": [6, 1], "x": 12.5, "y": 1}, + {"matrix": [6, 0], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x": 4.5,"y":1}, - {"label":"T", "x":5.5, "y":1}, + {"matrix": [2, 7], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 6], "x": 1.75, "y": 2}, + {"matrix": [2, 5], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 2], "x": 5.75, "y": 2}, + {"matrix": [7, 6], "x": 6.75, "y": 2}, + {"matrix": [7, 5], "x": 7.75, "y": 2}, + {"matrix": [7, 4], "x": 8.75, "y": 2}, + {"matrix": [7, 3], "x": 9.75, "y": 2}, + {"matrix": [7, 2], "x": 10.75, "y": 2}, + {"matrix": [7, 1], "x": 11.75, "y": 2}, + {"matrix": [7, 0], "x": 12.75, "y": 2, "w": 2.25}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, + {"matrix": [3, 7], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 2.25, "y": 3}, + {"matrix": [3, 5], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 3], "x": 5.25, "y": 3}, + {"matrix": [3, 2], "x": 6.25, "y": 3}, + {"matrix": [8, 5], "x": 7.25, "y": 3}, + {"matrix": [8, 4], "x": 8.25, "y": 3}, + {"matrix": [8, 3], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 1], "x": 11.25, "y": 3}, + {"matrix": [8, 0], "x": 12.25, "y": 3, "w": 2.75}, - {"label":"CapsLock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":1.25}, - {"x":5, "y":4, "w":2.25}, - - {"x":7.25, "y":4, "w":2.75}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4, "w":1.25}, - {"label":"Menu", "x":12.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":13.75, "y":4, "w":1.25} + {"matrix": [4, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 5, "y": 4, "w": 2.25}, + {"matrix": [9, 4], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [9, 3], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/handwired/xealous/rev1/rev1.h b/keyboards/handwired/xealous/rev1/rev1.h deleted file mode 100644 index ce8d68c2c109..000000000000 --- a/keyboards/handwired/xealous/rev1/rev1.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R17, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, R44, R43, R42, R41, R40 \ -) { \ - { XXX, L06, L05, L04, L03, L02, L01, L00 }, \ - { XXX, XXX, L15, L14, L13, L12, L11, L10 }, \ - { XXX, XXX, L25, L24, L23, L22, L21, L20 }, \ - { XXX, XXX, L35, L34, L33, L32, L31, L30 }, \ - { XXX, XXX, XXX, L44, L43, L42, L41, L40 }, \ - { R00, R01, R02, R03, R04, R05, R06, XXX }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, XXX }, \ - { R30, R31, R32, R33, R34, R35, XXX, XXX }, \ - { R40, R41, R42, R43, R44, XXX, XXX, XXX } \ -} diff --git a/keyboards/handwired/z150/info.json b/keyboards/handwired/z150/info.json index 6b93b73e20ab..373c80ac7fbb 100644 --- a/keyboards/handwired/z150/info.json +++ b/keyboards/handwired/z150/info.json @@ -17,7 +17,101 @@ "bootloader": "stm32duino", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.5, "y":0}, {"label":"!", "x":3.5, "y":0}, {"label":"@", "x":4.5, "y":0}, {"label":"#", "x":5.5, "y":0}, {"label":"$", "x":6.5, "y":0}, {"label":"%", "x":7.5, "y":0}, {"label":"^", "x":8.5, "y":0}, {"label":"&", "x":9.5, "y":0}, {"label":"*", "x":10.5, "y":0}, {"label":"(", "x":11.5, "y":0}, {"label":")", "x":12.5, "y":0}, {"label":"_", "x":13.5, "y":0}, {"label":"+", "x":14.5, "y":0}, {"label":"Backspace", "x":15.5, "y":0, "w":1.75}, {"label":"", "x":17.25, "y":0}, {"label":"", "x":18.25, "y":0, "w":1.5}, {"label":"", "x":19.75, "y":0, "w":1.5}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.5, "y":1, "w":1.5}, {"label":"Q", "x":4, "y":1}, {"label":"W", "x":5, "y":1}, {"label":"E", "x":6, "y":1}, {"label":"R", "x":7, "y":1}, {"label":"T", "x":8, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1, "w":1.25}, {"label":"7", "x":17.25, "y":1}, {"label":"8", "x":18.25, "y":1}, {"label":"9", "x":19.25, "y":1}, {"label":"PrtSc", "x":20.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Ctrl", "x":2.5, "y":2, "w":1.75}, {"label":"A", "x":4.25, "y":2}, {"label":"S", "x":5.25, "y":2}, {"label":"D", "x":6.25, "y":2}, {"label":"F", "x":7.25, "y":2}, {"label":"G", "x":8.25, "y":2}, {"label":"H", "x":9.25, "y":2}, {"label":"J", "x":10.25, "y":2}, {"label":"K", "x":11.25, "y":2}, {"label":"L", "x":12.25, "y":2}, {"label":":", "x":13.25, "y":2}, {"label":"\"", "x":14.25, "y":2}, {"label":"Enter", "x":15.25, "y":2, "w":2}, {"label":"4", "x":17.25, "y":2}, {"label":"5", "x":18.25, "y":2}, {"label":"6", "x":19.25, "y":2}, {"label":"\u0432\u0402\u201c", "x":20.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.5, "y":3, "w":2.25}, {"label":"Z", "x":4.75, "y":3}, {"label":"X", "x":5.75, "y":3}, {"label":"C", "x":6.75, "y":3}, {"label":"V", "x":7.75, "y":3}, {"label":"B", "x":8.75, "y":3}, {"label":"N", "x":9.75, "y":3}, {"label":"M", "x":10.75, "y":3}, {"label":"<", "x":11.75, "y":3}, {"label":">", "x":12.75, "y":3}, {"label":"?", "x":13.75, "y":3}, {"label":"Shift", "x":14.75, "y":3, "w":1.5}, {"label":"|", "x":16.25, "y":3}, {"label":"1", "x":17.25, "y":3}, {"label":"2", "x":18.25, "y":3}, {"label":"6", "x":19.25, "y":3}, {"label":"+", "x":20.25, "y":3, "h":2}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.75}, {"label":"~", "x":4.25, "y":4}, {"x":5.25, "y":4, "w":9}, {"label":"CapsLock", "x":14.25, "y":4, "w":2}, {"label":"0", "x":16.25, "y":4, "w":2}, {"label":".", "x":18.25, "y":4, "w":2}] + "layout": [ + {"matrix": [3, 5], "x": 0, "y": 0}, + {"matrix": [3, 4], "x": 1, "y": 0}, + + {"matrix": [10, 7], "x": 2.5, "y": 0}, + {"matrix": [10, 6], "x": 3.5, "y": 0}, + {"matrix": [10, 5], "x": 4.5, "y": 0}, + {"matrix": [10, 4], "x": 5.5, "y": 0}, + {"matrix": [10, 3], "x": 6.5, "y": 0}, + {"matrix": [10, 2], "x": 7.5, "y": 0}, + {"matrix": [10, 1], "x": 8.5, "y": 0}, + {"matrix": [10, 0], "x": 9.5, "y": 0}, + {"matrix": [9, 7], "x": 10.5, "y": 0}, + {"matrix": [9, 6], "x": 11.5, "y": 0}, + {"matrix": [9, 5], "x": 12.5, "y": 0}, + {"matrix": [9, 4], "x": 13.5, "y": 0}, + {"matrix": [9, 3], "x": 14.5, "y": 0}, + {"matrix": [9, 2], "x": 15.5, "y": 0, "w": 1.75}, + {"matrix": [5, 7], "x": 17.25, "y": 0}, + {"matrix": [2, 3], "x": 18.25, "y": 0, "w": 1.5}, + {"matrix": [2, 2], "x": 19.75, "y": 0, "w": 1.5}, + + {"matrix": [3, 3], "x": 0, "y": 1}, + {"matrix": [3, 2], "x": 1, "y": 1}, + + {"matrix": [9, 1], "x": 2.5, "y": 1, "w": 1.5}, + {"matrix": [9, 0], "x": 4, "y": 1}, + {"matrix": [8, 7], "x": 5, "y": 1}, + {"matrix": [8, 6], "x": 6, "y": 1}, + {"matrix": [8, 5], "x": 7, "y": 1}, + {"matrix": [8, 4], "x": 8, "y": 1}, + {"matrix": [8, 3], "x": 9, "y": 1}, + {"matrix": [8, 2], "x": 10, "y": 1}, + {"matrix": [8, 1], "x": 11, "y": 1}, + {"matrix": [8, 0], "x": 12, "y": 1}, + {"matrix": [7, 7], "x": 13, "y": 1}, + {"matrix": [7, 6], "x": 14, "y": 1}, + {"matrix": [7, 5], "x": 15, "y": 1, "w": 1.25}, + {"matrix": [2, 1], "x": 17.25, "y": 1}, + {"matrix": [2, 0], "x": 18.25, "y": 1}, + {"matrix": [1, 7], "x": 19.25, "y": 1}, + {"matrix": [1, 6], "x": 20.25, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 2}, + {"matrix": [3, 0], "x": 1, "y": 2}, + + {"matrix": [7, 3], "x": 2.5, "y": 2, "w": 1.75}, + {"matrix": [7, 2], "x": 4.25, "y": 2}, + {"matrix": [7, 1], "x": 5.25, "y": 2}, + {"matrix": [7, 0], "x": 6.25, "y": 2}, + {"matrix": [6, 7], "x": 7.25, "y": 2}, + {"matrix": [6, 6], "x": 8.25, "y": 2}, + {"matrix": [6, 5], "x": 9.25, "y": 2}, + {"matrix": [6, 4], "x": 10.25, "y": 2}, + {"matrix": [6, 3], "x": 11.25, "y": 2}, + {"matrix": [6, 2], "x": 12.25, "y": 2}, + {"matrix": [6, 1], "x": 13.25, "y": 2}, + {"matrix": [6, 0], "x": 14.25, "y": 2}, + {"matrix": [7, 4], "x": 15.25, "y": 2, "w": 2}, + {"matrix": [1, 5], "x": 17.25, "y": 2}, + {"matrix": [1, 4], "x": 18.25, "y": 2}, + {"matrix": [1, 3], "x": 19.25, "y": 2}, + {"matrix": [1, 2], "x": 20.25, "y": 2}, + + {"matrix": [2, 6], "x": 0, "y": 3}, + {"matrix": [2, 7], "x": 1, "y": 3}, + + {"matrix": [5, 6], "x": 2.5, "y": 3, "w": 2.25}, + {"matrix": [5, 4], "x": 4.75, "y": 3}, + {"matrix": [5, 3], "x": 5.75, "y": 3}, + {"matrix": [5, 2], "x": 6.75, "y": 3}, + {"matrix": [5, 1], "x": 7.75, "y": 3}, + {"matrix": [5, 0], "x": 8.75, "y": 3}, + {"matrix": [4, 7], "x": 9.75, "y": 3}, + {"matrix": [4, 6], "x": 10.75, "y": 3}, + {"matrix": [4, 5], "x": 11.75, "y": 3}, + {"matrix": [4, 4], "x": 12.75, "y": 3}, + {"matrix": [4, 3], "x": 13.75, "y": 3}, + {"matrix": [4, 2], "x": 14.75, "y": 3, "w": 1.5}, + {"matrix": [4, 1], "x": 16.25, "y": 3}, + {"matrix": [1, 1], "x": 17.25, "y": 3}, + {"matrix": [1, 0], "x": 18.25, "y": 3}, + {"matrix": [0, 7], "x": 19.25, "y": 3}, + {"matrix": [0, 4], "x": 20.25, "y": 3, "h": 2}, + + {"matrix": [2, 4], "x": 0, "y": 4}, + {"matrix": [2, 5], "x": 1, "y": 4}, + + {"matrix": [4, 0], "x": 2.5, "y": 4, "w": 1.75}, + {"matrix": [5, 5], "x": 4.25, "y": 4}, + {"matrix": [3, 7], "x": 5.25, "y": 4, "w": 9}, + {"matrix": [3, 6], "x": 14.25, "y": 4, "w": 2}, + {"matrix": [0, 6], "x": 16.25, "y": 4, "w": 2}, + {"matrix": [0, 5], "x": 18.25, "y": 4, "w": 2} + ] } } } diff --git a/keyboards/handwired/z150/z150.c b/keyboards/handwired/z150/z150.c index cf49c87ef052..a887a95bfd20 100644 --- a/keyboards/handwired/z150/z150.c +++ b/keyboards/handwired/z150/z150.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "z150.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(NUM_LOCK_LED_PIN); diff --git a/keyboards/handwired/z150/z150.h b/keyboards/handwired/z150/z150.h deleted file mode 100644 index 1a1c89f32b81..000000000000 --- a/keyboards/handwired/z150/z150.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 DmNosachev - * - * 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" - -/* readability */ -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - K35, K34, KA7, KA6, KA5, KA4, KA3, KA2, KA1, KA0, K97, K96, K95, K94, K93, K92, K57, K23, K22, \ - K33, K32, K91, K90, K87, K86, K85, K84, K83, K82, K81, K80, K77, K76, K75, K21, K20, K17, K16, \ - K31, K30, K73, K72, K71, K70, K67, K66, K65, K64, K63, K62, K61, K60, K74, K15, K14, K13, K12, \ - K26, K27, K56, K54, K53, K52, K51, K50, K47, K46, K45, K44, K43, K42, K41, K11, K10, K07, K04, \ - K24, K25, K40, K55, K37, K36, K06, K05 \ -) \ -{ \ -/* 0 */ { XXX, XXX, XXX, XXX, K04, K05, K06, K07 }, \ -/* 1 */ { K10, K11, K12, K13, K14, K15, K16, K17 }, \ -/* 2 */ { K20, K21, K22, K23, K24, K25, K26, K27 }, \ -/* 3 */ { K30, K31, K32, K33, K34, K35, K36, K37 }, \ -/* 4 */ { K40, K41, K42, K43, K44, K45, K46, K47 }, \ -/* 5 */ { K50, K51, K52, K53, K54, K55, K56, K57 }, \ -/* 6 */ { K60, K61, K62, K63, K64, K65, K66, K67 }, \ -/* 7 */ { K70, K71, K72, K73, K74, K75, K76, K77 }, \ -/* 8 */ { K80, K81, K82, K83, K84, K85, K86, K87 }, \ -/* 9 */ { K90, K91, K92, K93, K94, K95, K96, K97 }, \ -/* A */ { KA0, KA1, KA2, KA3, KA4, KA5, KA6, KA7 } \ -} -/* 0 1 2 3 4 5 6 7 */ - diff --git a/keyboards/handwired/zergo/info.json b/keyboards/handwired/zergo/info.json index 6a472c3302db..460428388b57 100644 --- a/keyboards/handwired/zergo/info.json +++ b/keyboards/handwired/zergo/info.json @@ -18,87 +18,95 @@ "layouts": { "LAYOUT": { "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":"Del", "x":0, "y":1.25}, - {"label":"`", "x":1, "y":1.25}, - {"label":"1", "x":2, "y":1.25}, - {"label":"2", "x":3, "y":1.25}, - {"label":"3", "x":4, "y":1.25}, - {"label":"4", "x":5, "y":1.25}, - {"label":"5", "x":6, "y":1.25}, - {"label":"6", "x":7, "y":1.25}, - {"label":"7", "x":8, "y":1.25}, - {"label":"8", "x":9, "y":1.25}, - {"label":"9", "x":10, "y":1.25}, - {"label":"0", "x":11, "y":1.25}, - {"label":"-", "x":12, "y":1.25}, - {"label":"=", "x":13, "y":1.25}, - {"label":"Backspace", "x":14, "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":"modifier", "x":6.5, "y":2.25}, - {"label":"Y", "x":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"{", "x":12.5, "y":2.25}, - {"label":"|", "x":13.5, "y":2.25, "w":1.5}, - {"label":"modifier", "x":0, "y":3.25, "w":1.25}, - {"label":"A", "x":1.25, "y":3.25}, - {"label":"S", "x":2.25, "y":3.25}, - {"label":"D", "x":3.25, "y":3.25}, - {"label":"F", "x":4.25, "y":3.25}, - {"label":"G", "x":5.25, "y":3.25}, - {"label":"H", "x":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":":", "x":11.75, "y":3.25}, - {"label":"\"", "x":12.75, "y":3.25}, - {"label":"modifier", "x":13.75, "y":3.25, "w":1.25}, - {"label":"LShift", "x":0, "y":4.25}, - {"label":"Z", "x":1, "y":4.25}, - {"label":"X", "x":2, "y":4.25}, - {"label":"C", "x":3, "y":4.25}, - {"label":"V", "x":4, "y":4.25}, - {"label":"B", "x":5, "y":4.25}, - {"label":"Backspace", "x":6, "y":4.25, "w":2}, - {"label":"N", "x":8, "y":4.25}, - {"label":"M", "x":9, "y":4.25}, - {"label":"<", "x":10, "y":4.25}, - {"label":">", "x":11, "y":4.25}, - {"label":"?", "x":12, "y":4.25}, - {"label":"}", "x":13, "y":4.25}, - {"label":"Rshift", "x":14, "y":4.25}, - {"label":"LControl", "x":0, "y":5.25}, - {"label":"free-1", "x":1, "y":5.25}, - {"label":"free-2", "x":2, "y":5.25}, - {"label":"LAlt", "x":3, "y":5.25, "w":1.25}, - {"label":"Space", "x":4.25, "y":5.25, "w":2.25}, - {"label":"Enter", "x":6.5, "y":5.25}, - {"label":"Space", "x":7.5, "y":5.25, "w":2.75}, - {"label":"RAlt", "x":10.25, "y":5.25, "w":1.25}, - {"label":"Win", "x":11.5, "y":5.25, "w":1.25}, - {"label":"Menu", "x":12.75, "y":5.25, "w":1.25}, - {"label":"RControl", "x":14, "y":5.25} - ] + {"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": [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": [2, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 6], "x": 7, "y": 1.25}, + {"matrix": [1, 7], "x": 8, "y": 1.25}, + {"matrix": [1, 8], "x": 9, "y": 1.25}, + {"matrix": [1, 9], "x": 10, "y": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 1.25}, + {"matrix": [1, 11], "x": 12, "y": 1.25}, + {"matrix": [1, 12], "x": 13, "y": 1.25}, + {"matrix": [1, 13], "x": 14, "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": [3, 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": [3, 0], "x": 0, "y": 3.25, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3.25}, + {"matrix": [3, 4], "x": 4.25, "y": 3.25}, + {"matrix": [3, 5], "x": 5.25, "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}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "y": 4.25}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4.25}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 4.25}, + {"matrix": [4, 6], "x": 6, "y": 4.25, "w": 2}, + {"matrix": [4, 7], "x": 8, "y": 4.25}, + {"matrix": [4, 8], "x": 9, "y": 4.25}, + {"matrix": [4, 9], "x": 10, "y": 4.25}, + {"matrix": [4, 10], "x": 11, "y": 4.25}, + {"matrix": [4, 11], "x": 12, "y": 4.25}, + {"matrix": [4, 12], "x": 13, "y": 4.25}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 4.25, "y": 5.25, "w": 2.25}, + {"matrix": [5, 6], "x": 6.5, "y": 5.25}, + {"matrix": [5, 7], "x": 7.5, "y": 5.25, "w": 2.75}, + {"matrix": [5, 9], "x": 10.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25} + ] } } } diff --git a/keyboards/handwired/zergo/zergo.h b/keyboards/handwired/zergo/zergo.h deleted file mode 100644 index ba6532164d12..000000000000 --- a/keyboards/handwired/zergo/zergo.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 E.Zelianin - * - * 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( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K206, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K306, K207, K208, K209, K210, K211, K212, K213, \ - K300, K301, K302, K303, K304, K305, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \ - K500, K501, K502, K503, K505, K506, K507, K509, K510, K512, K513 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \ - { K500, K501, K502, K503, KC_NO, K505, K506, K507, KC_NO, K509, K510, KC_NO, K512, K513 } \ -} diff --git a/keyboards/heliar/wm1_hotswap/info.json b/keyboards/heliar/wm1_hotswap/info.json index 77bf189dabc7..b534f6e8d68d 100644 --- a/keyboards/heliar/wm1_hotswap/info.json +++ b/keyboards/heliar/wm1_hotswap/info.json @@ -21,74 +21,88 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0}, - {"label": "k04", "x": 4, "y": 0}, - {"label": "k05", "x": 5, "y": 0}, - {"label": "k06", "x": 6, "y": 0}, - {"label": "k07", "x": 9, "y": 0}, - {"label": "k08", "x": 10, "y": 0}, - {"label": "k09", "x": 11, "y": 0}, - {"label": "k0a", "x": 12, "y": 0}, - {"label": "k0b", "x": 13, "y": 0}, - {"label": "k0c", "x": 14, "y": 0}, - {"label": "k0d", "x": 15, "y": 0, "w": 2}, - {"label": "k0e", "x": 17.25, "y": 0}, - {"label": "k10", "x": 0, "y": 1, "w": 1.5}, - {"label": "k11", "x": 1.5, "y": 1}, - {"label": "k12", "x": 2.5, "y": 1}, - {"label": "k13", "x": 3.5, "y": 1}, - {"label": "k14", "x": 4.5, "y": 1}, - {"label": "k15", "x": 5.5, "y": 1}, - {"label": "k16", "x": 8.5, "y": 1}, - {"label": "k17", "x": 9.5, "y": 1}, - {"label": "k18", "x": 10.5, "y": 1}, - {"label": "k19", "x": 11.5, "y": 1}, - {"label": "k1a", "x": 12.5, "y": 1}, - {"label": "k1b", "x": 13.5, "y": 1}, - {"label": "k1c", "x": 14.5, "y": 1}, - {"label": "k1d", "x": 15.5, "y": 1, "w": 1.5}, - {"label": "k1e", "x": 17.25, "y": 1}, - {"label": "k20", "x": 0, "y": 2, "w": 1.75}, - {"label": "k21", "x": 1.75, "y": 2}, - {"label": "k22", "x": 2.75, "y": 2}, - {"label": "k23", "x": 3.75, "y": 2}, - {"label": "k24", "x": 4.75, "y": 2}, - {"label": "k25", "x": 5.75, "y": 2}, - {"label": "k26", "x": 8.75, "y": 2}, - {"label": "k27", "x": 9.75, "y": 2}, - {"label": "k28", "x": 10.75, "y": 2}, - {"label": "k29", "x": 11.75, "y": 2}, - {"label": "k2a", "x": 12.75, "y": 2}, - {"label": "k2b", "x": 13.75, "y": 2}, - {"label": "k2d", "x": 14.75, "y": 2, "w": 2.25}, - {"label": "k2e", "x": 17.25, "y": 2}, - {"label": "k30", "x": 0, "y": 3, "w": 2.25}, - {"label": "k31", "x": 2.25, "y": 3}, - {"label": "k32", "x": 3.25, "y": 3}, - {"label": "k33", "x": 4.25, "y": 3}, - {"label": "k34", "x": 5.25, "y": 3}, - {"label": "k35", "x": 6.25, "y": 3}, - {"label": "k36", "x": 8.25, "y": 3}, - {"label": "k37", "x": 9.25, "y": 3}, - {"label": "k38", "x": 10.25, "y": 3}, - {"label": "k39", "x": 11.25, "y": 3}, - {"label": "k3a", "x": 12.25, "y": 3}, - {"label": "k3b", "x": 13.25, "y": 3}, - {"label": "k3c", "x": 14.25, "y": 3, "w": 1.75}, - {"label": "k3d", "x": 16.25, "y": 3.25}, - {"label": "k40", "x": 0, "y": 4, "w": 1.5}, - {"label": "k42", "x": 3, "y": 4, "w": 1.5}, - {"label": "k43", "x": 4.5, "y": 4}, - {"label": "k44", "x": 5.5, "y": 4, "w": 2}, - {"label": "k46", "x": 8.25, "y": 4, "w": 2.75}, - {"label": "k49", "x": 11, "y": 4, "w": 1.5}, - {"label": "k4b", "x": 13.5, "y": 4, "w": 1.5}, - {"label": "k4c", "x": 15.25, "y": 4.25}, - {"label": "k4d", "x": 16.25, "y": 4.25}, - {"label": "k4e", "x": 17.25, "y": 4.25} + {"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": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "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, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1}, + {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.75, "y": 2}, + {"matrix": [2, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 8], "x": 10.75, "y": 2}, + {"matrix": [2, 9], "x": 11.75, "y": 2}, + {"matrix": [2, 10], "x": 12.75, "y": 2}, + {"matrix": [2, 11], "x": 13.75, "y": 2}, + {"matrix": [2, 13], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 8.25, "y": 3}, + {"matrix": [3, 7], "x": 9.25, "y": 3}, + {"matrix": [3, 8], "x": 10.25, "y": 3}, + {"matrix": [3, 9], "x": 11.25, "y": 3}, + {"matrix": [3, 10], "x": 12.25, "y": 3}, + {"matrix": [3, 11], "x": 13.25, "y": 3}, + {"matrix": [3, 12], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4}, + {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 2}, + + {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 13.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 4.25}, + {"matrix": [4, 13], "x": 16.25, "y": 4.25}, + {"matrix": [4, 14], "x": 17.25, "y": 4.25} ] } } diff --git a/keyboards/heliar/wm1_hotswap/wm1_hotswap.c b/keyboards/heliar/wm1_hotswap/wm1_hotswap.c index 08f1469e3d28..846729a3f0ab 100644 --- a/keyboards/heliar/wm1_hotswap/wm1_hotswap.c +++ b/keyboards/heliar/wm1_hotswap/wm1_hotswap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "wm1_hotswap.h" +#include "quantum.h" void keyboard_pre_init_kb(void) diff --git a/keyboards/heliar/wm1_hotswap/wm1_hotswap.h b/keyboards/heliar/wm1_hotswap/wm1_hotswap.h deleted file mode 100644 index 295fc8097c3e..000000000000 --- a/keyboards/heliar/wm1_hotswap/wm1_hotswap.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 HELIAR MK - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K42, K43, K44, K46, K49, K4B, K4C, K4D, K4E \ -)\ -{\ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO},\ - {K40, KC_NO, K42, K43, K44, KC_NO,K46, KC_NO, KC_NO, K49, KC_NO, K4B, K4C, K4D, K4E} \ -} diff --git a/keyboards/helix/rev3_4rows/info.json b/keyboards/helix/rev3_4rows/info.json index db9d76069206..16a455f59d73 100644 --- a/keyboards/helix/rev3_4rows/info.json +++ b/keyboards/helix/rev3_4rows/info.json @@ -27,10 +27,63 @@ "layouts": { "LAYOUT": { "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3} + {"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": [4, 5], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 1], "x": 13, "y": 0}, + {"matrix": [4, 0], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [5, 5], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 1], "x": 13, "y": 1}, + {"matrix": [5, 0], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [6, 5], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 1], "x": 13, "y": 2}, + {"matrix": [6, 0], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [7, 6], "x": 8, "y": 3}, + {"matrix": [7, 5], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 3], "x": 11, "y": 3}, + {"matrix": [7, 2], "x": 12, "y": 3}, + {"matrix": [7, 1], "x": 13, "y": 3}, + {"matrix": [7, 0], "x": 14, "y": 3} ] } } diff --git a/keyboards/helix/rev3_4rows/rev3_4rows.h b/keyboards/helix/rev3_4rows/rev3_4rows.h index dc1e2d5da471..f36a5f28406d 100644 --- a/keyboards/helix/rev3_4rows/rev3_4rows.h +++ b/keyboards/helix/rev3_4rows/rev3_4rows.h @@ -20,28 +20,3 @@ bool is_mac_mode(void); void set_mac_mode(bool macmode); - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { R05, R04, R03, R02, R01, R00, KC_NO }, \ - { R15, R14, R13, R12, R11, R10, KC_NO }, \ - { R25, R24, R23, R22, R21, R20, KC_NO }, \ - { R35, R34, R33, R32, R31, R30, R36 }, \ - } diff --git a/keyboards/helix/rev3_5rows/info.json b/keyboards/helix/rev3_5rows/info.json index abd4f64ab176..511923515111 100644 --- a/keyboards/helix/rev3_5rows/info.json +++ b/keyboards/helix/rev3_5rows/info.json @@ -27,11 +27,79 @@ "layouts": { "LAYOUT": { "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":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "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": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [9, 6], "x": 8, "y": 4}, + {"matrix": [9, 5], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.c b/keyboards/helix/rev3_5rows/rev3_5rows.c index 28fa314a7ba2..921558e80d90 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.c +++ b/keyboards/helix/rev3_5rows/rev3_5rows.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev3_5rows.h" +#include "quantum.h" bool is_mac_mode(void) { return keymap_config.swap_lalt_lgui == false; diff --git a/keyboards/helix/rev3_5rows/rev3_5rows.h b/keyboards/helix/rev3_5rows/rev3_5rows.h index 1e3121d7135d..f36a5f28406d 100644 --- a/keyboards/helix/rev3_5rows/rev3_5rows.h +++ b/keyboards/helix/rev3_5rows/rev3_5rows.h @@ -20,31 +20,3 @@ bool is_mac_mode(void); void set_mac_mode(bool macmode); - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R05, R04, R03, R02, R01, R00, KC_NO }, \ - { R15, R14, R13, R12, R11, R10, KC_NO }, \ - { R25, R24, R23, R22, R21, R20, KC_NO }, \ - { R35, R34, R33, R32, R31, R30, R36 }, \ - { R45, R44, R43, R42, R41, R40, R46 } \ - } diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index efdea0336c97..329b07fab788 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -25,94 +25,103 @@ "layouts": { "LAYOUT": { "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": "PrtSc", "x": 15.25, "y": 0 }, + {"matrix": [0, 0], "x": 0, "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": "Bksp", "x": 14, "y": 1.25 }, - { "label": "Insert", "x": 15.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 }, + {"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": 13.75, "y": 3.25, "w": 1.25 }, - { "label": "End", "x": 16.25, "y": 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": 1.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": 1.75 }, - { "label": "Up", "x": 16.25, "y": 4.25 }, - { "label": "Up", "x": 16.25, "y": 4.25 }, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, - { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 }, - { "label": "Win", "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": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 }, - { "label": "Ctrl", "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": [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": 14, "y": 1.25}, + + {"matrix": [1, 15], "x": 15.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, 15], "x": 15.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": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [3, 15], "x": 16.25, "y": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.25}, + {"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, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "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/hfdkb/keyboard_sw/k83/k83.c b/keyboards/hfdkb/keyboard_sw/k83/k83.c index f21ac50cd7cf..86b52cfe9287 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/k83.c +++ b/keyboards/hfdkb/keyboard_sw/k83/k83.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "k83.h" +#include "quantum.h" + // clang-format off #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/hfdkb/keyboard_sw/k83/k83.h b/keyboards/hfdkb/keyboard_sw/k83/k83.h deleted file mode 100644 index 17f6187b0167..000000000000 --- a/keyboards/hfdkb/keyboard_sw/k83/k83.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2022 jonylee@hfd - * - * 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(\ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K315, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K413, K414, K415, \ - K500, K501, K502, K505, K509, K510, K511, K513, K514, K515 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, KC_NO, K413, K414, K415 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, KC_NO, K513, K514, K515 } \ -} -// clang-format on - - - diff --git a/keyboards/hhkb/ansi/ansi.h b/keyboards/hhkb/ansi/ansi.h deleted file mode 100644 index 28e8d2fef89b..000000000000 --- a/keyboards/hhkb/ansi/ansi.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ - K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ - K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ - K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ - K35, K36, K37, K57, K56) \ - \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ -} - -#define LAYOUT_60_hhkb LAYOUT diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json index c892d2b14b21..16349fc6e27f 100644 --- a/keyboards/hhkb/ansi/info.json +++ b/keyboards/hhkb/ansi/info.json @@ -9,69 +9,76 @@ "device_version": "1.0.4" }, "community_layouts": ["60_hhkb"], + "layout_aliases": { + "LAYOUT_60_hhkb": "LAYOUT" + }, "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "@", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "|", "x": 13, "y": 0 }, - { "label": "~", "x": 14, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "{", "x": 11.5, "y": 1 }, - { "label": "}", "x": 12.5, "y": 1 }, - { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Control", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "\"", "x": 11.75, "y": 2 }, - { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "<", "x": 9.25, "y": 3 }, - { "label": ">", "x": 10.25, "y": 3 }, - { "label": "?", "x": 11.25, "y": 3 }, - { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Fn", "x": 14, "y": 3 }, - { "label": "", "x": 1.5, "y": 4 }, - { "label": "", "x": 2.5, "y": 4, "w": 1.5 }, - { "x": 4, "y": 4, "w": 6 }, - { "label": "", "x": 10, "y": 4, "w": 1.5 }, - { "label": "", "x": 11.5, "y": 4 } + {"matrix": [3, 1], "x": 0, "y": 0}, + {"matrix": [3, 0], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 2, "y": 0}, + {"matrix": [1, 0], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [2, 0], "x": 5, "y": 0}, + {"matrix": [2, 1], "x": 6, "y": 0}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [6, 0], "x": 9, "y": 0}, + {"matrix": [6, 1], "x": 10, "y": 0}, + {"matrix": [7, 0], "x": 11, "y": 0}, + {"matrix": [7, 1], "x": 12, "y": 0}, + {"matrix": [5, 0], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + + {"matrix": [3, 2], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 1}, + {"matrix": [0, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 2], "x": 6.5, "y": 1}, + {"matrix": [4, 2], "x": 7.5, "y": 1}, + {"matrix": [4, 3], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [7, 3], "x": 11.5, "y": 1}, + {"matrix": [7, 2], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 3], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [0, 4], "x": 1.75, "y": 2}, + {"matrix": [0, 3], "x": 2.75, "y": 2}, + {"matrix": [1, 4], "x": 3.75, "y": 2}, + {"matrix": [1, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [5, 3], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 4], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [0, 5], "x": 2.25, "y": 3}, + {"matrix": [0, 6], "x": 3.25, "y": 3}, + {"matrix": [0, 7], "x": 4.25, "y": 3}, + {"matrix": [1, 6], "x": 5.25, "y": 3}, + {"matrix": [1, 7], "x": 6.25, "y": 3}, + {"matrix": [2, 6], "x": 7.25, "y": 3}, + {"matrix": [4, 6], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [7, 6], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [5, 5], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [5, 4], "x": 14, "y": 3}, + + {"matrix": [3, 5], "x": 1.5, "y": 4}, + {"matrix": [3, 6], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [3, 7], "x": 4, "y": 4, "w": 6}, + {"matrix": [5, 7], "x": 10, "y": 4, "w": 1.5}, + {"matrix": [5, 6], "x": 11.5, "y": 4} ] } } diff --git a/keyboards/hhkb_lite_2/hhkb_lite_2.h b/keyboards/hhkb_lite_2/hhkb_lite_2.h deleted file mode 100644 index ccdd765a2307..000000000000 --- a/keyboards/hhkb_lite_2/hhkb_lite_2.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K509, K109, K108, K107, K106, K006, K005, K105, K104, K103, K102, K002, K004, K413, K009, \ - K309, K209, K208, K207, K206, K306, K305, K205, K204, K203, K202, K302, K304, K313, \ - K010, K409, K408, K407, K406, K506, K505, K405, K404, K403, K402, K502, K613, \ - K311, K609, K608, K607, K606, K706, K705, K605, K600, K603, K702, K611, \ - K001, K512, K400, K713, K300, K712, \ - K000, \ - K303, K100, K200 \ -) { \ - { K000, K001, K002, KC_NO, K004, K005, K006, KC_NO, KC_NO, K009, K010, KC_NO, KC_NO, KC_NO }, \ - { K100, KC_NO, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, KC_NO, KC_NO, K309, KC_NO, K311, KC_NO, K313 }, \ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, KC_NO, KC_NO, KC_NO, K413 }, \ - { KC_NO, KC_NO, K502, KC_NO, KC_NO, K505, K506, KC_NO, KC_NO, K509, KC_NO, KC_NO, K512, KC_NO }, \ - { K600, KC_NO, KC_NO, K603, KC_NO, K605, K606, K607, K608, K609, KC_NO, K611, KC_NO, K613 }, \ - { KC_NO, KC_NO, K702, KC_NO, KC_NO, K705, K706, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K712, K713 } \ -} diff --git a/keyboards/hhkb_lite_2/info.json b/keyboards/hhkb_lite_2/info.json index cb3b30805530..9b937416ccc2 100644 --- a/keyboards/hhkb_lite_2/info.json +++ b/keyboards/hhkb_lite_2/info.json @@ -21,75 +21,76 @@ "layouts": { "LAYOUT": { "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}, + {"matrix": [5, 9], "x": 0, "y": 0}, + {"matrix": [1, 9], "x": 1, "y": 0}, + {"matrix": [1, 8], "x": 2, "y": 0}, + {"matrix": [1, 7], "x": 3, "y": 0}, + {"matrix": [1, 6], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [1, 5], "x": 7, "y": 0}, + {"matrix": [1, 4], "x": 8, "y": 0}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [1, 2], "x": 10, "y": 0}, + {"matrix": [0, 2], "x": 11, "y": 0}, + {"matrix": [0, 4], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [0, 9], "x": 14, "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}, + {"matrix": [3, 9], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [2, 9], "x": 1.5, "y": 1}, + {"matrix": [2, 8], "x": 2.5, "y": 1}, + {"matrix": [2, 7], "x": 3.5, "y": 1}, + {"matrix": [2, 6], "x": 4.5, "y": 1}, + {"matrix": [3, 6], "x": 5.5, "y": 1}, + {"matrix": [3, 5], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [2, 3], "x": 9.5, "y": 1}, + {"matrix": [2, 2], "x": 10.5, "y": 1}, + {"matrix": [3, 2], "x": 11.5, "y": 1}, + {"matrix": [3, 4], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w":2.25}, + {"matrix": [0, 10], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [4, 9], "x": 1.75, "y": 2}, + {"matrix": [4, 8], "x": 2.75, "y": 2}, + {"matrix": [4, 7], "x": 3.75, "y": 2}, + {"matrix": [4, 6], "x": 4.75, "y": 2}, + {"matrix": [5, 6], "x": 5.75, "y": 2}, + {"matrix": [5, 5], "x": 6.75, "y": 2}, + {"matrix": [4, 5], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 3], "x": 9.75, "y": 2}, + {"matrix": [4, 2], "x": 10.75, "y": 2}, + {"matrix": [5, 2], "x": 11.75, "y": 2}, + {"matrix": [6, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2.25}, - {"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}, + {"matrix": [3, 11], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [6, 9], "x": 2.25, "y": 3}, + {"matrix": [6, 8], "x": 3.25, "y": 3}, + {"matrix": [6, 7], "x": 4.25, "y": 3}, + {"matrix": [6, 6], "x": 5.25, "y": 3}, + {"matrix": [7, 6], "x": 6.25, "y": 3}, + {"matrix": [7, 5], "x": 7.25, "y": 3}, + {"matrix": [6, 5], "x": 8.25, "y": 3}, + {"matrix": [6, 0], "x": 9.25, "y": 3}, + {"matrix": [6, 3], "x": 10.25, "y": 3}, + {"matrix": [7, 2], "x": 11.25, "y": 3}, + {"matrix": [6, 11], "x": 12.25, "y": 3, "w": 1.75}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4, "w":6}, - {"x":10, "y":4}, - {"x":11, "y":4}, + {"matrix": [0, 1], "x": 14, "y": 3}, - {"x":13.167, "y":4, "w":0.916, "h":0.75}, - {"x":12.25, "y":4.75, "w":0.917, "h":0.75}, - {"x":13.167, "y":4.75, "w":0.916, "h":0.75}, - {"x":14.08, "y":4.75, "w":0.917, "h":0.75} + {"matrix": [5, 12], "x": 2, "y": 4}, + {"matrix": [4, 0], "x": 3, "y": 4}, + {"matrix": [7, 13], "x": 4, "y": 4, "w": 6}, + {"matrix": [3, 0], "x": 10, "y": 4}, + {"matrix": [7, 12], "x": 11, "y": 4}, + {"matrix": [0, 0], "x": 13.167, "y": 4, "w": 0.916, "h": 0.75}, + + {"matrix": [3, 3], "x": 12.25, "y": 4.75, "w": 0.917, "h": 0.75}, + {"matrix": [1, 0], "x": 13.167, "y": 4.75, "w": 0.916, "h": 0.75}, + {"matrix": [2, 0], "x": 14.08, "y": 4.75, "w": 0.917, "h": 0.75} ] } } diff --git a/keyboards/hidtech/bastyl/bastyl.h b/keyboards/hidtech/bastyl/bastyl.h deleted file mode 100644 index 5bacb8bb03ce..000000000000 --- a/keyboards/hidtech/bastyl/bastyl.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2020 Quentin LEBASTARD - * Copyright 2020 Anthony MARIN - * - * 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" - -// SWITCHED 91 and 95 - check on left ? -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ - k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ - k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ - k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ - k43, k44, k41, k91, k94, k93, \ - k45, k42, k92, k95 \ -)\ -{\ - { k00, k01, k02, k03, k04, k05 }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k20, k21, k22, k23, k24, k25 }, \ - { k30, k31, k32, k33, k34, k35 }, \ - { KC_NO, k41, k42, k43, k44, k45 }, \ - { k50, k51, k52, k53, k54, k55 }, \ - { k60, k61, k62, k63, k64, k65 }, \ - { k70, k71, k72, k73, k74, k75 }, \ - { k80, k81, k82, k83, k84, k85 }, \ - { KC_NO, k91, k92, k93, k94, k95 }, \ -} diff --git a/keyboards/hidtech/bastyl/info.json b/keyboards/hidtech/bastyl/info.json index 794d7cc183d1..02b8854e3605 100644 --- a/keyboards/hidtech/bastyl/info.json +++ b/keyboards/hidtech/bastyl/info.json @@ -24,64 +24,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"R00", "x":11, "y":0}, - {"label":"R01", "x":12, "y":0}, - {"label":"R02", "x":13, "y":0}, - {"label":"R03", "x":14, "y":0}, - {"label":"R04", "x":15, "y":0}, - {"label":"R05", "x":16, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"R10", "x":11, "y":1}, - {"label":"R11", "x":12, "y":1}, - {"label":"R12", "x":13, "y":1}, - {"label":"R13", "x":14, "y":1}, - {"label":"R14", "x":15, "y":1}, - {"label":"R15", "x":16, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"R20", "x":11, "y":2}, - {"label":"R21", "x":12, "y":2}, - {"label":"R22", "x":13, "y":2}, - {"label":"R23", "x":14, "y":2}, - {"label":"R24", "x":15, "y":2}, - {"label":"R25", "x":16, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"R30", "x":11, "y":3}, - {"label":"R31", "x":12, "y":3}, - {"label":"R32", "x":13, "y":3}, - {"label":"R33", "x":14, "y":3}, - {"label":"R34", "x":15, "y":3}, - {"label":"R35", "x":16, "y":3}, - {"label":"L43", "x":5, "y":4}, - {"label":"L44", "x":6, "y":4}, - {"label":"L45", "x":7, "y":4}, - {"label":"R40", "x":9, "y":4}, - {"label":"R41", "x":10, "y":4}, - {"label":"R40", "x":11, "y":4}, - {"label":"L52", "x":6, "y":5}, - {"label":"L53", "x":7, "y":5}, - {"label":"R52", "x":9, "y":5}, - {"label":"R53", "x":10, "y":5} + {"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": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 3], "x": 5, "y": 4}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [4, 1], "x": 7, "y": 4}, + + {"matrix": [9, 1], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + + {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [4, 2], "x": 7, "y": 5}, + + {"matrix": [9, 2], "x": 9, "y": 5}, + {"matrix": [9, 5], "x": 10, "y": 5} ] } } diff --git a/keyboards/hillside/46/0_1/0_1.c b/keyboards/hillside/46/0_1/0_1.c index d95805680157..1d7ac1f0633a 100644 --- a/keyboards/hillside/46/0_1/0_1.c +++ b/keyboards/hillside/46/0_1/0_1.c @@ -1,7 +1,7 @@ // Copyright 2022 Michael McCoyd (@mmccoyd) // SPDX-License-Identifier: GPL-2.0-or-later -#include "0_1.h" +#include "quantum.h" // Keymatrix spots to ignore, as one signals handedness and others have no key const matrix_row_t matrix_mask[] = { diff --git a/keyboards/hillside/46/0_1/0_1.h b/keyboards/hillside/46/0_1/0_1.h deleted file mode 100644 index 880b24423783..000000000000 --- a/keyboards/hillside/46/0_1/0_1.h +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2022 Michael McCoyd (@mmccoyd) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a mapping so keymap files can be more readable to humans. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts those identifiers into a two-dimensional array which - * represents the switch matrix. - * - * The identifiers could be anything, but for human sanity have the folowing form - * - */ - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, LT5, RT5, R25, R24, R23, R22, R21, R20, \ - LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { KC_NO, RT1, RT2, RT3, RT4, RT5 } \ - } -// clang-format on diff --git a/keyboards/hillside/46/0_1/info.json b/keyboards/hillside/46/0_1/info.json index 24ed9aa668fd..549bff42a6f8 100644 --- a/keyboards/hillside/46/0_1/info.json +++ b/keyboards/hillside/46/0_1/info.json @@ -44,5 +44,64 @@ }, "ws2812": { "pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 1.13}, + {"matrix": [0, 1], "x": 1, "y": 0.93}, + {"matrix": [0, 2], "x": 2.1, "y": 0.31}, + {"matrix": [0, 3], "x": 3.2, "y": 0}, + {"matrix": [0, 4], "x": 4.2, "y": 0.28}, + {"matrix": [0, 5], "x": 5.2, "y": 0.42}, + + {"matrix": [4, 5], "x": 9.7, "y": 0.42}, + {"matrix": [4, 4], "x": 10.7, "y": 0.28}, + {"matrix": [4, 3], "x": 11.7, "y": 0}, + {"matrix": [4, 2], "x": 12.8, "y": 0.31}, + {"matrix": [4, 1], "x": 13.9, "y": 0.93}, + {"matrix": [4, 0], "x": 14.9, "y": 1.13}, + + {"matrix": [1, 0], "x": 0.1, "y": 2.13}, + {"matrix": [1, 1], "x": 1.1, "y": 1.93}, + {"matrix": [1, 2], "x": 2.15, "y": 1.31}, + {"matrix": [1, 3], "x": 3.2, "y": 1}, + {"matrix": [1, 4], "x": 4.2, "y": 1.28}, + {"matrix": [1, 5], "x": 5.2, "y": 1.42}, + + {"matrix": [5, 5], "x": 9.7, "y": 1.42}, + {"matrix": [5, 4], "x": 10.7, "y": 1.28}, + {"matrix": [5, 3], "x": 11.7, "y": 1}, + {"matrix": [5, 2], "x": 12.75, "y": 1.31}, + {"matrix": [5, 1], "x": 13.8, "y": 1.93}, + {"matrix": [5, 0], "x": 14.8, "y": 2.13}, + + {"matrix": [2, 0], "x": 0.2, "y": 3.13}, + {"matrix": [2, 1], "x": 1.2, "y": 2.93}, + {"matrix": [2, 2], "x": 2.2, "y": 2.31}, + {"matrix": [2, 3], "x": 3.2, "y": 2}, + {"matrix": [2, 4], "x": 4.2, "y": 2.28}, + {"matrix": [2, 5], "x": 5.2, "y": 2.42}, + {"matrix": [3, 5], "x": 6.2, "y": 2.88}, + + {"matrix": [7, 5], "x": 8.7, "y": 2.88}, + {"matrix": [6, 5], "x": 9.7, "y": 2.42}, + {"matrix": [6, 4], "x": 10.7, "y": 2.28}, + {"matrix": [6, 3], "x": 11.7, "y": 2}, + {"matrix": [6, 2], "x": 12.7, "y": 2.31}, + {"matrix": [6, 1], "x": 13.7, "y": 2.93}, + {"matrix": [6, 0], "x": 14.7, "y": 3.13}, + + {"matrix": [3, 1], "x": 3.7, "y": 3.28}, + {"matrix": [3, 2], "x": 4.7, "y": 3.42}, + {"matrix": [3, 3], "x": 5.7, "y": 3.88}, + {"matrix": [3, 4], "x": 6.7, "y": 4.44}, + + {"matrix": [7, 4], "x": 8.2, "y": 4.44}, + {"matrix": [7, 3], "x": 9.2, "y": 3.88}, + {"matrix": [7, 2], "x": 10.2, "y": 3.42}, + {"matrix": [7, 1], "x": 11.2, "y": 3.28} + ] + } } } diff --git a/keyboards/hillside/46/info.json b/keyboards/hillside/46/info.json index 5af9add00faf..67090583a95e 100644 --- a/keyboards/hillside/46/info.json +++ b/keyboards/hillside/46/info.json @@ -5,69 +5,5 @@ "keyboard_name": "Hillside 46", "url": "http://github.com/mmccoyd/hillside/", - "tags": ["split", "column stagger", "choc v1", "choc spaced" ], - - "layouts": { - "LAYOUT": { - "layout": [ - - {"label": "`~", "x": 0, "y": 1.13}, - {"label": "Q", "x": 1, "y": 0.93}, - {"label": "W", "x": 2.1, "y": 0.31}, - {"label": "E", "x": 3.2, "y": 0}, - {"label": "R", "x": 4.2, "y": 0.28}, - {"label": "T", "x": 5.2, "y": 0.42}, - - {"label": "Y", "x": 9.7, "y": 0.42}, - {"label": "U", "x": 10.7, "y": 0.28}, - {"label": "I", "x": 11.7, "y": 0}, - {"label": "O", "x": 12.8, "y": 0.31}, - {"label": "P", "x": 13.9, "y": 0.93}, - {"label": "Backspace", "x": 14.9, "y": 1.13}, - - - {"label": "Tab", "x": 0.1, "y": 2.13}, - {"label": "A", "x": 1.1, "y": 1.93}, - {"label": "S", "x": 2.15, "y": 1.31}, - {"label": "D", "x": 3.2, "y": 1}, - {"label": "F", "x": 4.2, "y": 1.28}, - {"label": "G", "x": 5.2, "y": 1.42}, - - {"label": "H", "x": 9.7, "y": 1.42}, - {"label": "J", "x": 10.7, "y": 1.28}, - {"label": "K", "x": 11.7, "y": 1}, - {"label": "L", "x": 12.75, "y": 1.31}, - {"label": ";", "x": 13.8, "y": 1.93}, - {"label": "Enter", "x": 14.8, "y": 2.13}, - - - {"label": "Ctrl", "x": 0.2, "y": 3.13}, - {"label": "Z", "x": 1.2, "y": 2.93}, - {"label": "X", "x": 2.2, "y": 2.31}, - {"label": "C", "x": 3.2, "y": 2}, - {"label": "V", "x": 4.2, "y": 2.28}, - {"label": "B", "x": 5.2, "y": 2.42}, - {"label": "ESC", "x": 6.2, "y": 2.88}, - - {"label": "CAP", "x": 8.7, "y": 2.88}, - {"label": "N", "x": 9.7, "y": 2.42}, - {"label": "M", "x": 10.7, "y": 2.28}, - {"label": ",", "x": 11.7, "y": 2}, - {"label": ".", "x": 12.7, "y": 2.31}, - {"label": "/", "x": 13.7, "y": 2.93}, - {"label": "'", "x": 14.7, "y": 3.13}, - - - {"label": "Gui", "x": 3.7, "y": 3.28}, - {"label": "Alt", "x": 4.7, "y": 3.42}, - {"label": "Shift", "x": 5.7, "y": 3.88}, - {"label": "Nav", "x": 6.7, "y": 4.44}, - - {"label": "Sym", "x": 8.2, "y": 4.44}, - {"label": "Space", "x": 9.2, "y": 3.88}, - {"label": "Alt", "x": 10.2, "y": 3.42}, - {"label": "Gui", "x": 11.2, "y": 3.28} - ] - } - } + "tags": ["split", "column stagger", "choc v1", "choc spaced" ] } diff --git a/keyboards/hillside/48/0_1/0_1.h b/keyboards/hillside/48/0_1/0_1.h deleted file mode 100644 index 65e1aaee308a..000000000000 --- a/keyboards/hillside/48/0_1/0_1.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2022 Michael McCoyd (@mmccoyd) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts those identifiers into a two-dimensional array which - * represents the switch matrix. - */ - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, LT4, RT4, R20, R21, R22, R23, R24, R25, \ - L30, LT0, LT1, LT2, LT3, RT3, RT2, RT1, RT0, R30 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, LT0, LT1, LT2, LT3, LT4 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R30, RT0, RT1, RT2, RT3, RT4 } \ - } -// clang-format on diff --git a/keyboards/hillside/48/0_1/info.json b/keyboards/hillside/48/0_1/info.json index 27f26a1d803e..6f256f73dc4b 100644 --- a/keyboards/hillside/48/0_1/info.json +++ b/keyboards/hillside/48/0_1/info.json @@ -45,5 +45,66 @@ }, "ws2812": { "pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.93}, + {"matrix": [0, 1], "x": 1, "y": 0.93}, + {"matrix": [0, 2], "x": 2, "y": 0.31}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.28}, + {"matrix": [0, 5], "x": 5, "y": 0.42}, + + {"matrix": [4, 5], "x": 9.5, "y": 0.42}, + {"matrix": [4, 4], "x": 10.5, "y": 0.28}, + {"matrix": [4, 3], "x": 11.5, "y": 0}, + {"matrix": [4, 2], "x": 12.5, "y": 0.31}, + {"matrix": [4, 1], "x": 13.5, "y": 0.93}, + {"matrix": [4, 0], "x": 14.5, "y": 0.93}, + + {"matrix": [1, 0], "x": 0, "y": 1.93}, + {"matrix": [1, 1], "x": 1, "y": 1.93}, + {"matrix": [1, 2], "x": 2, "y": 1.31}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.28}, + {"matrix": [1, 5], "x": 5, "y": 1.42}, + + {"matrix": [5, 5], "x": 9.5, "y": 1.42}, + {"matrix": [5, 4], "x": 10.5, "y": 1.28}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [5, 2], "x": 12.5, "y": 1.31}, + {"matrix": [5, 1], "x": 13.5, "y": 1.93}, + {"matrix": [5, 0], "x": 14.5, "y": 1.93}, + + {"matrix": [2, 0], "x": 0, "y": 2.93}, + {"matrix": [2, 1], "x": 1, "y": 2.93}, + {"matrix": [2, 2], "x": 2, "y": 2.31}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.28}, + {"matrix": [2, 5], "x": 5, "y": 2.42}, + {"matrix": [3, 5], "x": 6, "y": 2.78}, + + {"matrix": [7, 5], "x": 8.5, "y": 2.78}, + {"matrix": [6, 5], "x": 9.5, "y": 2.42}, + {"matrix": [6, 4], "x": 10.5, "y": 2.28}, + {"matrix": [6, 3], "x": 11.5, "y": 2}, + {"matrix": [6, 2], "x": 12.5, "y": 2.31}, + {"matrix": [6, 1], "x": 13.5, "y": 2.93}, + {"matrix": [6, 0], "x": 14.5, "y": 2.93}, + + {"matrix": [3, 0], "x": 2, "y": 3.31}, + {"matrix": [3, 1], "x": 3.5, "y": 3.28}, + {"matrix": [3, 2], "x": 4.5, "y": 3.42}, + {"matrix": [3, 3], "x": 5.5, "y": 3.78}, + {"matrix": [3, 4], "x": 6.5, "y": 4.14}, + + {"matrix": [7, 4], "x": 8, "y": 4.14}, + {"matrix": [7, 3], "x": 9, "y": 3.78}, + {"matrix": [7, 2], "x": 10, "y": 3.42}, + {"matrix": [7, 1], "x": 11, "y": 3.28}, + {"matrix": [7, 0], "x": 12.5, "y": 3.31} + ] + } } } diff --git a/keyboards/hillside/48/info.json b/keyboards/hillside/48/info.json index a488671008f5..1735e6a4c603 100644 --- a/keyboards/hillside/48/info.json +++ b/keyboards/hillside/48/info.json @@ -5,72 +5,5 @@ "keyboard_name": "Hillside48", "url": "http://github.com/mmccoyd/hillside/", - "tags": ["split", "column stagger", "choc v1", "choc spaced" ], - - "layouts": { - "LAYOUT": { - "layout": [ - - {"label": "`", "x": 0, "y": 0.93}, - {"label": "Q", "x": 1, "y": 0.93}, - {"label": "W", "x": 2, "y": 0.31}, - {"label": "E", "x": 3, "y": 0}, - {"label": "R", "x": 4, "y": 0.28}, - {"label": "T", "x": 5, "y": 0.42}, - - {"label": "Y", "x": 9.5, "y": 0.42}, - {"label": "U", "x": 10.5, "y": 0.28}, - {"label": "I", "x": 11.5, "y": 0}, - {"label": "O", "x": 12.5, "y": 0.31}, - {"label": "P", "x": 13.5, "y": 0.93}, - {"label": "Backspace", "x": 14.5, "y": 0.93}, - - - {"label": "Tab", "x": 0, "y": 1.93}, - {"label": "A", "x": 1, "y": 1.93}, - {"label": "S", "x": 2, "y": 1.31}, - {"label": "D", "x": 3, "y": 1}, - {"label": "F", "x": 4, "y": 1.28}, - {"label": "G", "x": 5, "y": 1.42}, - - {"label": "H", "x": 9.5, "y": 1.42}, - {"label": "J", "x": 10.5, "y": 1.28}, - {"label": "K", "x": 11.5, "y": 1}, - {"label": "L", "x": 12.5, "y": 1.31}, - {"label": ";", "x": 13.5, "y": 1.93}, - {"label": "Enter", "x": 14.5, "y": 1.93}, - - - {"label": "Shift", "x": 0, "y": 2.93}, - {"label": "Z", "x": 1, "y": 2.93}, - {"label": "X", "x": 2, "y": 2.31}, - {"label": "C", "x": 3, "y": 2}, - {"label": "V", "x": 4, "y": 2.28}, - {"label": "B", "x": 5, "y": 2.42}, - {"label": "Esc", "x": 6, "y": 2.78}, - - {"label": "Caps", "x": 8.5, "y": 2.78}, - {"label": "N", "x": 9.5, "y": 2.42}, - {"label": "M", "x": 10.5, "y": 2.28}, - {"label": ",", "x": 11.5, "y": 2}, - {"label": ".", "x": 12.5, "y": 2.31}, - {"label": "/", "x": 13.5, "y": 2.93}, - {"label": "Shift", "x": 14.5, "y": 2.93}, - - - {"label": "Ctrl", "x": 2, "y": 3.31}, - {"label": "Gui", "x": 3.5, "y": 3.28}, - {"label": "Alt", "x": 4.5, "y": 3.42}, - {"label": "Sym", "x": 5.5, "y": 3.78}, - {"label": "Shift", "x": 6.5, "y": 4.14}, - - - {"label": "Nav", "x": 8, "y": 4.14}, - {"label": "Space", "x": 9, "y": 3.78}, - {"label": "Alt", "x": 10, "y": 3.42}, - {"label": "Gui", "x": 11, "y": 3.28}, - {"label": "'", "x": 12.5, "y": 3.31} - ] - } - } + "tags": ["split", "column stagger", "choc v1", "choc spaced" ] } diff --git a/keyboards/hillside/52/0_1/0_1.c b/keyboards/hillside/52/0_1/0_1.c index 9a9808da8c67..e30562561642 100644 --- a/keyboards/hillside/52/0_1/0_1.c +++ b/keyboards/hillside/52/0_1/0_1.c @@ -1,7 +1,7 @@ // Copyright 2022 Michael McCoyd (@mmccoyd) // SPDX-License-Identifier: GPL-2.0-or-later -#include "0_1.h" +#include "quantum.h" // Keymatrix spots to ignore, as one signals handedness and others have no key const matrix_row_t matrix_mask[] = { diff --git a/keyboards/hillside/52/0_1/0_1.h b/keyboards/hillside/52/0_1/0_1.h deleted file mode 100644 index f09d89693897..000000000000 --- a/keyboards/hillside/52/0_1/0_1.h +++ /dev/null @@ -1,39 +0,0 @@ -// Copyright 2021 Michael McCoyd (@mmccoyd) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a mapping so keymap files can be more readable to humans. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts those identifiers into a two-dimensional array which - * represents the switch matrix. - * - * The identifiers could be anything, but for human sanity have the folowing form - * - */ - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, LT5, RT5, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, LT1, LT2, LT3, LT4, RT4, RT3, RT2, RT1, R32, R31, R30 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, RT1, RT2, RT3, RT4, RT5 } \ - } -// clang-format on diff --git a/keyboards/hillside/52/0_1/info.json b/keyboards/hillside/52/0_1/info.json index de6c4e0a80db..46ab70bb9b40 100644 --- a/keyboards/hillside/52/0_1/info.json +++ b/keyboards/hillside/52/0_1/info.json @@ -44,5 +44,70 @@ }, "ws2812": { "pin": "D3" + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 1.13}, + {"matrix": [0, 1], "x": 1, "y": 0.93}, + {"matrix": [0, 2], "x": 2.1, "y": 0.31}, + {"matrix": [0, 3], "x": 3.2, "y": 0}, + {"matrix": [0, 4], "x": 4.2, "y": 0.28}, + {"matrix": [0, 5], "x": 5.2, "y": 0.42}, + + {"matrix": [5, 5], "x": 9.7, "y": 0.42}, + {"matrix": [5, 4], "x": 10.7, "y": 0.28}, + {"matrix": [5, 3], "x": 11.7, "y": 0}, + {"matrix": [5, 2], "x": 12.8, "y": 0.31}, + {"matrix": [5, 1], "x": 13.9, "y": 0.93}, + {"matrix": [5, 0], "x": 14.9, "y": 1.13}, + + {"matrix": [1, 0], "x": 0.1, "y": 2.13}, + {"matrix": [1, 1], "x": 1.1, "y": 1.93}, + {"matrix": [1, 2], "x": 2.15, "y": 1.31}, + {"matrix": [1, 3], "x": 3.2, "y": 1}, + {"matrix": [1, 4], "x": 4.2, "y": 1.28}, + {"matrix": [1, 5], "x": 5.2, "y": 1.42}, + + {"matrix": [6, 5], "x": 9.7, "y": 1.42}, + {"matrix": [6, 4], "x": 10.7, "y": 1.28}, + {"matrix": [6, 3], "x": 11.7, "y": 1}, + {"matrix": [6, 2], "x": 12.75, "y": 1.31}, + {"matrix": [6, 1], "x": 13.8, "y": 1.93}, + {"matrix": [6, 0], "x": 14.8, "y": 2.13}, + + {"matrix": [2, 0], "x": 0.2, "y": 3.13}, + {"matrix": [2, 1], "x": 1.2, "y": 2.93}, + {"matrix": [2, 2], "x": 2.2, "y": 2.31}, + {"matrix": [2, 3], "x": 3.2, "y": 2}, + {"matrix": [2, 4], "x": 4.2, "y": 2.28}, + {"matrix": [2, 5], "x": 5.2, "y": 2.42}, + {"matrix": [4, 5], "x": 6.2, "y": 2.88}, + + {"matrix": [9, 5], "x": 8.7, "y": 2.88}, + {"matrix": [7, 5], "x": 9.7, "y": 2.42}, + {"matrix": [7, 4], "x": 10.7, "y": 2.28}, + {"matrix": [7, 3], "x": 11.7, "y": 2}, + {"matrix": [7, 2], "x": 12.7, "y": 2.31}, + {"matrix": [7, 1], "x": 13.7, "y": 2.93}, + {"matrix": [7, 0], "x": 14.7, "y": 3.13}, + + {"matrix": [3, 0], "x": 0.3, "y": 4.13}, + {"matrix": [3, 1], "x": 1.3, "y": 3.93}, + {"matrix": [3, 2], "x": 2.3, "y": 3.73}, + {"matrix": [4, 1], "x": 3.7, "y": 3.28}, + {"matrix": [4, 2], "x": 4.7, "y": 3.42}, + {"matrix": [4, 3], "x": 5.7, "y": 3.88}, + {"matrix": [4, 4], "x": 6.7, "y": 4.44}, + + {"matrix": [9, 4], "x": 8.2, "y": 4.44}, + {"matrix": [9, 3], "x": 9.2, "y": 3.88}, + {"matrix": [9, 2], "x": 10.2, "y": 3.42}, + {"matrix": [9, 1], "x": 11.2, "y": 3.28}, + {"matrix": [8, 2], "x": 12.6, "y": 3.73}, + {"matrix": [8, 1], "x": 13.6, "y": 3.93}, + {"matrix": [8, 0], "x": 14.6, "y": 4.13} + ] + } } } diff --git a/keyboards/hillside/52/info.json b/keyboards/hillside/52/info.json index 0f2dad336e16..3f236e4c7617 100644 --- a/keyboards/hillside/52/info.json +++ b/keyboards/hillside/52/info.json @@ -5,75 +5,5 @@ "keyboard_name": "Hillside 52", "url": "http://github.com/mmccoyd/hillside/", - "tags": ["split", "column stagger", "choc v1", "choc spaced" ], - - "layouts": { - "LAYOUT": { - "layout": [ - - {"label": "`~", "x": 0, "y": 1.13}, - {"label": "Q", "x": 1, "y": 0.93}, - {"label": "W", "x": 2.1, "y": 0.31}, - {"label": "E", "x": 3.2, "y": 0}, - {"label": "R", "x": 4.2, "y": 0.28}, - {"label": "T", "x": 5.2, "y": 0.42}, - - {"label": "Y", "x": 9.7, "y": 0.42}, - {"label": "U", "x": 10.7, "y": 0.28}, - {"label": "I", "x": 11.7, "y": 0}, - {"label": "O", "x": 12.8, "y": 0.31}, - {"label": "P", "x": 13.9, "y": 0.93}, - {"label": "Backspace", "x": 14.9, "y": 1.13}, - - - {"label": "Tab", "x": 0.1, "y": 2.13}, - {"label": "A", "x": 1.1, "y": 1.93}, - {"label": "S", "x": 2.15, "y": 1.31}, - {"label": "D", "x": 3.2, "y": 1}, - {"label": "F", "x": 4.2, "y": 1.28}, - {"label": "G", "x": 5.2, "y": 1.42}, - - {"label": "H", "x": 9.7, "y": 1.42}, - {"label": "J", "x": 10.7, "y": 1.28}, - {"label": "K", "x": 11.7, "y": 1}, - {"label": "L", "x": 12.75, "y": 1.31}, - {"label": ";", "x": 13.8, "y": 1.93}, - {"label": "Enter", "x": 14.8, "y": 2.13}, - - - {"label": "Shift", "x": 0.2, "y": 3.13}, - {"label": "Z", "x": 1.2, "y": 2.93}, - {"label": "X", "x": 2.2, "y": 2.31}, - {"label": "C", "x": 3.2, "y": 2}, - {"label": "V", "x": 4.2, "y": 2.28}, - {"label": "B", "x": 5.2, "y": 2.42}, - {"label": "'", "x": 6.2, "y": 2.88}, - - {"label": "/", "x": 8.7, "y": 2.88}, - {"label": "N", "x": 9.7, "y": 2.42}, - {"label": "M", "x": 10.7, "y": 2.28}, - {"label": ", ", "x": 11.7, "y": 2}, - {"label": ".", "x": 12.7, "y": 2.31}, - {"label": "Up", "x": 13.7, "y": 2.93}, - {"label": "Shift", "x": 14.7, "y": 3.13}, - - - {"label": "Mute", "x": 0.3, "y": 4.13}, - {"label": "Esc", "x": 1.3, "y": 3.93}, - {"label": "Ctrl", "x": 2.3, "y": 3.73}, - {"label": "Gui", "x": 3.7, "y": 3.28}, - {"label": "Alt", "x": 4.7, "y": 3.42}, - {"label": "Shift", "x": 5.7, "y": 3.88}, - {"label": "Nav", "x": 6.7, "y": 4.44}, - - {"label": "Sym", "x": 8.2, "y": 4.44}, - {"label": "Space", "x": 9.2, "y": 3.88}, - {"label": "Alt", "x": 10.2, "y": 3.42}, - {"label": "Gui", "x": 11.2, "y": 3.28}, - {"label": "Left", "x": 12.6, "y": 3.73}, - {"label": "Down", "x": 13.6, "y": 3.93}, - {"label": "Right", "x": 14.6, "y": 4.13} - ] - } - } + "tags": ["split", "column stagger", "choc v1", "choc spaced" ] } diff --git a/keyboards/holyswitch/southpaw75/info.json b/keyboards/holyswitch/southpaw75/info.json index d2db4689ae57..a99be3e1ce7a 100644 --- a/keyboards/holyswitch/southpaw75/info.json +++ b/keyboards/holyswitch/southpaw75/info.json @@ -18,84 +18,88 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B2,B6)", "x":0, "y":0}, - {"label":"K01 (B2,F7)", "x":1, "y":0}, - {"label":"K02 (B2,F6)", "x":2, "y":0}, - {"label":"K03 (B2,F5)", "x":3, "y":0}, - {"label":"K04 (B2,F4)", "x":4, "y":0}, - {"label":"K05 (B2,D0)", "x":5, "y":0}, - {"label":"K06 (B2,D1)", "x":6, "y":0}, - {"label":"K07 (B2,D7)", "x":7, "y":0}, - {"label":"K08 (B2,B4)", "x":8, "y":0}, - {"label":"K10 (F0,B6)", "x":9, "y":0}, - {"label":"K11 (F0,F7)", "x":10, "y":0}, - {"label":"K12 (F0,F6)", "x":11, "y":0}, - {"label":"K13 (F0,F5)", "x":12, "y":0}, - {"label":"K14 (F0,F4)", "x":13, "y":0}, - {"label":"K15 (F0,D0)", "x":14, "y":0}, - {"label":"K16 (F0,D1)", "x":15, "y":0}, - {"label":"K17 (F0,D7)", "x":16, "y":0}, - {"label":"K18 (F0,B4)", "x":17, "y":0, "w":2}, - {"label":"K20 (C6,B6)", "x":0, "y":1}, - {"label":"K21 (C6,F7)", "x":1, "y":1}, - {"label":"K22 (C6,F6)", "x":2, "y":1}, - {"label":"K23 (C6,F5)", "x":3, "y":1, "h":2}, - {"label":"K24 (C6,F4)", "x":4, "y":1, "w":1.5}, - {"label":"K25 (C6,D0)", "x":5.5, "y":1}, - {"label":"K26 (C6,D1)", "x":6.5, "y":1}, - {"label":"K27 (C6,D7)", "x":7.5, "y":1}, - {"label":"K28 (C6,B4)", "x":8.5, "y":1}, - {"label":"K30 (D4,B6)", "x":9.5, "y":1}, - {"label":"K31 (D4,F7)", "x":10.5, "y":1}, - {"label":"K32 (D4,F6)", "x":11.5, "y":1}, - {"label":"K33 (D4,F5)", "x":12.5, "y":1}, - {"label":"K34 (D4,F4)", "x":13.5, "y":1}, - {"label":"K35 (D4,D0)", "x":14.5, "y":1}, - {"label":"K36 (D4,D1)", "x":15.5, "y":1}, - {"label":"K37 (D4,D7)", "x":16.5, "y":1}, - {"label":"K38 (D4,B4)", "x":17.5, "y":1, "w":1.5}, - {"label":"K40 (D3,B6)", "x":0, "y":2}, - {"label":"K41 (D3,F7)", "x":1, "y":2}, - {"label":"K42 (D3,F6)", "x":2, "y":2}, - {"label":"K43 (D3,F5)", "x":4, "y":2, "w":1.75}, - {"label":"K44 (D3,F4)", "x":5.75, "y":2}, - {"label":"K45 (D3,D0)", "x":6.75, "y":2}, - {"label":"K46 (D3,D1)", "x":7.75, "y":2}, - {"label":"K47 (D3,D7)", "x":8.75, "y":2}, - {"label":"K48 (D3,B4)", "x":9.75, "y":2}, - {"label":"K50 (F1,B6)", "x":10.75, "y":2}, - {"label":"K51 (F1,F7)", "x":11.75, "y":2}, - {"label":"K52 (F1,F6)", "x":12.75, "y":2}, - {"label":"K53 (F1,F5)", "x":13.75, "y":2}, - {"label":"K54 (F1,F4)", "x":14.75, "y":2}, - {"label":"K55 (F1,D0)", "x":15.75, "y":2}, - {"label":"K56 (F1,D1)", "x":16.75, "y":2, "w":2.25}, - {"label":"K57 (F1,D7)", "x":0, "y":3}, - {"label":"K58 (F1,B4)", "x":1, "y":3}, - {"label":"K60 (D2,B6)", "x":2, "y":3}, - {"label":"K61 (D2,F7)", "x":3, "y":3, "h":2}, - {"label":"K62 (D2,F6)", "x":4, "y":3, "w":2.25}, - {"label":"K63 (D2,F5)", "x":6.25, "y":3}, - {"label":"K64 (D2,F4)", "x":7.25, "y":3}, - {"label":"K65 (D2,D0)", "x":8.25, "y":3}, - {"label":"K66 (D2,D1)", "x":9.25, "y":3}, - {"label":"K67 (D2,D7)", "x":10.25, "y":3}, - {"label":"K68 (D2,B4)", "x":11.25, "y":3}, - {"label":"K70 (B5,B6)", "x":12.25, "y":3}, - {"label":"K71 (B5,F7)", "x":13.25, "y":3}, - {"label":"K72 (B5,F6)", "x":14.25, "y":3}, - {"label":"K73 (B5,F5)", "x":15.25, "y":3}, - {"label":"K74 (B5,F4)", "x":16.25, "y":3, "w":2.75}, - {"label":"K75 (B5,D0)", "x":0, "y":4, "w":2}, - {"label":"K76 (B5,D1)", "x":2, "y":4}, - {"label":"K77 (B5,D7)", "x":4, "y":4, "w":1.25}, - {"label":"K78 (B5,B4)", "x":5.25, "y":4, "w":1.25}, - {"label":"K80 (D5,B6)", "x":6.5, "y":4, "w":1.25}, - {"label":"K81 (D5,F7)", "x":7.75, "y":4, "w":6.25}, - {"label":"K82 (D5,F6)", "x":14, "y":4, "w":1.25}, - {"label":"K83 (D5,F5)", "x":15.25, "y":4, "w":1.25}, - {"label":"K84 (D5,F4)", "x":16.5, "y":4, "w":1.25}, - {"label":"K85 (D5,D0)", "x":17.75, "y":4, "w":1.25} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [1, 0], "x": 9, "y": 0}, + {"matrix": [1, 1], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 3], "x": 12, "y": 0}, + {"matrix": [1, 4], "x": 13, "y": 0}, + {"matrix": [1, 5], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [1, 7], "x": 16, "y": 0}, + {"matrix": [1, 8], "x": 17, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [2, 1], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + {"matrix": [2, 3], "x": 3, "y": 1, "h": 2}, + {"matrix": [2, 4], "x": 4, "y": 1, "w": 1.5}, + {"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": [2, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 0], "x": 9.5, "y": 1}, + {"matrix": [3, 1], "x": 10.5, "y": 1}, + {"matrix": [3, 2], "x": 11.5, "y": 1}, + {"matrix": [3, 3], "x": 12.5, "y": 1}, + {"matrix": [3, 4], "x": 13.5, "y": 1}, + {"matrix": [3, 5], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1}, + {"matrix": [3, 7], "x": 16.5, "y": 1}, + {"matrix": [3, 8], "x": 17.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [4, 1], "x": 1, "y": 2}, + {"matrix": [4, 2], "x": 2, "y": 2}, + {"matrix": [4, 3], "x": 4, "y": 2, "w": 1.75}, + {"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": [4, 8], "x": 9.75, "y": 2}, + {"matrix": [5, 0], "x": 10.75, "y": 2}, + {"matrix": [5, 1], "x": 11.75, "y": 2}, + {"matrix": [5, 2], "x": 12.75, "y": 2}, + {"matrix": [5, 3], "x": 13.75, "y": 2}, + {"matrix": [5, 4], "x": 14.75, "y": 2}, + {"matrix": [5, 5], "x": 15.75, "y": 2}, + {"matrix": [5, 6], "x": 16.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 7], "x": 0, "y": 3}, + {"matrix": [5, 8], "x": 1, "y": 3}, + {"matrix": [6, 0], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3, "h": 2}, + {"matrix": [6, 2], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [6, 4], "x": 7.25, "y": 3}, + {"matrix": [6, 5], "x": 8.25, "y": 3}, + {"matrix": [6, 6], "x": 9.25, "y": 3}, + {"matrix": [6, 7], "x": 10.25, "y": 3}, + {"matrix": [6, 8], "x": 11.25, "y": 3}, + {"matrix": [7, 0], "x": 12.25, "y": 3}, + {"matrix": [7, 1], "x": 13.25, "y": 3}, + {"matrix": [7, 2], "x": 14.25, "y": 3}, + {"matrix": [7, 3], "x": 15.25, "y": 3}, + {"matrix": [7, 4], "x": 16.25, "y": 3, "w": 2.75}, + + {"matrix": [7, 5], "x": 0, "y": 4, "w": 2}, + {"matrix": [7, 6], "x": 2, "y": 4}, + {"matrix": [7, 7], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [7, 8], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [8, 0], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 7.75, "y": 4, "w": 6.25}, + {"matrix": [8, 2], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 16.5, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 17.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/holyswitch/southpaw75/southpaw75.h b/keyboards/holyswitch/southpaw75/southpaw75.h deleted file mode 100644 index 0fd4ee0c0048..000000000000 --- a/keyboards/holyswitch/southpaw75/southpaw75.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 drewguy - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K10, K11, K12, K13, K14, K15, K16, K17, K18, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K30, K31, K32, K33, K34, K35, K36, K37, K38, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K50, K51, K52, K53, K54, K55, K56, \ - K57, K58, K60, K61, K62, K63, K64, K65, K66, K67, K68, K70, K71, K72, K73, K74, \ - K75, K76, K77, K78, K80, K81, K82, K83, K84, K85 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { K80, K81, K82, K83, K84, K85, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/horizon/horizon.h b/keyboards/horizon/horizon.h deleted file mode 100644 index 99577ebf9105..000000000000 --- a/keyboards/horizon/horizon.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Steven Karrmann - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - 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, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO, KC_NO, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, KC_NO, KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26 , k27 , k28, k29, k2a, k2b, k2c, k2d }, \ - { k30, k31, k32, k33, k34, k35, k36 , k37 , k38, k39, k3a, k3b, k3c, k3d } \ -} diff --git a/keyboards/horizon/info.json b/keyboards/horizon/info.json index 3198bcf28f69..140194a9804e 100644 --- a/keyboards/horizon/info.json +++ b/keyboards/horizon/info.json @@ -18,58 +18,63 @@ "layouts": { "LAYOUT": { "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": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "x": 13, "y": 0 }, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 13, "y": 1 }, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, - { "x": 6, "y": 2 }, - { "x": 7, "y": 2 }, - { "x": 8, "y": 2 }, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - { "x": 13, "y": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 13, "y": 3 } + {"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, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} ] } } diff --git a/keyboards/horrortroll/lemon40/info.json b/keyboards/horrortroll/lemon40/info.json index 1413fd2add34..ade1731d942a 100644 --- a/keyboards/horrortroll/lemon40/info.json +++ b/keyboards/horrortroll/lemon40/info.json @@ -21,56 +21,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0, "w":1.5}, - {"label":"Q", "x":1.5, "y":0}, - {"label":"W", "x":2.5, "y":0}, - {"label":"E", "x":3.5, "y":0}, - {"label":"R", "x":4.5, "y":0}, - {"label":"T", "x":5.5, "y":0}, - {"label":"Y", "x":8.25, "y":0}, - {"label":"U", "x":9.25, "y":0}, - {"label":"I", "x":10.25, "y":0}, - {"label":"O", "x":11.25, "y":0}, - {"label":"P", "x":12.25, "y":0}, - {"label":"`~", "x":13.25, "y":0}, - {"label":"Backspace", "x":14.25, "y":0, "w":1.25}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, - {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, - {"label":"A", "x":1.75, "y":1}, - {"label":"S", "x":2.75, "y":1}, - {"label":"D", "x":3.75, "y":1}, - {"label":"F", "x":4.75, "y":1}, - {"label":"G", "x":5.75, "y":1}, - {"label":"H", "x":8.5, "y":1}, - {"label":"J", "x":9.5, "y":1}, - {"label":"K", "x":10.5, "y":1}, - {"label":"L", "x":11.5, "y":1}, - {"label":"\\|", "x":12.5, "y":1}, - {"label":"Enter", "x":13.5, "y":1, "w":2}, + {"matrix": [0, 6], "x": 8.25, "y": 0}, + {"matrix": [4, 0], "x": 9.25, "y": 0}, + {"matrix": [4, 1], "x": 10.25, "y": 0}, + {"matrix": [4, 2], "x": 11.25, "y": 0}, + {"matrix": [4, 3], "x": 12.25, "y": 0}, + {"matrix": [4, 4], "x": 13.25, "y": 0}, + {"matrix": [4, 5], "x": 14.25, "y": 0, "w": 1.25}, - {"label":"Shift", "x":0, "y":2, "w":2.25}, - {"label":"Z", "x":2.25, "y":2}, - {"label":"X", "x":3.25, "y":2}, - {"label":"C", "x":4.25, "y":2}, - {"label":"V", "x":5.25, "y":2}, - {"label":"B", "x":6.25, "y":2}, - {"label":"N", "x":8, "y":2}, - {"label":"M", "x":9, "y":2}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2}, - {"label":"/?", "x":12.25, "y":2}, - {"label":"\u2191", "x":13.25, "y":2}, - {"label":"Shift", "x":14.25, "y":2, "w":1.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, - {"label":"Win", "x":1.25, "y":3, "w":1.25}, - {"label":"Alt", "x":3.25, "y":3, "w":1.25}, - {"label":"Space", "x":4.5, "y":3, "w":2.75}, - {"label":"Space", "x":8, "y":3, "w":2.25}, - {"label":"Fn", "x":10.25, "y":3, "w":1.25}, - {"label":"\u2190", "x":12.25, "y":3}, - {"label":"\u2193", "x":13.25, "y":3}, - {"label":"\u2192", "x":14.25, "y":3} + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [5, 0], "x": 9.5, "y": 1}, + {"matrix": [5, 1], "x": 10.5, "y": 1}, + {"matrix": [5, 2], "x": 11.5, "y": 1}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25}, + {"matrix": [2, 1], "x": 2.25, "y": 2}, + {"matrix": [2, 2], "x": 3.25, "y": 2}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [6, 0], "x": 9, "y": 2}, + {"matrix": [6, 1], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 3], "x": 12.25, "y": 2}, + {"matrix": [6, 4], "x": 13.25, "y": 2}, + {"matrix": [6, 5], "x": 14.25, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.75}, + + {"matrix": [7, 0], "x": 8, "y": 3, "w": 2.25}, + {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.25}, + + {"matrix": [7, 3], "x": 12.25, "y": 3}, + {"matrix": [7, 4], "x": 13.25, "y": 3}, + {"matrix": [7, 5], "x": 14.25, "y": 3} ] } } diff --git a/keyboards/horrortroll/lemon40/lemon40.c b/keyboards/horrortroll/lemon40/lemon40.c index ccb7f15546bb..75321f41b33d 100644 --- a/keyboards/horrortroll/lemon40/lemon40.c +++ b/keyboards/horrortroll/lemon40/lemon40.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "lemon40.h" +#include "quantum.h" // OLED animation #include "lib/bongocat.h" diff --git a/keyboards/horrortroll/lemon40/lemon40.h b/keyboards/horrortroll/lemon40/lemon40.h deleted file mode 100644 index a4845a8595fe..000000000000 --- a/keyboards/horrortroll/lemon40/lemon40.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2022 HorrorTroll - * - * 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 XXX KC_NO - -/* ┌─────┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬────┐ - * │00 │01 │02 │03 │04 │05 │ │06 │40 │41 │42 │43 │44 │45 │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴────┤ - * │10 │11 │12 │13 │14 │15 │ │16 │50 │51 │52 │53 │55 │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬┬┴──┬┴──┬────┤ - * │20 │21 │22 │23 │24 │25 │ │26 │60 │61 │62 ││63 │64 │65 │ - * └┬────┬──┴─┬─┼───┴┬──┴───┴───┤ ├───┴───┴┬──┴─┬─┘├───┼───┼───┬┘ - * │30 │31 │ │32 │34 │ │70 │72 │ │73 │74 │75 │ - * └────┴────┘ └────┴──────────┘ └────────┴────┘ └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K40, K41, K42, K43, K44, K45, \ - K10, K11, K12, K13, K14, K15, K16, K50, K51, K52, K53, K55, \ - K20, K21, K22, K23, K24, K25, K26, K60, K61, K62, K63, K64, K65, \ - K30, K31, K32, K34, K70, K72, K73, K74, K75 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, XXX, K34, XXX, XXX }, \ - { K40, K41, K42, K43, K44, K45, XXX }, \ - { K50, K51, K52, K53, XXX, K55, XXX }, \ - { K60, K61, K62, K63, K64, K65, XXX }, \ - { K70, XXX, K72, K73, K74, K75, XXX } \ -} - diff --git a/keyboards/hp69/hp69.h b/keyboards/hp69/hp69.h deleted file mode 100644 index 7819eb829e94..000000000000 --- a/keyboards/hp69/hp69.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 Ananya Kirti - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K1E, K4E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K3E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/hp69/info.json b/keyboards/hp69/info.json index 2bcf69f19ea7..8484902252e0 100644 --- a/keyboards/hp69/info.json +++ b/keyboards/hp69/info.json @@ -26,75 +26,82 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0,B5)", "x":0, "y":0}, - {"label":"K01 (B0,B6)", "x":1, "y":0}, - {"label":"K02 (B0,B7)", "x":2, "y":0}, - {"label":"K03 (B0,C0)", "x":3, "y":0}, - {"label":"K04 (B0,C1)", "x":4, "y":0}, - {"label":"K05 (B0,C2)", "x":5, "y":0}, - {"label":"K06 (B0,C3)", "x":6, "y":0}, - {"label":"K07 (B0,C4)", "x":7, "y":0}, - {"label":"K08 (B0,C5)", "x":8, "y":0}, - {"label":"K09 (B0,C6)", "x":9, "y":0}, - {"label":"K0A (B0,C7)", "x":10, "y":0}, - {"label":"K0B (B0,D0)", "x":11, "y":0}, - {"label":"K0C (B0,D1)", "x":12, "y":0}, - {"label":"K0D (B0,D2)", "x":13, "y":0}, - {"label":"K0E (B0,D3)", "x":14, "y":0}, - {"label":"K1E (B1,D3)", "x":15.25, "y":0}, - {"label":"K4E (B4,D3)", "x":16.25, "y":0}, - {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":1.5, "y":1}, - {"label":"K12 (B1,B7)", "x":2.5, "y":1}, - {"label":"K13 (B1,C0)", "x":3.5, "y":1}, - {"label":"K14 (B1,C1)", "x":4.5, "y":1}, - {"label":"K15 (B1,C2)", "x":5.5, "y":1}, - {"label":"K16 (B1,C3)", "x":6.5, "y":1}, - {"label":"K17 (B1,C4)", "x":7.5, "y":1}, - {"label":"K18 (B1,C5)", "x":8.5, "y":1}, - {"label":"K19 (B1,C6)", "x":9.5, "y":1}, - {"label":"K1A (B1,C7)", "x":10.5, "y":1}, - {"label":"K1B (B1,D0)", "x":11.5, "y":1}, - {"label":"K1C (B1,D1)", "x":12.5, "y":1}, - {"label":"K1D (B1,D2)", "x":13.5, "y":1, "w":1.5}, - {"label":"K2E (B2,D3)", "x":15.25, "y":1}, - {"label":"K3E (B3,D3)", "x":16.25, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.25}, - {"label":"K21 (B2,B6)", "x":1.75, "y":2}, - {"label":"K22 (B2,B7)", "x":2.75, "y":2}, - {"label":"K23 (B2,C0)", "x":3.75, "y":2}, - {"label":"K24 (B2,C1)", "x":4.75, "y":2}, - {"label":"K25 (B2,C2)", "x":5.75, "y":2}, - {"label":"K26 (B2,C3)", "x":6.75, "y":2}, - {"label":"K27 (B2,C4)", "x":7.75, "y":2}, - {"label":"K28 (B2,C5)", "x":8.75, "y":2}, - {"label":"K29 (B2,C6)", "x":9.75, "y":2}, - {"label":"K2A (B2,C7)", "x":10.75, "y":2}, - {"label":"K2B (B2,D0)", "x":11.75, "y":2}, - {"label":"K2C (B2,D1)", "x":12.75, "y":2, "w":2.25}, - {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25}, - {"label":"K31 (B3,B6)", "x":2.25, "y":3}, - {"label":"K32 (B3,B7)", "x":3.25, "y":3}, - {"label":"K33 (B3,C0)", "x":4.25, "y":3}, - {"label":"K34 (B3,C1)", "x":5.25, "y":3}, - {"label":"K35 (B3,C2)", "x":6.25, "y":3}, - {"label":"K36 (B3,C3)", "x":7.25, "y":3}, - {"label":"K37 (B3,C4)", "x":8.25, "y":3}, - {"label":"K38 (B3,C5)", "x":9.25, "y":3}, - {"label":"K39 (B3,C6)", "x":10.25, "y":3}, - {"label":"K3A (B3,C7)", "x":11.25, "y":3}, - {"label":"K3B (B3,D0)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3C (B3,D1)", "x":14, "y":3}, - {"label":"K3D (B3,D2)", "x":15.25, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B4,B6)", "x":1.5, "y":4, "w":1.25}, - {"label":"K42 (B4,B7)", "x":2.75, "y":4, "w":1.5}, - {"label":"K46 (B4,C3)", "x":4.25, "y":4, "w":7}, - {"label":"K49 (B4,C6)", "x":11.25, "y":4, "w":1.5}, - {"label":"K4A (B4,C7)", "x":12.75, "y":4, "w":1.25}, - {"label":"K4B (B4,D0)", "x":14.25, "y":4}, - {"label":"K4C (B4,D1)", "x":15.25, "y":4}, - {"label":"K4D (B4,D2)", "x":16.25, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [1, 14], "x": 15.25, "y": 0}, + {"matrix": [4, 14], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 1}, + {"matrix": [3, 14], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + + {"matrix": [3, 13], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4.25, "y": 4, "w": 7}, + {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 12.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 14.25, "y": 4}, + {"matrix": [4, 12], "x": 15.25, "y": 4}, + {"matrix": [4, 13], "x": 16.25, "y": 4} ] } } diff --git a/keyboards/huytbt/h50/h50.h b/keyboards/huytbt/h50/h50.h deleted file mode 100644 index 9d710de915b2..000000000000 --- a/keyboards/huytbt/h50/h50.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 Huy Ta (@huytbt) - * - * 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 XXX KC_NO - -/* h50 keymap definition macro - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k35, k37, k39, k3A, k3B, k3C, k3D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3A, k3B, k3C, k3D } \ -} diff --git a/keyboards/huytbt/h50/info.json b/keyboards/huytbt/h50/info.json index 052c5a0b20d8..4a7e60d38702 100644 --- a/keyboards/huytbt/h50/info.json +++ b/keyboards/huytbt/h50/info.json @@ -21,62 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Tab", "x": 0, "y": 0 }, - { "label": "Q", "x": 1, "y": 0 }, - { "label": "W", "x": 2, "y": 0 }, - { "label": "E", "x": 3, "y": 0 }, - { "label": "R", "x": 4, "y": 0 }, - { "label": "T", "x": 5, "y": 0 }, - { "label": "Y", "x": 6, "y": 0 }, - { "label": "U", "x": 7, "y": 0 }, - { "label": "I", "x": 8, "y": 0 }, - { "label": "O", "x": 9, "y": 0 }, - { "label": "P", "x": 10, "y": 0 }, - { "label": "[", "x": 11, "y": 0 }, - { "label": "]", "x": 12, "y": 0 }, - { "label": "Back
Space", "x": 13, "y": 0 }, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, - { "label": "Caps", "x": 0, "y": 1, "w": 1.25 }, - { "label": "A", "x": 1.25, "y": 1 }, - { "label": "S", "x": 2.25, "y": 1 }, - { "label": "D", "x": 3.25, "y": 1 }, - { "label": "F", "x": 4.25, "y": 1 }, - { "label": "G", "x": 5.25, "y": 1 }, - { "label": "H", "x": 6.25, "y": 1 }, - { "label": "J", "x": 7.25, "y": 1 }, - { "label": "K", "x": 8.25, "y": 1 }, - { "label": "L", "x": 9.25, "y": 1 }, - { "label": ";", "x": 10.25, "y": 1 }, - { "label": "'", "x": 11.25, "y": 1 }, - { "label": "Enter", "x": 12.25, "y": 1, "w": 1.75 }, - { "label": "PGUP", "x": 14, "y": 1 }, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1}, + {"matrix": [1, 12], "x": 12.25, "y": 1, "w": 1.75}, + {"matrix": [1, 13], "x": 14, "y": 1}, - { "label": "Shift", "x": 0, "y": 2, "w": 1.75 }, - { "label": "Z", "x": 1.75, "y": 2 }, - { "label": "X", "x": 2.75, "y": 2 }, - { "label": "C", "x": 3.75, "y": 2 }, - { "label": "V", "x": 4.75, "y": 2 }, - { "label": "B", "x": 5.75, "y": 2 }, - { "label": "N", "x": 6.75, "y": 2 }, - { "label": "M", "x": 7.75, "y": 2 }, - { "label": ",", "x": 8.75, "y": 2 }, - { "label": ".", "x": 9.75, "y": 2 }, - { "label": "/", "x": 10.75, "y": 2 }, - { "label": "Shift", "x": 11.75, "y": 2, "w": 1.25 }, - { "label": "Up", "x": 13, "y": 2 }, - { "label": "PGDN", "x": 14, "y": 2 }, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 2}, - { "label": "Ctrl", "x": 0, "y": 3, "w": 1.25 }, - { "label": "Alt", "x": 1.25, "y": 3, "w": 1.25 }, - { "label": "Super", "x": 2.5, "y": 3, "w": 1.25 }, - { "x": 3.75, "y": 3, "w": 1.75 }, - { "x": 5.5, "y": 3, "w": 1.75 }, - { "label": "Fn1", "x": 7.25, "y": 3, "w": 1.75 }, - { "label": "Fn2", "x": 9, "y": 3, "w": 1.25 }, - { "label": "Fn3", "x": 10.25, "y": 3, "w": 1.25 }, - { "label": "Left", "x": 12, "y": 3 }, - { "label": "Down", "x": 13, "y": 3 }, - { "label": "Right", "x": 14, "y": 3 } + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 1.75}, + {"matrix": [3, 9], "x": 9, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.25, "y": 3, "w": 1.25}, + + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3} ] } } diff --git a/keyboards/ibnuda/gurindam/gurindam.h b/keyboards/ibnuda/gurindam/gurindam.h deleted file mode 100644 index 9967bcf52825..000000000000 --- a/keyboards/ibnuda/gurindam/gurindam.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Ibnu D. Aji - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO -#define LAYOUT( \ - k1, k6, k10, k15, k19, k24, k28, k33, k37, k42, k46, k51, k55, k60, k64, k65, \ - k2, k7, k11, k16, k20, k25, k29, k34, k38, k43, k47, k52, k56, k61, k66, \ - k3, k8, k12, k17, k21, k26, k30, k35, k39, k44, k48, k53, k57, k62, \ - k4, k9, k13, k18, k22, k27, k31, k36, k40, k45, k49, k54, k58, \ - k5, k14, k23, k32, k41, k50, k59, k63, k67 \ -) \ -{ \ - { k1, k10, k19, k28, k37, k46, k55, k64 }, \ - { k6, k15, k24, k33, k42, k51, k60, XXX }, \ - { k2, k11, k20, k29, k38, k47, k56, k65 }, \ - { k7, k16, k25, k34, k43, k52, k61, XXX }, \ - { k3, k12, k21, k30, k39, k48, k57, k66 }, \ - { k8, k17, k26, k35, k44, k53, k62, XXX }, \ - { k4, k13, k22, k31, k40, k49, k58, k67 }, \ - { k9, k18, k27, k36, k45, k54, k63, XXX }, \ - { k5, k14, k23, k32, k41, k50, k59, XXX } \ -} diff --git a/keyboards/ibnuda/gurindam/info.json b/keyboards/ibnuda/gurindam/info.json index f8acee360fc9..2b18d0417ecd 100644 --- a/keyboards/ibnuda/gurindam/info.json +++ b/keyboards/ibnuda/gurindam/info.json @@ -21,77 +21,86 @@ "layouts": { "LAYOUT": { "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":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":16, "y":0}, - {"x":17.3, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "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":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}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1, "w":1.5}, - {"x":17.3, "y":1}, + {"matrix": [1, 3], "x": 9, "y": 0}, + {"matrix": [0, 4], "x": 10, "y": 0}, + {"matrix": [1, 4], "x": 11, "y": 0}, + {"matrix": [0, 5], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [0, 7], "x": 16, "y": 0}, - {"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":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}, - {"x":14.75, "y":2, "w":2.25}, - {"x":17.3, "y":2}, + {"matrix": [2, 7], "x": 17.3, "y": 0}, - {"x":0, "y":3, "w":2.25}, - {"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":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3, "w":1.75}, - {"x":16.3, "y":3.25}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, - {"x":0, "y":4, "w":1.5}, - {"x":3.25, "y":4, "w":1.5}, - {"x":4.75, "y":4, "w":2}, - {"x":6.75, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":2.75}, - {"x":11.5, "y":4, "w":1.5}, - {"x":15.3, "y":4.25}, - {"x":16.3, "y":4.25}, - {"x":17.3, "y":4.25} + {"matrix": [2, 3], "x": 8.5, "y": 1}, + {"matrix": [3, 3], "x": 9.5, "y": 1}, + {"matrix": [2, 4], "x": 10.5, "y": 1}, + {"matrix": [3, 4], "x": 11.5, "y": 1}, + {"matrix": [2, 5], "x": 12.5, "y": 1}, + {"matrix": [3, 5], "x": 13.5, "y": 1}, + {"matrix": [2, 6], "x": 14.5, "y": 1}, + {"matrix": [3, 6], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [4, 7], "x": 17.3, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + + {"matrix": [4, 3], "x": 8.75, "y": 2}, + {"matrix": [5, 3], "x": 9.75, "y": 2}, + {"matrix": [4, 4], "x": 10.75, "y": 2}, + {"matrix": [5, 4], "x": 11.75, "y": 2}, + {"matrix": [4, 5], "x": 12.75, "y": 2}, + {"matrix": [5, 5], "x": 13.75, "y": 2}, + {"matrix": [4, 6], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [5, 6], "x": 17.3, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + + {"matrix": [6, 3], "x": 9.25, "y": 3}, + {"matrix": [7, 3], "x": 10.25, "y": 3}, + {"matrix": [6, 4], "x": 11.25, "y": 3}, + {"matrix": [7, 4], "x": 12.25, "y": 3}, + {"matrix": [6, 5], "x": 13.25, "y": 3}, + {"matrix": [7, 5], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [6, 6], "x": 16.3, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 4.75, "y": 4, "w": 2}, + {"matrix": [8, 3], "x": 6.75, "y": 4, "w": 1.25}, + {"matrix": [8, 4], "x": 8.75, "y": 4, "w": 2.75}, + {"matrix": [8, 5], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.3, "y": 4.25}, + {"matrix": [7, 6], "x": 16.3, "y": 4.25}, + {"matrix": [6, 7], "x": 17.3, "y": 4.25} ] } } diff --git a/keyboards/idobao/id96/id96.h b/keyboards/idobao/id96/id96.h deleted file mode 100644 index adb8f4768913..000000000000 --- a/keyboards/idobao/id96/id96.h +++ /dev/null @@ -1,63 +0,0 @@ -/* - * This file is part of the QMK Firmware distribution (https://github.com/qmk/qmk_firmware). - * Copyright 2018-2021 "kaylanm" [Melody96] - * Vino Rodrigues [ID96] - * - * 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, version 3. - * - * 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" - -/* - * The layout macro for the ID96 keyboard, with illustrative grid of a typical - * assignment. - * ,--------------------------------------------------------------------------- - * |ESC|F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|PSC|HOM|END|PGU|PGD|DEL| - * ,--------------------------------------------------------------------------| - * | ` |1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | \ |BKS|NLK| / | * | - | - * |--------------------------------------------------------------------------| - * | TAB | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | 7 | 8 | 9 | + | - * |--------------------------------------------------------------------------| - * | CTRL | A | S | D | F | G | H | J | K | L | ; | ' | RET | 4 | 5 | 6 | + | - * |--------------------------------------------------------------------------| - * | LSHIFT | Z | X | C | V | B | N | M | , | . | / |RSHFT| ↑ | 1 | 2 | 3 |ENT| - * |--------------------------------------------------------------------------| - * |LCTL|LWIN|LALT| SPACE |CTL|ALT|FN | ← | ↓ | → | 0 | . |ENT| - * `--------------------------------------------------------------------------- - */ - -#define ____ KC_NO - -#define LAYOUT( \ - K050, K051, K052, K053, K054, K055, K056, K057, K058, K118, K117, K115, K114, K113, K116, K112, K111, K110, K063, \ - K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104, K103, K106, K102, K101, K100, K064, \ - K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094, K084, K096, K092, K091, K090, \ - K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085, K093, K086, K082, K081, K080, \ - K010, K011, K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074, K073, K076, K072, K071, K070, \ - K000, K001, K002, K006, K008, K007, K005, K004, K003, K066, K062, K061, K060 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ - { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ - { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \ - { K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \ - { K050, K051, K052, K053, K054, K055, K056, K057, K058 }, \ - { K060, K061, K062, K063, K064, ____, K066, ____, ____ }, \ - { K070, K071, K072, K073, K074, K075, K076, K077, K078 }, \ - { K080, K081, K082, ____, K084, K085, K086, K087, K088 }, \ - { K090, K091, K092, K093, K094, K095, K096, K097, K098 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108 }, \ - { K110, K111, K112, K113, K114, K115, K116, K117, K118 } \ -} diff --git a/keyboards/idobao/id96/info.json b/keyboards/idobao/id96/info.json index f9a1a003f4d8..f49337fc1498 100644 --- a/keyboards/idobao/id96/info.json +++ b/keyboards/idobao/id96/info.json @@ -34,115 +34,116 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1, "y":0}, - {"label":"F2", "x":2, "y":0}, - {"label":"F3", "x":3, "y":0}, - {"label":"F4", "x":4, "y":0}, - {"label":"F5", "x":5, "y":0}, - {"label":"F6", "x":6, "y":0}, - {"label":"F7", "x":7, "y":0}, - {"label":"F8", "x":8, "y":0}, - {"label":"F9", "x":9, "y":0}, - {"label":"F10", "x":10, "y":0}, - {"label":"F11", "x":11, "y":0}, - {"label":"F12", "x":12, "y":0}, - {"label":"PrtSc", "x":13, "y":0}, - {"label":"Scroll Lock", "x":14, "y":0}, - {"label":"Pause", "x":15, "y":0}, - {"label":"Insert", "x":16, "y":0}, - {"label":"Home", "x":17, "y":0}, - {"label":"PgUp", "x":18, "y":0}, + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [5, 4], "x": 4, "y": 0}, + {"matrix": [5, 5], "x": 5, "y": 0}, + {"matrix": [5, 6], "x": 6, "y": 0}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 8], "x": 8, "y": 0}, + {"matrix": [11, 8], "x": 9, "y": 0}, + {"matrix": [11, 7], "x": 10, "y": 0}, + {"matrix": [11, 5], "x": 11, "y": 0}, + {"matrix": [11, 4], "x": 12, "y": 0}, + {"matrix": [11, 3], "x": 13, "y": 0}, + {"matrix": [11, 6], "x": 14, "y": 0}, + {"matrix": [11, 2], "x": 15, "y": 0}, + {"matrix": [11, 1], "x": 16, "y": 0}, + {"matrix": [11, 0], "x": 17, "y": 0}, + {"matrix": [6, 3], "x": 18, "y": 0}, - {"label":"~", "x":0, "y":1}, - {"label":"!", "x":1, "y":1}, - {"label":"@", "x":2, "y":1}, - {"label":"#", "x":3, "y":1}, - {"label":"$", "x":4, "y":1}, - {"label":"%", "x":5, "y":1}, - {"label":"^", "x":6, "y":1}, - {"label":"&", "x":7, "y":1}, - {"label":"*", "x":8, "y":1}, - {"label":"(", "x":9, "y":1}, - {"label":")", "x":10, "y":1}, - {"label":"_", "x":11, "y":1}, - {"label":"+", "x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"label":"Num Lock", "x":15, "y":1}, - {"label":"/", "x":16, "y":1}, - {"label":"*", "x":17, "y":1}, - {"label":"-", "x":18, "y":1}, + {"matrix": [4, 0], "x": 0, "y": 1}, + {"matrix": [4, 1], "x": 1, "y": 1}, + {"matrix": [4, 2], "x": 2, "y": 1}, + {"matrix": [4, 3], "x": 3, "y": 1}, + {"matrix": [4, 4], "x": 4, "y": 1}, + {"matrix": [4, 5], "x": 5, "y": 1}, + {"matrix": [4, 6], "x": 6, "y": 1}, + {"matrix": [4, 7], "x": 7, "y": 1}, + {"matrix": [4, 8], "x": 8, "y": 1}, + {"matrix": [10, 8], "x": 9, "y": 1}, + {"matrix": [10, 7], "x": 10, "y": 1}, + {"matrix": [10, 5], "x": 11, "y": 1}, + {"matrix": [10, 4], "x": 12, "y": 1}, + {"matrix": [10, 3], "x": 13, "y": 1}, + {"matrix": [10, 6], "x": 14, "y": 1}, + {"matrix": [10, 2], "x": 15, "y": 1}, + {"matrix": [10, 1], "x": 16, "y": 1}, + {"matrix": [10, 0], "x": 17, "y": 1}, + {"matrix": [6, 4], "x": 18, "y": 1}, - {"label":"Tab", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"{", "x":11.5, "y":2}, - {"label":"}", "x":12.5, "y":2}, - {"label":"|", "x":13.5, "y":2, "w":1.5}, - {"label":"7", "x":15, "y":2}, - {"label":"8", "x":16, "y":2}, - {"label":"9", "x":17, "y":2}, - {"label":"+", "x":18, "y":2}, + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2}, + {"matrix": [3, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 3], "x": 3.5, "y": 2}, + {"matrix": [3, 4], "x": 4.5, "y": 2}, + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [3, 6], "x": 6.5, "y": 2}, + {"matrix": [3, 7], "x": 7.5, "y": 2}, + {"matrix": [3, 8], "x": 8.5, "y": 2}, + {"matrix": [9, 8], "x": 9.5, "y": 2}, + {"matrix": [9, 7], "x": 10.5, "y": 2}, + {"matrix": [9, 5], "x": 11.5, "y": 2}, + {"matrix": [9, 4], "x": 12.5, "y": 2}, + {"matrix": [8, 4], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [9, 6], "x": 15, "y": 2}, + {"matrix": [9, 2], "x": 16, "y": 2}, + {"matrix": [9, 1], "x": 17, "y": 2}, + {"matrix": [9, 0], "x": 18, "y": 2}, - {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":":", "x":10.75, "y":3}, - {"label":"\"", "x":11.75, "y":3}, - {"label":"Enter", "x":12.75, "y":3, "w":2.25}, - {"label":"4", "x":15, "y":3}, - {"label":"5", "x":16, "y":3}, - {"label":"6", "x":17, "y":3}, - {"x":18, "y":3}, + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3}, + {"matrix": [2, 2], "x": 2.75, "y": 3}, + {"matrix": [2, 3], "x": 3.75, "y": 3}, + {"matrix": [2, 4], "x": 4.75, "y": 3}, + {"matrix": [2, 5], "x": 5.75, "y": 3}, + {"matrix": [2, 6], "x": 6.75, "y": 3}, + {"matrix": [2, 7], "x": 7.75, "y": 3}, + {"matrix": [2, 8], "x": 8.75, "y": 3}, + {"matrix": [8, 8], "x": 9.75, "y": 3}, + {"matrix": [8, 7], "x": 10.75, "y": 3}, + {"matrix": [8, 5], "x": 11.75, "y": 3}, + {"matrix": [9, 3], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [8, 6], "x": 15, "y": 3}, + {"matrix": [8, 2], "x": 16, "y": 3}, + {"matrix": [8, 1], "x": 17, "y": 3}, + {"matrix": [8, 0], "x": 18, "y": 3}, - {"label":"Shift", "x":0, "y":4, "w":1.25}, - {"x":1.25, "y":4}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"<", "x":9.25, "y":4}, - {"label":">", "x":10.25, "y":4}, - {"label":"?", "x":11.25, "y":4}, - {"label":"Shift", "x":12.25, "y":4, "w":1.75}, - {"label":"\u2191", "x":14, "y":4}, - {"label":"1", "x":15, "y":4}, - {"label":"2", "x":16, "y":4}, - {"label":"3", "x":17, "y":4}, - {"label":"Enter", "x":18, "y":4}, + {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 4}, + {"matrix": [1, 2], "x": 2.25, "y": 4}, + {"matrix": [1, 3], "x": 3.25, "y": 4}, + {"matrix": [1, 4], "x": 4.25, "y": 4}, + {"matrix": [1, 5], "x": 5.25, "y": 4}, + {"matrix": [1, 6], "x": 6.25, "y": 4}, + {"matrix": [1, 7], "x": 7.25, "y": 4}, + {"matrix": [1, 8], "x": 8.25, "y": 4}, + {"matrix": [7, 8], "x": 9.25, "y": 4}, + {"matrix": [7, 7], "x": 10.25, "y": 4}, + {"matrix": [7, 5], "x": 11.25, "y": 4}, + {"matrix": [7, 4], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [7, 3], "x": 14, "y": 4}, + {"matrix": [7, 6], "x": 15, "y": 4}, + {"matrix": [7, 2], "x": 16, "y": 4}, + {"matrix": [7, 1], "x": 17, "y": 4}, + {"matrix": [7, 0], "x": 18, "y": 4}, - {"label":"Ctrl", "x":0, "y":5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5, "w":1.25}, - {"x":3.75, "y":5, "w":6.25}, - {"label":"Alt", "x":10, "y":5}, - {"label":"Win", "x":11, "y":5}, - {"x":12, "y":5}, - {"label":"\u2190", "x":13, "y":5}, - {"label":"\u2193", "x":14, "y":5}, - {"label":"\u2192", "x":15, "y":5}, - {"label":"0", "x":16, "y":5}, - {"label":".", "x":17, "y":5}, - {"x":18, "y":5}] + {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [0, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [0, 8], "x": 10, "y": 5}, + {"matrix": [0, 7], "x": 11, "y": 5}, + {"matrix": [0, 5], "x": 12, "y": 5}, + {"matrix": [0, 4], "x": 13, "y": 5}, + {"matrix": [0, 3], "x": 14, "y": 5}, + {"matrix": [6, 6], "x": 15, "y": 5}, + {"matrix": [6, 2], "x": 16, "y": 5}, + {"matrix": [6, 1], "x": 17, "y": 5}, + {"matrix": [6, 0], "x": 18, "y": 5} + ] } } } diff --git a/keyboards/jc65/v32a/info.json b/keyboards/jc65/v32a/info.json index b864754a8cd8..0c6413d58767 100644 --- a/keyboards/jc65/v32a/info.json +++ b/keyboards/jc65/v32a/info.json @@ -26,7 +26,85 @@ "bootloader": "bootloadhid", "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"x":12.75, "y":2}, {"label":"Enter", "x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [5, 1], "x": 6, "y": 0}, + {"matrix": [5, 11], "x": 7, "y": 0}, + {"matrix": [6, 11], "x": 8, "y": 0}, + {"matrix": [6, 1], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [5, 2], "x": 6.5, "y": 1}, + {"matrix": [5, 12], "x": 7.5, "y": 1}, + {"matrix": [6, 12], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [6, 6], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [5, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 13], "x": 7.75, "y": 2}, + {"matrix": [6, 13], "x": 8.75, "y": 2}, + {"matrix": [6, 3], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [6, 8], "x": 15, "y": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [0, 3], "x": 1.25, "y": 3}, + {"matrix": [1, 1], "x": 2.25, "y": 3}, + {"matrix": [1, 2], "x": 3.25, "y": 3}, + {"matrix": [1, 3], "x": 4.25, "y": 3}, + {"matrix": [1, 4], "x": 5.25, "y": 3}, + {"matrix": [1, 5], "x": 6.25, "y": 3}, + {"matrix": [5, 4], "x": 7.25, "y": 3}, + {"matrix": [5, 14], "x": 8.25, "y": 3}, + {"matrix": [6, 14], "x": 9.25, "y": 3}, + {"matrix": [6, 4], "x": 10.25, "y": 3}, + {"matrix": [1, 10], "x": 11.25, "y": 3}, + {"matrix": [1, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [5, 8], "x": 14, "y": 3}, + {"matrix": [6, 7], "x": 15, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [0, 4], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [5, 5], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [0, 5], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [6, 5], "x": 10, "y": 4}, + {"matrix": [0, 11], "x": 11, "y": 4}, + {"matrix": [0, 12], "x": 12, "y": 4}, + {"matrix": [5, 9], "x": 13, "y": 4}, + {"matrix": [5, 7], "x": 14, "y": 4}, + {"matrix": [5, 6], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/jc65/v32a/v32a.h b/keyboards/jc65/v32a/v32a.h deleted file mode 100644 index 91e6164ae2df..000000000000 --- a/keyboards/jc65/v32a/v32a.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2017 Luiz Ribeiro - -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 XXX KC_NO - -#define LAYOUT( \ - k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4D, k4E, k0D, \ - k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C, k3D, k76, \ - k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2C, k2D, k78, \ - k10, k03, k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A, k1B, k68, k77, \ - k00, k01, k02, k04, k65, k05, k75, k0B, k0C, k69, k67, k66 \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, XXX, XXX, k0B, k0C, k0D, XXX }, \ - { k10, k11, k12, k13, k14, k15, XXX, XXX, XXX, XXX, k1A, k1B, XXX, XXX, XXX }, \ - { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, XXX, k2A, k2B, k2C, k2D, XXX }, \ - { k30, k31, k32, k33, k34, k35, XXX, XXX, XXX, XXX, k3A, k3B, k3C, k3D, XXX }, \ - { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E }, \ - { XXX, k61, k62, k63, k64, k65, k66, k67, k68, k69, XXX, k6B, k6C, k6D, k6E }, \ - { XXX, k71, k72, k73, k74, k75, k76, k77, k78, XXX, XXX, k7B, k7C, k7D, k7E } \ -} diff --git a/keyboards/jc65/v32u4/info.json b/keyboards/jc65/v32u4/info.json index 0d278b55ae6d..1c56cc00ee87 100644 --- a/keyboards/jc65/v32u4/info.json +++ b/keyboards/jc65/v32u4/info.json @@ -26,8 +26,85 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Win", "x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] - } + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.75}, + {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 7.75, "y": 4, "w": 2.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] + } } } diff --git a/keyboards/jc65/v32u4/v32u4.h b/keyboards/jc65/v32u4/v32u4.h deleted file mode 100644 index 8bab085b1159..000000000000 --- a/keyboards/jc65/v32u4/v32u4.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3E, k3F, \ - k40, k41, k43, k44, k46, k48, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, XXX, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F }, \ - { k40, k41, XXX, k43, k44, XXX, k46, XXX, k48, XXX, k4A, k4B, k4C, k4D, k4E, k4F } \ -} diff --git a/keyboards/jd40/info.json b/keyboards/jd40/info.json index 215e32f5d0fb..1e11f466a076 100644 --- a/keyboards/jd40/info.json +++ b/keyboards/jd40/info.json @@ -21,50 +21,53 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "Q", "x": 1, "y": 0 }, - { "label": "W", "x": 2, "y": 0 }, - { "label": "E", "x": 3, "y": 0 }, - { "label": "R", "x": 4, "y": 0 }, - { "label": "T", "x": 5, "y": 0 }, - { "label": "Y", "x": 6, "y": 0 }, - { "label": "U", "x": 7, "y": 0 }, - { "label": "I", "x": 8, "y": 0 }, - { "label": "O", "x": 9, "y": 0 }, - { "label": "P", "x": 10, "y": 0 }, - { "label": "Back
Space", "x": 11, "y": 0 }, - { "label": "Tab", "x": 0, "y": 1, "w": 1.25 }, - { "label": "A", "x": 1.25, "y": 1 }, - { "label": "S", "x": 2.25, "y": 1 }, - { "label": "D", "x": 3.25, "y": 1 }, - { "label": "F", "x": 4.25, "y": 1 }, - { "label": "G", "x": 5.25, "y": 1 }, - { "label": "H", "x": 6.25, "y": 1 }, - { "label": "J", "x": 7.25, "y": 1 }, - { "label": "K", "x": 8.25, "y": 1 }, - { "label": "L", "x": 9.25, "y": 1 }, - { "label": "Enter", "x": 10.25, "y": 1, "w": 1.75 }, - { "label": "Shift", "x": 0, "y": 2, "w": 1.75 }, - { "label": "Z", "x": 1.75, "y": 2 }, - { "label": "X", "x": 2.75, "y": 2 }, - { "label": "C", "x": 3.75, "y": 2 }, - { "label": "V", "x": 4.75, "y": 2 }, - { "label": "B", "x": 5.75, "y": 2 }, - { "label": "N", "x": 6.75, "y": 2 }, - { "label": "M", "x": 7.75, "y": 2 }, - { "label": "<", "x": 8.75, "y": 2 }, - { "label": "Shift", "x": 9.75, "y": 2, "w": 1.25 }, - { "label": ">", "x": 11, "y": 2 }, - { "label": "Ctrl", "x": 0, "y": 3 }, - { "label": "Fn", "x": 1, "y": 3 }, - { "label": "Alt", "x": 2, "y": 3 }, - { "label": "Super", "x": 3, "y": 3, "w": 1.25 }, - { "x": 4.25, "y": 3, "w": 1.75 }, - { "x": 6, "y": 3, "w": 1.75 }, - { "label": "Menu", "x": 7.75, "y": 3, "w": 1.25 }, - { "label": "Alt", "x": 9, "y": 3 }, - { "label": "Fn2", "x": 10, "y": 3 }, - { "label": "Ctrl", "x": 11, "y": 3 } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25}, + {"matrix": [2, 10], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.25, "y": 3, "w": 1.75}, + {"matrix": [3, 6], "x": 6, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 7.75, "y": 3, "w": 1.25}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3} ] } } diff --git a/keyboards/jd40/jd40.h b/keyboards/jd40/jd40.h deleted file mode 100644 index 41ec860e8f22..000000000000 --- a/keyboards/jd40/jd40.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" -#include "led.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, \ - k30, k31, k32, k33, k34, k36, k37, k38, k39, k3A \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, XXX }, \ - { k30, k31, k32, k33, k34, XXX, k36, k37, k38, k39, k3A, XXX } \ -} diff --git a/keyboards/jd45/info.json b/keyboards/jd45/info.json index c401d179ebbd..367c9291db41 100644 --- a/keyboards/jd45/info.json +++ b/keyboards/jd45/info.json @@ -21,53 +21,56 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Tab", "x": 0, "y": 0 }, - { "label": "Q", "x": 1, "y": 0 }, - { "label": "W", "x": 2, "y": 0 }, - { "label": "E", "x": 3, "y": 0 }, - { "label": "R", "x": 4, "y": 0 }, - { "label": "T", "x": 5, "y": 0 }, - { "label": "Y", "x": 6, "y": 0 }, - { "label": "U", "x": 7, "y": 0 }, - { "label": "I", "x": 8, "y": 0 }, - { "label": "O", "x": 9, "y": 0 }, - { "label": "P", "x": 10, "y": 0 }, - { "label": "Back
Space", "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "label": "Caps", "x": 0, "y": 1, "w": 1.25 }, - { "label": "A", "x": 1.25, "y": 1 }, - { "label": "S", "x": 2.25, "y": 1 }, - { "label": "D", "x": 3.25, "y": 1 }, - { "label": "F", "x": 4.25, "y": 1 }, - { "label": "G", "x": 5.25, "y": 1 }, - { "label": "H", "x": 6.25, "y": 1 }, - { "label": "J", "x": 7.25, "y": 1 }, - { "label": "K", "x": 8.25, "y": 1 }, - { "label": "L", "x": 9.25, "y": 1 }, - { "label": ":", "x": 10.25, "y": 1 }, - { "label": "Enter", "x": 11.25, "y": 1, "w": 1.75 }, - { "label": "Shift", "x": 0, "y": 2, "w": 1.75 }, - { "label": "Z", "x": 1.75, "y": 2 }, - { "label": "X", "x": 2.75, "y": 2 }, - { "label": "C", "x": 3.75, "y": 2 }, - { "label": "V", "x": 4.75, "y": 2 }, - { "label": "B", "x": 5.75, "y": 2 }, - { "label": "N", "x": 6.75, "y": 2 }, - { "label": "M", "x": 7.75, "y": 2 }, - { "label": "<", "x": 8.75, "y": 2 }, - { "label": ">", "x": 9.75, "y": 2 }, - { "label": "?", "x": 10.75, "y": 2 }, - { "label": "Shift", "x": 11.75, "y": 2, "w": 1.25 }, - { "label": "Hyper", "x": 0, "y": 3, "w": 1.25 }, - { "label": "Super", "x": 1.25, "y": 3 }, - { "label": "Meta", "x": 2.25, "y": 3, "w": 1.25 }, - { "label": "Alt", "x": 3.5, "y": 3, "w": 1.25 }, - { "x": 4.75, "y": 3, "w": 1.75 }, - { "x": 6.5, "y": 3, "w": 1.75 }, - { "label": "Meta", "x": 8.25, "y": 3, "w": 1.25 }, - { "label": "Super", "x": 9.5, "y": 3, "w": 1.25 }, - { "label": "Fn2", "x": 10.75, "y": 3 }, - { "label": "Ctrl", "x": 11.75, "y": 3, "w": 1.25 } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 1.75}, + {"matrix": [3, 6], "x": 6.5, "y": 3, "w": 1.75}, + {"matrix": [3, 8], "x": 8.25, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/jd45/jd45.h b/keyboards/jd45/jd45.h deleted file mode 100644 index ab560e742c48..000000000000 --- a/keyboards/jd45/jd45.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* JD45 keymap definition macro - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, \ - 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, k36, k38, k39, k3A, k3B \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX }, \ - { k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3A, k3B, XXX } \ -} diff --git a/keyboards/jiran/info.json b/keyboards/jiran/info.json index de64ba20a04b..143eaaa55798 100644 --- a/keyboards/jiran/info.json +++ b/keyboards/jiran/info.json @@ -17,76 +17,5 @@ "soft_serial_pin": "D1" }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"x":1, "y":0.75}, - {"x":2, "y":0.62}, - {"x":3, "y":0.25}, - {"x":4, "y":0}, - {"x":5, "y":0.25}, - {"x":6, "y":0.37}, - - {"x":11.75, "y":0.37}, - {"x":12.75, "y":0.25}, - {"x":13.75, "y":0}, - {"x":14.75, "y":0.25}, - {"x":15.75, "y":0.62}, - {"x":16.75, "y":0.75}, - - {"x":0, "y":2.5}, - {"x":1, "y":1.75}, - {"x":2, "y":1.62}, - {"x":3, "y":1.25}, - {"x":4, "y":1}, - {"x":5, "y":1.25}, - {"x":6, "y":1.37}, - - {"x":11.75, "y":1.37}, - {"x":12.75, "y":1.25}, - {"x":13.75, "y":1}, - {"x":14.75, "y":1.25}, - {"x":15.75, "y":1.62}, - {"x":16.75, "y":1.75}, - {"x":17.75, "y":2.5}, - - {"x":1, "y":2.75}, - {"x":2, "y":2.62}, - {"x":3, "y":2.25}, - {"x":4, "y":2}, - {"x":5, "y":2.25}, - {"x":6, "y":2.37}, - - {"x":11.75, "y":2.37}, - {"x":12.75, "y":2.25}, - {"x":13.75, "y":2}, - {"x":14.75, "y":2.25}, - {"x":15.75, "y":2.62}, - {"x":16.75, "y":2.75}, - - {"x":1, "y":3.75}, - {"x":2, "y":3.62}, - {"x":3, "y":3.25}, - {"x":4, "y":3}, - {"x":5, "y":3.25}, - {"x":6, "y":3.37}, - - {"x":11.75, "y":3.37}, - {"x":12.75, "y":3.25}, - {"x":13.75, "y":3}, - {"x":14.75, "y":3.25}, - {"x":15.75, "y":3.62}, - {"x":16.75, "y":3.75}, - - {"x":5, "y":4.25}, - {"x":6, "y":4.37}, - {"x":7, "y":4.5}, - - {"x":10.75, "y":4.5}, - {"x":11.75, "y":4.37}, - {"x":12.75, "y":4.25} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/jiran/rev1/info.json b/keyboards/jiran/rev1/info.json index 830440f4f6aa..b9a6d56fe6bb 100644 --- a/keyboards/jiran/rev1/info.json +++ b/keyboards/jiran/rev1/info.json @@ -2,5 +2,76 @@ "backlight": { "pin": "B6", "levels": 5 + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.62}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.37}, + + {"matrix": [5, 5], "x": 11.75, "y": 0.37}, + {"matrix": [5, 4], "x": 12.75, "y": 0.25}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 2], "x": 14.75, "y": 0.25}, + {"matrix": [5, 1], "x": 15.75, "y": 0.62}, + {"matrix": [5, 0], "x": 16.75, "y": 0.75}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.62}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.37}, + + {"matrix": [6, 5], "x": 11.75, "y": 1.37}, + {"matrix": [6, 4], "x": 12.75, "y": 1.25}, + {"matrix": [6, 3], "x": 13.75, "y": 1}, + {"matrix": [6, 2], "x": 14.75, "y": 1.25}, + {"matrix": [6, 1], "x": 15.75, "y": 1.62}, + {"matrix": [6, 0], "x": 16.75, "y": 1.75}, + {"matrix": [9, 0], "x": 17.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.62}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.37}, + + {"matrix": [7, 5], "x": 11.75, "y": 2.37}, + {"matrix": [7, 4], "x": 12.75, "y": 2.25}, + {"matrix": [7, 3], "x": 13.75, "y": 2}, + {"matrix": [7, 2], "x": 14.75, "y": 2.25}, + {"matrix": [7, 1], "x": 15.75, "y": 2.62}, + {"matrix": [7, 0], "x": 16.75, "y": 2.75}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.62}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.37}, + + {"matrix": [8, 5], "x": 11.75, "y": 3.37}, + {"matrix": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 2], "x": 14.75, "y": 3.25}, + {"matrix": [8, 1], "x": 15.75, "y": 3.62}, + {"matrix": [8, 0], "x": 16.75, "y": 3.75}, + + {"matrix": [4, 3], "x": 5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.37}, + {"matrix": [4, 5], "x": 7, "y": 4.5}, + + {"matrix": [9, 5], "x": 10.75, "y": 4.5}, + {"matrix": [9, 4], "x": 11.75, "y": 4.37}, + {"matrix": [9, 3], "x": 12.75, "y": 4.25} + ] + } } } diff --git a/keyboards/jiran/rev1/rev1.h b/keyboards/jiran/rev1/rev1.h deleted file mode 100644 index d243bd366baa..000000000000 --- a/keyboards/jiran/rev1/rev1.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - - - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L40, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R45, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L43, L44, L45, R40, R41, R42 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, KC_NO, KC_NO, L43, L44, L45, }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, KC_NO, KC_NO, R42, R41, R40 } \ - } diff --git a/keyboards/jiran/rev2/info.json b/keyboards/jiran/rev2/info.json index fd406420c62b..8539b47652e2 100644 --- a/keyboards/jiran/rev2/info.json +++ b/keyboards/jiran/rev2/info.json @@ -1,5 +1,76 @@ { "ws2812": { "pin": "B6" - } + }, + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1, "y": 0.75}, + {"matrix": [0, 1], "x": 2, "y": 0.62}, + {"matrix": [0, 2], "x": 3, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.37}, + + {"matrix": [5, 5], "x": 11.75, "y": 0.37}, + {"matrix": [5, 4], "x": 12.75, "y": 0.25}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 2], "x": 14.75, "y": 0.25}, + {"matrix": [5, 1], "x": 15.75, "y": 0.62}, + {"matrix": [5, 0], "x": 16.75, "y": 0.75}, + + {"matrix": [4, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 0], "x": 1, "y": 1.75}, + {"matrix": [1, 1], "x": 2, "y": 1.62}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.37}, + + {"matrix": [6, 5], "x": 11.75, "y": 1.37}, + {"matrix": [6, 4], "x": 12.75, "y": 1.25}, + {"matrix": [6, 3], "x": 13.75, "y": 1}, + {"matrix": [6, 2], "x": 14.75, "y": 1.25}, + {"matrix": [6, 1], "x": 15.75, "y": 1.62}, + {"matrix": [6, 0], "x": 16.75, "y": 1.75}, + {"matrix": [9, 0], "x": 17.75, "y": 2.5}, + + {"matrix": [2, 0], "x": 1, "y": 2.75}, + {"matrix": [2, 1], "x": 2, "y": 2.62}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.37}, + + {"matrix": [7, 5], "x": 11.75, "y": 2.37}, + {"matrix": [7, 4], "x": 12.75, "y": 2.25}, + {"matrix": [7, 3], "x": 13.75, "y": 2}, + {"matrix": [7, 2], "x": 14.75, "y": 2.25}, + {"matrix": [7, 1], "x": 15.75, "y": 2.62}, + {"matrix": [7, 0], "x": 16.75, "y": 2.75}, + + {"matrix": [3, 0], "x": 1, "y": 3.75}, + {"matrix": [3, 1], "x": 2, "y": 3.62}, + {"matrix": [3, 2], "x": 3, "y": 3.25}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3.25}, + {"matrix": [3, 5], "x": 6, "y": 3.37}, + + {"matrix": [8, 5], "x": 11.75, "y": 3.37}, + {"matrix": [8, 4], "x": 12.75, "y": 3.25}, + {"matrix": [8, 3], "x": 13.75, "y": 3}, + {"matrix": [8, 2], "x": 14.75, "y": 3.25}, + {"matrix": [8, 1], "x": 15.75, "y": 3.62}, + {"matrix": [8, 0], "x": 16.75, "y": 3.75}, + + {"matrix": [4, 3], "x": 5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.37}, + {"matrix": [4, 5], "x": 7, "y": 4.5}, + + {"matrix": [9, 5], "x": 10.75, "y": 4.5}, + {"matrix": [9, 4], "x": 11.75, "y": 4.37}, + {"matrix": [9, 3], "x": 12.75, "y": 4.25} + ] + } + } } diff --git a/keyboards/jiran/rev2/rev2.h b/keyboards/jiran/rev2/rev2.h deleted file mode 100644 index 01ffe1a48edf..000000000000 --- a/keyboards/jiran/rev2/rev2.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L40, L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R45, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L43, L44, L45, R40, R41, R42 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, KC_NO, KC_NO, L43, L44, L45, }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, KC_NO, KC_NO, R42, R41, R40 } \ - } diff --git a/keyboards/jones/v1/info.json b/keyboards/jones/v1/info.json index be2d9e64c955..cd0286ef6bfc 100644 --- a/keyboards/jones/v1/info.json +++ b/keyboards/jones/v1/info.json @@ -30,12 +30,87 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.5, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, - {"x":0.5, "y":1, "w":1.5}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1, "w":1.5}, - {"x":0.5, "y":2, "w":1.5}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2, "w":1.5}, - {"x":0.5, "y":3}, {"x":1.5, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":8.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, - {"x":0.5, "y":4}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4}, {"x":7.5, "y":4}, {"x":8.5, "y":4}, {"x":9.5, "y":4, "w":1.5}, {"x":11, "y":4, "w":1.25}, {"x":12.25, "y":4, "w":1.25}, {"x":13.5, "y":4}, {"x":14.5, "y":4}, - {"x":0, "y":5}, {"x":1, "y":5}, {"x":14, "y":5}, {"x":15, "y":5} + {"label": "k09", "matrix": [0, 9], "x": 0.5, "y": 0}, + {"label": "k59", "matrix": [5, 9], "x": 1.5, "y": 0}, + {"label": "k08", "matrix": [0, 8], "x": 2.5, "y": 0}, + {"label": "k54", "matrix": [5, 4], "x": 3.5, "y": 0}, + {"label": "k04", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "k50", "matrix": [5, 0], "x": 5.5, "y": 0}, + {"label": "k56", "matrix": [5, 6], "x": 6.5, "y": 0}, + {"label": "k06", "matrix": [0, 6], "x": 7.5, "y": 0}, + {"label": "k05", "matrix": [0, 5], "x": 8.5, "y": 0}, + {"label": "k52", "matrix": [5, 2], "x": 9.5, "y": 0}, + {"label": "k02", "matrix": [0, 2], "x": 10.5, "y": 0}, + {"label": "k53", "matrix": [5, 3], "x": 11.5, "y": 0}, + {"label": "k07", "matrix": [0, 7], "x": 12.5, "y": 0}, + {"label": "k51", "matrix": [5, 1], "x": 13.5, "y": 0}, + {"label": "k01", "matrix": [0, 1], "x": 14.5, "y": 0}, + + {"label": "k19", "matrix": [1, 9], "x": 0.5, "y": 1, "w": 1.5}, + {"label": "k69", "matrix": [6, 9], "x": 2, "y": 1}, + {"label": "k18", "matrix": [1, 8], "x": 3, "y": 1}, + {"label": "k64", "matrix": [6, 4], "x": 4, "y": 1}, + {"label": "k14", "matrix": [1, 4], "x": 5, "y": 1}, + {"label": "k60", "matrix": [6, 0], "x": 6, "y": 1}, + {"label": "k10", "matrix": [1, 0], "x": 7, "y": 1}, + {"label": "k16", "matrix": [1, 6], "x": 8, "y": 1}, + {"label": "k15", "matrix": [1, 5], "x": 9, "y": 1}, + {"label": "k62", "matrix": [6, 2], "x": 10, "y": 1}, + {"label": "k12", "matrix": [1, 2], "x": 11, "y": 1}, + {"label": "k63", "matrix": [6, 3], "x": 12, "y": 1}, + {"label": "k17", "matrix": [1, 7], "x": 13, "y": 1}, + {"label": "k61", "matrix": [6, 1], "x": 14, "y": 1, "w": 1.5}, + + {"label": "k29", "matrix": [2, 9], "x": 0.5, "y": 2, "w": 1.5}, + {"label": "k79", "matrix": [7, 9], "x": 2, "y": 2}, + {"label": "k28", "matrix": [2, 8], "x": 3, "y": 2}, + {"label": "k74", "matrix": [7, 4], "x": 4, "y": 2}, + {"label": "k24", "matrix": [2, 4], "x": 5, "y": 2}, + {"label": "k70", "matrix": [7, 0], "x": 6, "y": 2}, + {"label": "k20", "matrix": [2, 0], "x": 7, "y": 2}, + {"label": "k26", "matrix": [2, 6], "x": 8, "y": 2}, + {"label": "k25", "matrix": [2, 5], "x": 9, "y": 2}, + {"label": "k72", "matrix": [7, 2], "x": 10, "y": 2}, + {"label": "k23", "matrix": [2, 3], "x": 11, "y": 2}, + {"label": "k73", "matrix": [7, 3], "x": 12, "y": 2}, + {"label": "k27", "matrix": [2, 7], "x": 13, "y": 2}, + {"label": "k71", "matrix": [7, 1], "x": 14, "y": 2, "w": 1.5}, + + {"label": "k39", "matrix": [3, 9], "x": 0.5, "y": 3}, + {"label": "k89", "matrix": [8, 9], "x": 1.5, "y": 3}, + {"label": "k38", "matrix": [3, 8], "x": 2.5, "y": 3}, + {"label": "k84", "matrix": [8, 4], "x": 3.5, "y": 3}, + {"label": "k34", "matrix": [3, 4], "x": 4.5, "y": 3}, + {"label": "k80", "matrix": [8, 0], "x": 5.5, "y": 3}, + {"label": "k30", "matrix": [3, 0], "x": 6.5, "y": 3}, + {"label": "k36", "matrix": [3, 6], "x": 7.5, "y": 3}, + {"label": "k35", "matrix": [3, 5], "x": 8.5, "y": 3}, + {"label": "k82", "matrix": [8, 2], "x": 9.5, "y": 3}, + {"label": "k32", "matrix": [3, 2], "x": 10.5, "y": 3}, + {"label": "k83", "matrix": [8, 3], "x": 11.5, "y": 3}, + {"label": "k37", "matrix": [3, 7], "x": 12.5, "y": 3}, + {"label": "k81", "matrix": [8, 1], "x": 13.5, "y": 3}, + {"label": "k31", "matrix": [3, 1], "x": 14.5, "y": 3}, + + {"label": "k49", "matrix": [4, 9], "x": 0.5, "y": 4}, + {"label": "k98", "matrix": [9, 8], "x": 1.5, "y": 4}, + {"label": "k48", "matrix": [4, 8], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "k94", "matrix": [9, 4], "x": 3.75, "y": 4, "w": 1.25}, + {"label": "k90", "matrix": [9, 0], "x": 5, "y": 4, "w": 1.5}, + {"label": "k46", "matrix": [4, 6], "x": 6.5, "y": 4}, + {"label": "k45", "matrix": [4, 5], "x": 7.5, "y": 4}, + {"label": "k92", "matrix": [9, 2], "x": 8.5, "y": 4}, + {"label": "k42", "matrix": [4, 2], "x": 9.5, "y": 4, "w": 1.5}, + {"label": "k93", "matrix": [9, 3], "x": 11, "y": 4, "w": 1.25}, + {"label": "k47", "matrix": [4, 7], "x": 12.25, "y": 4, "w": 1.25}, + {"label": "k91", "matrix": [9, 1], "x": 13.5, "y": 4}, + {"label": "k41", "matrix": [4, 1], "x": 14.5, "y": 4}, + + {"label": "k85", "matrix": [8, 5], "x": 0, "y": 5}, + {"label": "k86", "matrix": [8, 6], "x": 1, "y": 5}, + + {"label": "k95", "matrix": [9, 5], "x": 14, "y": 5}, + {"label": "k96", "matrix": [9, 6], "x": 15, "y": 5} ] } } diff --git a/keyboards/jones/v1/v1.c b/keyboards/jones/v1/v1.c index 292a1fbabed9..bb13049a6718 100644 --- a/keyboards/jones/v1/v1.c +++ b/keyboards/jones/v1/v1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "v1.h" +#include QMK_KEYBOARD_H #if defined(AUDIO_ENABLE) && defined(MUSIC_MAP) const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = LAYOUT( diff --git a/keyboards/jones/v1/v1.h b/keyboards/jones/v1/v1.h deleted file mode 100644 index e37c34accc60..000000000000 --- a/keyboards/jones/v1/v1.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2021 Takeshi Nishio - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#pragma once - -#include "quantum.h" - -/* -FULL 10x10 ROUND-ROBIN MATRIX for Reference - -{ KC_NO, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ -{ k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19 }, \ -{ k20, k21, KC_NO, k23, k24, k25, k26, k27, k28, k29 }, \ -{ k30, k31, k32, KC_NO, k34, k35, k36, k37, k38, k39 }, \ -{ k40, k41, k42, k43, KC_NO, k45, k46, k47, k48, k49 }, \ -{ k50, k51, k52, k53, k54, KC_NO, k56, k57, k58, k59 }, \ -{ k60, k61, k62, k63, k64, k65, KC_NO, k67, k68, k69 }, \ -{ k70, k71, k72, k73, k74, k75, k76, KC_NO, k78, k79 }, \ -{ k80, k81, k82, k83, k84, k85, k86, k87, KC_NO, k89 }, \ -{ k90, k91, k92, k93, k94, k95, k96, k97, k98, KC_NO } \ - -*/ - -/* Keys on 6th row are used with rotary encoder. */ -#define LAYOUT( \ - k09, k59, k08, k54, k04, k50, k56, k06, k05, k52, k02, k53, k07, k51, k01, \ - k19, k69, k18, k64, k14, k60, k10, k16, k15, k62, k12, k63, k17, k61, \ - k29, k79, k28, k74, k24, k70, k20, k26, k25, k72, k23, k73, k27, k71, \ - k39, k89, k38, k84, k34, k80, k30, k36, k35, k82, k32, k83, k37, k81, k31, \ - k49, k98, k48, k94, k90, k46, k45, k92, k42, k93, k47, k91, k41, \ - k85, k86, k95, k96 \ -) \ -{ \ - { KC_NO, k01, k02, KC_NO, k04, k05, k06, k07, k08, k09, }, \ - { k10, KC_NO, k12, KC_NO, k14, k15, k16, k17, k18, k19, }, \ - { k20, KC_NO, KC_NO, k23, k24, k25, k26, k27, k28, k29, }, \ - { k30, k31, k32, KC_NO, k34, k35, k36, k37, k38, k39, }, \ - { KC_NO, k41, k42, KC_NO, KC_NO, k45, k46, k47, k48, k49, }, \ - { k50, k51, k52, k53, k54, KC_NO, k56, KC_NO, KC_NO, k59, }, \ - { k60, k61, k62, k63, k64, KC_NO, KC_NO, KC_NO, KC_NO, k69, }, \ - { k70, k71, k72, k73, k74, KC_NO, KC_NO, KC_NO, KC_NO, k79, }, \ - { k80, k81, k82, k83, k84, k85, k86, KC_NO, KC_NO, k89, }, \ - { k90, k91, k92, k93, k94, k95, k96, KC_NO, k98, KC_NO } \ -} diff --git a/keyboards/jorne/rev1/info.json b/keyboards/jorne/rev1/info.json index 7076f980cffe..c3a0ba00c670 100644 --- a/keyboards/jorne/rev1/info.json +++ b/keyboards/jorne/rev1/info.json @@ -24,57 +24,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 1.125}, - {"x": 1, "y": 0.375}, - {"x": 2, "y": 0.375}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0.125}, - {"x": 6, "y": 0.25}, + {"matrix": [3, 0], "x": 0, "y": 1.125}, + {"matrix": [0, 0], "x": 1, "y": 0.375}, + {"matrix": [0, 1], "x": 2, "y": 0.375}, + {"matrix": [0, 2], "x": 3, "y": 0.125}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0.125}, + {"matrix": [0, 5], "x": 6, "y": 0.25}, - {"x": 10.5, "y": 0.25}, - {"x": 11.5, "y": 0.125}, - {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0.125}, - {"x": 14.5, "y": 0.375}, - {"x": 15.5, "y": 0.375}, - {"x": 16.5, "y": 1.125}, + {"matrix": [4, 5], "x": 10.5, "y": 0.25}, + {"matrix": [4, 4], "x": 11.5, "y": 0.125}, + {"matrix": [4, 3], "x": 12.5, "y": 0}, + {"matrix": [4, 2], "x": 13.5, "y": 0.125}, + {"matrix": [4, 1], "x": 14.5, "y": 0.375}, + {"matrix": [4, 0], "x": 15.5, "y": 0.375}, + {"matrix": [7, 0], "x": 16.5, "y": 1.125}, - {"x": 1, "y": 1.375}, - {"x": 2, "y": 1.375}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1.125}, - {"x": 6, "y": 1.25}, + {"matrix": [1, 0], "x": 1, "y": 1.375}, + {"matrix": [1, 1], "x": 2, "y": 1.375}, + {"matrix": [1, 2], "x": 3, "y": 1.125}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1.125}, + {"matrix": [1, 5], "x": 6, "y": 1.25}, - {"x": 10.5, "y": 1.25}, - {"x": 11.5, "y": 1.125}, - {"x": 12.5, "y": 1}, - {"x": 13.5, "y": 1.125}, - {"x": 14.5, "y": 1.375}, - {"x": 15.5, "y": 1.375}, + {"matrix": [5, 5], "x": 10.5, "y": 1.25}, + {"matrix": [5, 4], "x": 11.5, "y": 1.125}, + {"matrix": [5, 3], "x": 12.5, "y": 1}, + {"matrix": [5, 2], "x": 13.5, "y": 1.125}, + {"matrix": [5, 1], "x": 14.5, "y": 1.375}, + {"matrix": [5, 0], "x": 15.5, "y": 1.375}, - {"x": 1, "y": 2.375}, - {"x": 2, "y": 2.375}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2.125}, - {"x": 6, "y": 2.25}, + {"matrix": [2, 0], "x": 1, "y": 2.375}, + {"matrix": [2, 1], "x": 2, "y": 2.375}, + {"matrix": [2, 2], "x": 3, "y": 2.125}, + {"matrix": [2, 3], "x": 4, "y": 2}, + {"matrix": [2, 4], "x": 5, "y": 2.125}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, - {"x": 10.5, "y": 2.25}, - {"x": 11.5, "y": 2.125}, - {"x": 12.5, "y": 2}, - {"x": 13.5, "y": 2.125}, - {"x": 14.5, "y": 2.375}, - {"x": 15.5, "y": 2.375}, + {"matrix": [6, 5], "x": 10.5, "y": 2.25}, + {"matrix": [6, 4], "x": 11.5, "y": 2.125}, + {"matrix": [6, 3], "x": 12.5, "y": 2}, + {"matrix": [6, 2], "x": 13.5, "y": 2.125}, + {"matrix": [6, 1], "x": 14.5, "y": 2.375}, + {"matrix": [6, 0], "x": 15.5, "y": 2.375}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4}, - {"x": 7, "y": 3.5, "h": 1.5}, + {"matrix": [3, 3], "x": 5, "y": 4}, + {"matrix": [3, 4], "x": 6, "y": 4}, + {"matrix": [3, 5], "x": 7, "y": 3.5, "h": 1.5}, - {"x": 9.5, "y": 3.5, "h": 1.5}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4} + {"matrix": [7, 5], "x": 9.5, "y": 3.5, "h": 1.5}, + {"matrix": [7, 4], "x": 10.5, "y": 4}, + {"matrix": [7, 3], "x": 11.5, "y": 4} ] } } diff --git a/keyboards/jorne/rev1/rev1.h b/keyboards/jorne/rev1/rev1.h deleted file mode 100644 index 0158032e5e6e..000000000000 --- a/keyboards/jorne/rev1/rev1.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2021 Joric (@joric) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ -L33, L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R33, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, R30, R31, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L33, KC_NO, KC_NO, L30, L31, L32 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R33, KC_NO, KC_NO, R32, R31, R30 } \ - } diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json index a7553afc4b98..97d8d9b76386 100644 --- a/keyboards/k34/info.json +++ b/keyboards/k34/info.json @@ -18,47 +18,47 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Q", "x": 0, "y": 0.3 }, - { "label": "W", "x": 1, "y": 0.1 }, - { "label": "E", "x": 2, "y": 0 }, - { "label": "R", "x": 3, "y": 0.1 }, - { "label": "T", "x": 4, "y": 0.2 }, + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.1}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0.2}, - { "label": "Y", "x": 8, "y": 0.2 }, - { "label": "U", "x": 9, "y": 0.1 }, - { "label": "I", "x": 10, "y": 0 }, - { "label": "O", "x": 11, "y": 0.1 }, - { "label": "P", "x": 12, "y": 0.3 }, + {"matrix": [0, 5], "x": 8, "y": 0.2}, + {"matrix": [0, 6], "x": 9, "y": 0.1}, + {"matrix": [0, 7], "x": 10, "y": 0}, + {"matrix": [0, 8], "x": 11, "y": 0.1}, + {"matrix": [0, 9], "x": 12, "y": 0.3}, - { "label": "A", "x": 0, "y": 1.3 }, - { "label": "S", "x": 1, "y": 1.1 }, - { "label": "D", "x": 2, "y": 1 }, - { "label": "F", "x": 3, "y": 1.1 }, - { "label": "G", "x": 4, "y": 1.2 }, + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1.2}, - { "label": "H", "x": 8, "y": 1.2 }, - { "label": "J", "x": 9, "y": 1.1 }, - { "label": "K", "x": 10, "y": 1 }, - { "label": "L", "x": 11, "y": 1.1 }, - { "label": ";", "x": 12, "y": 1.3 }, + {"matrix": [1, 5], "x": 8, "y": 1.2}, + {"matrix": [1, 6], "x": 9, "y": 1.1}, + {"matrix": [1, 7], "x": 10, "y": 1}, + {"matrix": [1, 8], "x": 11, "y": 1.1}, + {"matrix": [1, 9], "x": 12, "y": 1.3}, - { "label": "Z", "x": 0, "y": 2.3 }, - { "label": "X", "x": 1, "y": 2.1 }, - { "label": "C", "x": 2, "y": 2 }, - { "label": "V", "x": 3, "y": 2.1 }, - { "label": "B", "x": 4, "y": 2.2 }, + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.1}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2.2}, - { "label": "N", "x": 8, "y": 2.2 }, - { "label": "M", "x": 9, "y": 2.1 }, - { "label": ",", "x": 10, "y": 2 }, - { "label": ".", "x": 11, "y": 2.1 }, - { "label": "/", "x": 12, "y": 2.3 }, + {"matrix": [2, 5], "x": 8, "y": 2.2}, + {"matrix": [2, 6], "x": 9, "y": 2.1}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2.1}, + {"matrix": [2, 9], "x": 12, "y": 2.3}, - { "label": "GUI", "x": 3, "y": 3.7 }, - { "label": "Lower", "x": 4, "y": 3.7 }, + {"matrix": [3, 3], "x": 3, "y": 3.7}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, - { "label": "Raise", "x": 8, "y": 3.7 }, - { "label": "Alt", "x": 9, "y": 3.7 } + {"matrix": [3, 5], "x": 8, "y": 3.7}, + {"matrix": [3, 6], "x": 9, "y": 3.7} ] } } diff --git a/keyboards/k34/k34.h b/keyboards/k34/k34.h deleted file mode 100644 index e34f5408d4bd..000000000000 --- a/keyboards/k34/k34.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2021 jp_smasher (@jp_smasher) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k33, k34, k35, k36 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { KC_NO, KC_NO, KC_NO, k33, k34, k35, k36, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/kabedon/kabedon78s/info.json b/keyboards/kabedon/kabedon78s/info.json index 3d99357320c8..345fdba511a1 100644 --- a/keyboards/kabedon/kabedon78s/info.json +++ b/keyboards/kabedon/kabedon78s/info.json @@ -21,111 +21,134 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":1.5, "y":0}, - {"label":"F1", "x":3.5, "y":0}, - {"label":"F2", "x":4.5, "y":0}, - {"label":"F3", "x":5.5, "y":0}, - {"label":"F4", "x":6.5, "y":0}, - {"label":"F5", "x":8, "y":0}, - {"label":"F6", "x":10, "y":0}, - {"label":"F7", "x":11, "y":0}, - {"label":"F8", "x":12, "y":0}, - {"label":"F9", "x":13.5, "y":0}, - {"label":"F10", "x":14.5, "y":0}, - {"label":"F11", "x":15.5, "y":0}, - {"label":"F12", "x":16.5, "y":0}, - {"label":"Delete", "x":18.25, "y":0}, - {"label":"Home", "x":19.25, "y":0}, - {"label":"PgUp", "x":20.25, "y":0}, - {"label":"PgDn", "x":21.25, "y":0}, - {"label":"Insert", "x":0, "y":1.25}, - {"label":"~", "x":1.5, "y":1.25}, - {"label":"!", "x":2.5, "y":1.25}, - {"label":"@", "x":3.5, "y":1.25}, - {"label":"#", "x":4.5, "y":1.25}, - {"label":"$", "x":5.5, "y":1.25}, - {"label":"%", "x":6.5, "y":1.25}, - {"label":"^", "x":7.5, "y":1.25}, - {"label":"&", "x":9.5, "y":1.25}, - {"label":"*", "x":10.5, "y":1.25}, - {"label":"(", "x":11.5, "y":1.25}, - {"label":")", "x":12.5, "y":1.25}, - {"label":"_", "x":13.5, "y":1.25}, - {"label":"+", "x":14.5, "y":1.25}, - {"label":"Backspace", "x":15.5, "y":1.25, "w":2}, - {"label":"Num Lock", "x":18.25, "y":1.25}, - {"label":"/", "x":19.25, "y":1.25}, - {"label":"*", "x":20.25, "y":1.25}, - {"label":"-", "x":21.25, "y":1.25}, - {"label":"Pause", "x":0, "y":2.25}, - {"label":"Tab", "x":1.5, "y":2.25, "w":1.5}, - {"label":"Q", "x":3, "y":2.25}, - {"label":"W", "x":4, "y":2.25}, - {"label":"E", "x":5, "y":2.25}, - {"label":"R", "x":6, "y":2.25}, - {"label":"T", "x":7, "y":2.25}, - {"label":"Y", "x":9, "y":2.25}, - {"label":"U", "x":10, "y":2.25}, - {"label":"I", "x":11, "y":2.25}, - {"label":"O", "x":12, "y":2.25}, - {"label":"P", "x":13, "y":2.25}, - {"label":"{", "x":14, "y":2.25}, - {"label":"}", "x":15, "y":2.25}, - {"label":"|", "x":16, "y":2.25, "w":1.5}, - {"label":"7", "x":18.25, "y":2.25}, - {"label":"8", "x":19.25, "y":2.25}, - {"label":"9", "x":20.25, "y":2.25}, - {"label":"+", "x":21.25, "y":2.25, "h":2}, - {"label":"ScrLk", "x":0, "y":3.25}, - {"label":"Caps Lock", "x":1.5, "y":3.25, "w":1.75}, - {"label":"A", "x":3.25, "y":3.25}, - {"label":"S", "x":4.25, "y":3.25}, - {"label":"D", "x":5.25, "y":3.25}, - {"label":"F", "x":6.25, "y":3.25}, - {"label":"G", "x":7.25, "y":3.25}, - {"label":"H", "x":9.25, "y":3.25}, - {"label":"J", "x":10.25, "y":3.25}, - {"label":"K", "x":11.25, "y":3.25}, - {"label":"L", "x":12.25, "y":3.25}, - {"label":":", "x":13.25, "y":3.25}, - {"label":"\"", "x":14.25, "y":3.25}, - {"label":"Enter", "x":15.25, "y":3.25, "w":2.25}, - {"label":"4", "x":18.25, "y":3.25}, - {"label":"5", "x":19.25, "y":3.25}, - {"label":"6", "x":20.25, "y":3.25}, - {"label":"PrtSc", "x":0, "y":4.25}, - {"label":"Shift", "x":1.5, "y":4.25, "w":2.25}, - {"label":"Z", "x":3.75, "y":4.25}, - {"label":"X", "x":4.75, "y":4.25}, - {"label":"C", "x":5.75, "y":4.25}, - {"label":"V", "x":6.75, "y":4.25}, - {"label":"B", "x":7.75, "y":4.25}, - {"label":"N", "x":9.75, "y":4.25}, - {"label":"M", "x":10.75, "y":4.25}, - {"label":"<", "x":11.75, "y":4.25}, - {"label":">", "x":12.75, "y":4.25}, - {"label":"Shift", "x":13.75, "y":4.25, "w":1.75}, - {"label":"UP", "x":15.5, "y":4.25}, - {"label":"?", "x":16.5, "y":4.25}, - {"label":"1", "x":18.25, "y":4.25}, - {"label":"2", "x":19.25, "y":4.25}, - {"label":"3", "x":20.25, "y":4.25}, - {"label":"Enter", "x":21.25, "y":4.25, "h":2}, - {"label":"NmLk", "x":0, "y":5.25}, - {"label":"Ctrl", "x":1.5, "y":5.25, "w":1.25}, - {"label":"Win", "x":2.75, "y":5.25}, - {"label":"Fn", "x":3.75, "y":5.25}, - {"label":"Alt", "x":4.75, "y":5.25, "w":1.25}, - {"label":"space", "x":6, "y":5.25, "w":2.75}, - {"label":"space", "x":9.75, "y":5.25, "w":2.25}, - {"label":"Alt", "x":12, "y":5.25, "w":1.25}, - {"label":"Ctrl", "x":13.25, "y":5.25, "w":1.25}, - {"label":"LEFT", "x":14.5, "y":5.25}, - {"label":"Down", "x":15.5, "y":5.25}, - {"label":"Right", "x":16.5, "y":5.25}, - {"label":"0", "x":18.25, "y":5.25, "w":2}, - {"label":".", "x":20.25, "y":5.25} - ] + {"matrix": [0, 0], "x": 1.5, "y": 0}, + + {"matrix": [0, 1], "x": 3.5, "y": 0}, + {"matrix": [0, 2], "x": 4.5, "y": 0}, + {"matrix": [0, 3], "x": 5.5, "y": 0}, + {"matrix": [0, 4], "x": 6.5, "y": 0}, + + {"matrix": [0, 5], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 10, "y": 0}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0}, + + {"matrix": [0, 10], "x": 13.5, "y": 0}, + {"matrix": [0, 11], "x": 14.5, "y": 0}, + {"matrix": [0, 12], "x": 15.5, "y": 0}, + {"matrix": [0, 13], "x": 16.5, "y": 0}, + + {"matrix": [0, 14], "x": 18.25, "y": 0}, + {"matrix": [0, 15], "x": 19.25, "y": 0}, + {"matrix": [0, 16], "x": 20.25, "y": 0}, + {"matrix": [0, 17], "x": 21.25, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1.25}, + {"matrix": [1, 0], "x": 1.5, "y": 1.25}, + {"matrix": [1, 1], "x": 2.5, "y": 1.25}, + {"matrix": [1, 2], "x": 3.5, "y": 1.25}, + {"matrix": [1, 3], "x": 4.5, "y": 1.25}, + {"matrix": [1, 4], "x": 5.5, "y": 1.25}, + {"matrix": [1, 5], "x": 6.5, "y": 1.25}, + {"matrix": [5, 5], "x": 7.5, "y": 1.25}, + + {"matrix": [1, 7], "x": 9.5, "y": 1.25}, + {"matrix": [1, 8], "x": 10.5, "y": 1.25}, + {"matrix": [1, 9], "x": 11.5, "y": 1.25}, + {"matrix": [1, 10], "x": 12.5, "y": 1.25}, + {"matrix": [1, 11], "x": 13.5, "y": 1.25}, + {"matrix": [1, 12], "x": 14.5, "y": 1.25}, + {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 2}, + + {"matrix": [1, 14], "x": 18.25, "y": 1.25}, + {"matrix": [1, 15], "x": 19.25, "y": 1.25}, + {"matrix": [1, 16], "x": 20.25, "y": 1.25}, + {"matrix": [1, 17], "x": 21.25, "y": 1.25}, + + {"matrix": [2, 6], "x": 0, "y": 2.25}, + + {"matrix": [2, 0], "x": 1.5, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 3, "y": 2.25}, + {"matrix": [2, 2], "x": 4, "y": 2.25}, + {"matrix": [2, 3], "x": 5, "y": 2.25}, + {"matrix": [2, 4], "x": 6, "y": 2.25}, + {"matrix": [2, 5], "x": 7, "y": 2.25}, + + {"matrix": [5, 7], "x": 9, "y": 2.25}, + {"matrix": [2, 7], "x": 10, "y": 2.25}, + {"matrix": [2, 8], "x": 11, "y": 2.25}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.25}, + {"matrix": [2, 11], "x": 14, "y": 2.25}, + {"matrix": [2, 12], "x": 15, "y": 2.25}, + {"matrix": [2, 13], "x": 16, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 14], "x": 18.25, "y": 2.25}, + {"matrix": [2, 15], "x": 19.25, "y": 2.25}, + {"matrix": [2, 16], "x": 20.25, "y": 2.25}, + {"matrix": [2, 17], "x": 21.25, "y": 2.25, "h": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3.25}, + + {"matrix": [3, 0], "x": 1.5, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 3.25, "y": 3.25}, + {"matrix": [3, 2], "x": 4.25, "y": 3.25}, + {"matrix": [3, 3], "x": 5.25, "y": 3.25}, + {"matrix": [3, 4], "x": 6.25, "y": 3.25}, + {"matrix": [3, 5], "x": 7.25, "y": 3.25}, + + {"matrix": [3, 7], "x": 9.25, "y": 3.25}, + {"matrix": [3, 8], "x": 10.25, "y": 3.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3.25}, + {"matrix": [3, 10], "x": 12.25, "y": 3.25}, + {"matrix": [3, 11], "x": 13.25, "y": 3.25}, + {"matrix": [3, 12], "x": 14.25, "y": 3.25}, + {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 2.25}, + + {"matrix": [3, 14], "x": 18.25, "y": 3.25}, + {"matrix": [3, 15], "x": 19.25, "y": 3.25}, + {"matrix": [3, 16], "x": 20.25, "y": 3.25}, + + {"matrix": [4, 6], "x": 0, "y": 4.25}, + + {"matrix": [4, 0], "x": 1.5, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 3.75, "y": 4.25}, + {"matrix": [4, 2], "x": 4.75, "y": 4.25}, + {"matrix": [4, 3], "x": 5.75, "y": 4.25}, + {"matrix": [4, 4], "x": 6.75, "y": 4.25}, + {"matrix": [4, 5], "x": 7.75, "y": 4.25}, + + {"matrix": [4, 7], "x": 9.75, "y": 4.25}, + {"matrix": [4, 8], "x": 10.75, "y": 4.25}, + {"matrix": [4, 9], "x": 11.75, "y": 4.25}, + {"matrix": [4, 10], "x": 12.75, "y": 4.25}, + {"matrix": [4, 11], "x": 13.75, "y": 4.25, "w": 1.75}, + {"matrix": [4, 12], "x": 15.5, "y": 4.25}, + {"matrix": [4, 13], "x": 16.5, "y": 4.25}, + + {"matrix": [4, 14], "x": 18.25, "y": 4.25}, + {"matrix": [4, 15], "x": 19.25, "y": 4.25}, + {"matrix": [4, 16], "x": 20.25, "y": 4.25}, + {"matrix": [4, 17], "x": 21.25, "y": 4.25, "h": 2}, + + {"matrix": [5, 6], "x": 0, "y": 5.25}, + + {"matrix": [5, 0], "x": 1.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 2.75, "y": 5.25}, + {"matrix": [5, 2], "x": 3.75, "y": 5.25}, + {"matrix": [5, 3], "x": 4.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 4], "x": 6, "y": 5.25, "w": 2.75}, + + {"matrix": [5, 8], "x": 9.75, "y": 5.25, "w": 2.25}, + {"matrix": [5, 9], "x": 12, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 13.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 14.5, "y": 5.25}, + {"matrix": [5, 12], "x": 15.5, "y": 5.25}, + {"matrix": [5, 13], "x": 16.5, "y": 5.25}, + + {"matrix": [5, 14], "x": 18.25, "y": 5.25, "w": 2}, + {"matrix": [5, 16], "x": 20.25, "y": 5.25} + ] } } } diff --git a/keyboards/kabedon/kabedon78s/kabedon78s.h b/keyboards/kabedon/kabedon78s/kabedon78s.h deleted file mode 100644 index 64709a9bf4f6..000000000000 --- a/keyboards/kabedon/kabedon78s/kabedon78s.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - KA00, KA01, KA02, KA03, KA04, KA05, KA07, KA08, KA09, KA10, KA11, KA12, KA13, KA14, KA15, KA16, KA17, \ - KB06, KB00, KB01, KB02, KB03, KB04, KB05, KF05, KB07, KB08, KB09, KB10, KB11, KB12, KB13, KB14, KB15, KB16, KB17, \ - KC06, KC00, KC01, KC02, KC03, KC04, KC05, KF07, KC07, KC08, KC09, KC10, KC11, KC12, KC13, KC14, KC15, KC16, KC17, \ - KD06, KD00, KD01, KD02, KD03, KD04, KD05, KD07, KD08, KD09, KD10, KD11, KD12, KD13, KD14, KD15, KD16, \ - KE06, KE00, KE01, KE02, KE03, KE04, KE05, KE07, KE08, KE09, KE10, KE11, KE12, KE13, KE14, KE15, KE16, KE17, \ - KF06, KF00, KF01, KF02, KF03, KF04, KF08, KF09, KF10, KF11, KF12, KF13, KF14, KF16 \ -) { \ - { KA00, KA01, KA02, KA03, KA04, KA05,KC_NO, KA07, KA08, KA09, KA10, KA11, KA12, KA13, KA14, KA15, KA16, KA17}, \ - { KB00, KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09, KB10, KB11, KB12, KB13, KB14, KB15, KB16, KB17}, \ - { KC00, KC01, KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC09, KC10, KC11, KC12, KC13, KC14, KC15, KC16, KC17}, \ - { KD00, KD01, KD02, KD03, KD04, KD05, KD06, KD07, KD08, KD09, KD10, KD11, KD12, KD13, KD14, KD15, KD16,KC_NO}, \ - { KE00, KE01, KE02, KE03, KE04, KE05, KE06, KE07, KE08, KE09, KE10, KE11, KE12, KE13, KE14, KE15, KE16, KE17}, \ - { KF00, KF01, KF02, KF03, KF04, KF05, KF06, KF07, KF08, KF09, KF10, KF11, KF12, KF13, KF14,KC_NO, KF16,KC_NO} \ -} - - diff --git a/keyboards/kabedon/kabedon980/info.json b/keyboards/kabedon/kabedon980/info.json index 5c496829172f..85edf331b9dc 100644 --- a/keyboards/kabedon/kabedon980/info.json +++ b/keyboards/kabedon/kabedon980/info.json @@ -21,105 +21,121 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F1", "x":1.6, "y":0}, - {"label":"F2", "x":2.6, "y":0}, - {"label":"F3", "x":3.6, "y":0}, - {"label":"F4", "x":4.6, "y":0}, - {"label":"F5", "x":6.3, "y":0}, - {"label":"F6", "x":7.3, "y":0}, - {"label":"F7", "x":8.3, "y":0}, - {"label":"F8", "x":9.3, "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":"DELETE", "x":15.3, "y":0}, - {"label":"HOME", "x":16.3, "y":0}, - {"label":"PGUP", "x":17.3, "y":0}, - {"label":"PGDN", "x":18.3, "y":0}, - {"label":"~", "x":0, "y":1.15}, - {"label":"!", "x":1, "y":1.15}, - {"label":"@", "x":2, "y":1.15}, - {"label":"#", "x":3, "y":1.15}, - {"label":"$", "x":4, "y":1.15}, - {"label":"%", "x":5, "y":1.15}, - {"label":"^", "x":6, "y":1.15}, - {"label":"&", "x":7, "y":1.15}, - {"label":"*", "x":8, "y":1.15}, - {"label":"(", "x":9, "y":1.15}, - {"label":")", "x":10, "y":1.15}, - {"label":"_", "x":11, "y":1.15}, - {"label":"+", "x":12, "y":1.15}, - {"label":"BACK SPACE", "x":13, "y":1.15, "w":2}, - {"label":"NUMLK", "x":15.3, "y":1.15}, - {"label":"/", "x":16.3, "y":1.15}, - {"label":"*", "x":17.3, "y":1.15}, - {"label":"-", "x":18.3, "y":1.15}, - {"label":"TAB", "x":0, "y":2.15, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.15}, - {"label":"W", "x":2.5, "y":2.15}, - {"label":"E", "x":3.5, "y":2.15}, - {"label":"R", "x":4.5, "y":2.15}, - {"label":"T", "x":5.5, "y":2.15}, - {"label":"Y", "x":6.5, "y":2.15}, - {"label":"U", "x":7.5, "y":2.15}, - {"label":"I", "x":8.5, "y":2.15}, - {"label":"O", "x":9.5, "y":2.15}, - {"label":"P", "x":10.5, "y":2.15}, - {"label":"[", "x":11.5, "y":2.15}, - {"label":"]", "x":12.5, "y":2.15}, - {"label":"|", "x":13.5, "y":2.15, "w":1.5}, - {"label":"7", "x":15.3, "y":2.15}, - {"label":"8", "x":16.3, "y":2.15}, - {"label":"9", "x":17.3, "y":2.15}, - {"label":"+", "x":18.3, "y":2.15, "h":2}, - {"label":"CAPS LOCK", "x":0, "y":3.15, "w":1.75}, - {"label":"A", "x":1.75, "y":3.15}, - {"label":"S", "x":2.75, "y":3.15}, - {"label":"D", "x":3.75, "y":3.15}, - {"label":"F", "x":4.75, "y":3.15}, - {"label":"G", "x":5.75, "y":3.15}, - {"label":"H", "x":6.75, "y":3.15}, - {"label":"J", "x":7.75, "y":3.15}, - {"label":"K", "x":8.75, "y":3.15}, - {"label":"L", "x":9.75, "y":3.15}, - {"label":":", "x":10.75, "y":3.15}, - {"label":"\"", "x":11.75, "y":3.15}, - {"label":"ENTER", "x":12.75, "y":3.15, "w":2.25}, - {"label":"4", "x":15.3, "y":3.15}, - {"label":"5", "x":16.3, "y":3.15}, - {"label":"6", "x":17.3, "y":3.15}, - {"label":"SHIFT", "x":0, "y":4.15, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.15}, - {"label":"X", "x":3.25, "y":4.15}, - {"label":"C", "x":4.25, "y":4.15}, - {"label":"V", "x":5.25, "y":4.15}, - {"label":"B", "x":6.25, "y":4.15}, - {"label":"N", "x":7.25, "y":4.15}, - {"label":"M", "x":8.25, "y":4.15}, - {"label":"<", "x":9.25, "y":4.15}, - {"label":">", "x":10.25, "y":4.15}, - {"label":"?", "x":11.25, "y":4.15}, - {"label":"SHIFT", "x":12.25, "y":4.15, "w":1.75}, - {"label":"Up", "x":14.15, "y":4.3}, - {"label":"1", "x":15.3, "y":4.15}, - {"label":"2", "x":16.3, "y":4.15}, - {"label":"3", "x":17.3, "y":4.15}, - {"label":"ENTER", "x":18.3, "y":4.15, "h":2}, - {"label":"CTRL", "x":0, "y":5.15, "w":1.25}, - {"label":"WIN", "x":1.25, "y":5.15, "w":1.25}, - {"label":"ALT", "x":2.5, "y":5.15, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.15, "w":6.25}, - {"label":"ALT", "x":10, "y":5.15}, - {"label":"FN", "x":11, "y":5.15}, - {"label":"CTRL", "x":12, "y":5.15}, - {"label":"Left", "x":13.15, "y":5.3}, - {"label":"Down", "x":14.15, "y":5.3}, - {"label":"Right", "x":15.15, "y":5.3}, - {"label":"0", "x":16.3, "y":5.15}, - {"label":".", "x":17.3, "y":5.15} - ] + {"matrix": [8, 6], "x": 0, "y": 0}, + + {"matrix": [2, 4], "x": 1.6, "y": 0}, + {"matrix": [3, 4], "x": 2.6, "y": 0}, + {"matrix": [1, 10], "x": 3.6, "y": 0}, + {"matrix": [0, 5], "x": 4.6, "y": 0}, + + {"matrix": [0, 11], "x": 6.3, "y": 0}, + {"matrix": [0, 2], "x": 7.3, "y": 0}, + {"matrix": [2, 1], "x": 8.3, "y": 0}, + {"matrix": [0, 4], "x": 9.3, "y": 0}, + + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [2, 2], "x": 12, "y": 0}, + {"matrix": [9, 5], "x": 13, "y": 0}, + {"matrix": [4, 6], "x": 14, "y": 0}, + + {"matrix": [7, 3], "x": 15.3, "y": 0}, + {"matrix": [9, 1], "x": 16.3, "y": 0}, + {"matrix": [8, 1], "x": 17.3, "y": 0}, + {"matrix": [8, 0], "x": 18.3, "y": 0}, + + {"matrix": [9, 7], "x": 0, "y": 1.15}, + {"matrix": [2, 5], "x": 1, "y": 1.15}, + {"matrix": [2, 6], "x": 2, "y": 1.15}, + {"matrix": [0, 3], "x": 3, "y": 1.15}, + {"matrix": [7, 7], "x": 4, "y": 1.15}, + {"matrix": [9, 6], "x": 5, "y": 1.15}, + {"matrix": [8, 2], "x": 6, "y": 1.15}, + {"matrix": [1, 7], "x": 7, "y": 1.15}, + {"matrix": [6, 3], "x": 8, "y": 1.15}, + {"matrix": [8, 5], "x": 9, "y": 1.15}, + {"matrix": [6, 5], "x": 10, "y": 1.15}, + {"matrix": [6, 6], "x": 11, "y": 1.15}, + {"matrix": [0, 6], "x": 12, "y": 1.15}, + {"matrix": [3, 2], "x": 13, "y": 1.15, "w": 2}, + + {"matrix": [0, 8], "x": 15.3, "y": 1.15}, + {"matrix": [5, 1], "x": 16.3, "y": 1.15}, + {"matrix": [7, 1], "x": 17.3, "y": 1.15}, + {"matrix": [6, 1], "x": 18.3, "y": 1.15}, + + {"matrix": [8, 3], "x": 0, "y": 2.15, "w": 1.5}, + {"matrix": [9, 2], "x": 1.5, "y": 2.15}, + {"matrix": [3, 6], "x": 2.5, "y": 2.15}, + {"matrix": [3, 5], "x": 3.5, "y": 2.15}, + {"matrix": [1, 4], "x": 4.5, "y": 2.15}, + {"matrix": [2, 3], "x": 5.5, "y": 2.15}, + {"matrix": [4, 3], "x": 6.5, "y": 2.15}, + {"matrix": [5, 7], "x": 7.5, "y": 2.15}, + {"matrix": [1, 8], "x": 8.5, "y": 2.15}, + {"matrix": [6, 2], "x": 9.5, "y": 2.15}, + {"matrix": [1, 11], "x": 10.5, "y": 2.15}, + {"matrix": [1, 2], "x": 11.5, "y": 2.15}, + {"matrix": [5, 5], "x": 12.5, "y": 2.15}, + {"matrix": [4, 1], "x": 13.5, "y": 2.15, "w": 1.5}, + + {"matrix": [6, 0], "x": 15.3, "y": 2.15}, + {"matrix": [0, 1], "x": 16.3, "y": 2.15}, + {"matrix": [5, 8], "x": 17.3, "y": 2.15}, + {"matrix": [5, 0], "x": 18.3, "y": 2.15, "h": 2}, + + {"matrix": [1, 3], "x": 0, "y": 3.15, "w": 1.75}, + {"matrix": [1, 0], "x": 1.75, "y": 3.15}, + {"matrix": [7, 2], "x": 2.75, "y": 3.15}, + {"matrix": [5, 3], "x": 3.75, "y": 3.15}, + {"matrix": [1, 1], "x": 4.75, "y": 3.15}, + {"matrix": [0, 9], "x": 5.75, "y": 3.15}, + {"matrix": [7, 4], "x": 6.75, "y": 3.15}, + {"matrix": [7, 5], "x": 7.75, "y": 3.15}, + {"matrix": [7, 6], "x": 8.75, "y": 3.15}, + {"matrix": [5, 4], "x": 9.75, "y": 3.15}, + {"matrix": [1, 6], "x": 10.75, "y": 3.15}, + {"matrix": [5, 6], "x": 11.75, "y": 3.15}, + {"matrix": [5, 2], "x": 12.75, "y": 3.15, "w": 2.25}, + + {"matrix": [1, 12], "x": 15.3, "y": 3.15}, + {"matrix": [0, 0], "x": 16.3, "y": 3.15}, + {"matrix": [6, 8], "x": 17.3, "y": 3.15}, + + {"matrix": [9, 12], "x": 0, "y": 4.15, "w": 2.25}, + {"matrix": [1, 9], "x": 2.25, "y": 4.15}, + {"matrix": [9, 4], "x": 3.25, "y": 4.15}, + {"matrix": [0, 10], "x": 4.25, "y": 4.15}, + {"matrix": [4, 2], "x": 5.25, "y": 4.15}, + {"matrix": [9, 3], "x": 6.25, "y": 4.15}, + {"matrix": [3, 7], "x": 7.25, "y": 4.15}, + {"matrix": [8, 4], "x": 8.25, "y": 4.15}, + {"matrix": [3, 3], "x": 9.25, "y": 4.15}, + {"matrix": [1, 5], "x": 10.25, "y": 4.15}, + {"matrix": [4, 4], "x": 11.25, "y": 4.15}, + {"matrix": [8, 12], "x": 12.25, "y": 4.15, "w": 1.75}, + + {"matrix": [8, 7], "x": 14.15, "y": 4.3}, + + {"matrix": [3, 1], "x": 15.3, "y": 4.15}, + {"matrix": [8, 8], "x": 16.3, "y": 4.15}, + {"matrix": [7, 8], "x": 17.3, "y": 4.15}, + {"matrix": [2, 0], "x": 18.3, "y": 4.15, "h": 2}, + + {"matrix": [5, 10], "x": 0, "y": 5.15, "w": 1.25}, + {"matrix": [3, 9], "x": 1.25, "y": 5.15, "w": 1.25}, + {"matrix": [7, 11], "x": 2.5, "y": 5.15, "w": 1.25}, + {"matrix": [0, 12], "x": 3.75, "y": 5.15, "w": 6.25}, + {"matrix": [6, 11], "x": 10, "y": 5.15}, + {"matrix": [2, 8], "x": 11, "y": 5.15}, + {"matrix": [4, 10], "x": 12, "y": 5.15}, + + {"matrix": [4, 7], "x": 13.15, "y": 5.3}, + {"matrix": [6, 7], "x": 14.15, "y": 5.3}, + {"matrix": [2, 7], "x": 15.15, "y": 5.3}, + + {"matrix": [3, 0], "x": 16.3, "y": 5.15}, + {"matrix": [7, 0], "x": 17.3, "y": 5.15} + ] } } } diff --git a/keyboards/kabedon/kabedon980/kabedon980.c b/keyboards/kabedon/kabedon980/kabedon980.c index f0c8382d66a5..0614972f5e07 100644 --- a/keyboards/kabedon/kabedon980/kabedon980.c +++ b/keyboards/kabedon/kabedon980/kabedon980.c @@ -1,4 +1,4 @@ -#include "kabedon980.h" +#include "quantum.h" bool led_update_kb(led_t led_state) { if (led_update_user(led_state)) { diff --git a/keyboards/kabedon/kabedon980/kabedon980.h b/keyboards/kabedon/kabedon980/kabedon980.h deleted file mode 100644 index 0355955b666b..000000000000 --- a/keyboards/kabedon/kabedon980/kabedon980.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - KI06, KC04, KD04, KB10, KA05, KA11, KA02, KC01, KA04, KA07, KC02, KJ05, KE06, KH03, KJ01, KI01, KI00, \ - KJ07, KC05, KC06, KA03, KH07, KJ06, KI02, KB07, KG03, KI05, KG05, KG06, KA06, KD02, KA08, KF01, KH01, KG01, \ - KI03, KJ02, KD06, KD05, KB04, KC03, KE03, KF07, KB08, KG02, KB11, KB02, KF05, KE01, KG00, KA01, KF08, KF00, \ - KB03, KB00, KH02, KF03, KB01, KA09, KH04, KH05, KH06, KF04, KB06, KF06, KF02, KB12, KA00, KG08, \ - KJ12, KB09, KJ04, KA10, KE02, KJ03, KD07, KI04, KD03, KB05, KE04, KI12, KI07, KD01, KI08, KH08, KC00, \ - KF10, KD09, KH11, KA12, KG11, KC08, KE10, KE07, KG07, KC07, KD00, KH00 \ -) { \ - { KA00, KA01, KA02, KA03, KA04, KA05, KA06, KA07, KA08, KA09, KA10, KA11, KA12 }, \ - { KB00, KB01, KB02, KB03, KB04, KB05, KB06, KB07, KB08, KB09, KB10, KB11, KB12 }, \ - { KC00, KC01, KC02, KC03, KC04, KC05, KC06, KC07, KC08, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { KD00, KD01, KD02, KD03, KD04, KD05, KD06, KD07, KC_NO, KD09, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, KE01, KE02, KE03, KE04, KC_NO, KE06, KE07, KC_NO, KC_NO, KE10, KC_NO, KC_NO }, \ - { KF00, KF01, KF02, KF03, KF04, KF05, KF06, KF07, KF08, KC_NO, KF10, KC_NO, KC_NO }, \ - { KG00, KG01, KG02, KG03, KC_NO, KG05, KG06, KG07, KG08, KC_NO, KC_NO, KG11, KC_NO }, \ - { KH00, KH01, KH02, KH03, KH04, KH05, KH06, KH07, KH08, KC_NO, KC_NO, KH11, KC_NO }, \ - { KI00, KI01, KI02, KI03, KI04, KI05, KI06, KI07, KI08, KC_NO, KC_NO, KC_NO, KI12 }, \ - { KC_NO, KJ01, KJ02, KJ03, KJ04, KJ05, KJ06, KJ07, KC_NO, KC_NO, KC_NO, KC_NO, KJ12 } \ -} - - diff --git a/keyboards/kabedon/kabedon98e/info.json b/keyboards/kabedon/kabedon98e/info.json index 929fd1a43948..d72aafd2a62d 100644 --- a/keyboards/kabedon/kabedon98e/info.json +++ b/keyboards/kabedon/kabedon98e/info.json @@ -31,112 +31,124 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.5}, - {"label":"F1", "x":1.667, "y":0.5}, - {"label":"F2", "x":2.667, "y":0.5}, - {"label":"F3", "x":3.667, "y":0.5}, - {"label":"F4", "x":4.667, "y":0.5}, - {"label":"F5", "x":6.333, "y":0.5}, - {"label":"F6", "x":7.333, "y":0.5}, - {"label":"F7", "x":8.333, "y":0.5}, - {"label":"F8", "x":9.333, "y":0.5}, - {"label":"F9", "x":11, "y":0.5}, - {"label":"F10", "x":12, "y":0.5}, - {"label":"F11", "x":13, "y":0.5}, - {"label":"F12", "x":14, "y":0.5}, - {"label":"Delete", "x":15.5, "y":0.5}, - {"label":"Home", "x":16.9, "y":0, "w":0.6, "h":0.5}, - {"label":"Insert", "x":17, "y":0.5}, - {"label":"End", "x":17.5, "y":0, "w":0.6, "h":0.5}, - {"label":"PgUp", "x":18.4, "y":0, "w":0.6, "h":0.5}, - {"label":"Mute", "x":18.5, "y":0.5}, - {"label":"PgDn", "x":19, "y":0, "w":0.6, "h":0.5}, - - {"label":"~", "x":0, "y":1.75}, - {"label":"!", "x":1, "y":1.75}, - {"label":"@", "x":2, "y":1.75}, - {"label":"#", "x":3, "y":1.75}, - {"label":"$", "x":4, "y":1.75}, - {"label":"%", "x":5, "y":1.75}, - {"label":"^", "x":6, "y":1.75}, - {"label":"&", "x":7, "y":1.75}, - {"label":"*", "x":8, "y":1.75}, - {"label":"(", "x":9, "y":1.75}, - {"label":")", "x":10, "y":1.75}, - {"label":"_", "x":11, "y":1.75}, - {"label":"+", "x":12, "y":1.75}, - {"label":"Backspace", "x":13, "y":1.75, "w":2}, - {"label":"Num Lock", "x":15.5, "y":1.75}, - {"label":"/", "x":16.5, "y":1.75}, - {"label":"*", "x":17.5, "y":1.75}, - {"label":"-", "x":18.5, "y":1.75}, - - {"label":"Tab", "x":0, "y":2.75, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.75}, - {"label":"W", "x":2.5, "y":2.75}, - {"label":"E", "x":3.5, "y":2.75}, - {"label":"R", "x":4.5, "y":2.75}, - {"label":"T", "x":5.5, "y":2.75}, - {"label":"Y", "x":6.5, "y":2.75}, - {"label":"U", "x":7.5, "y":2.75}, - {"label":"I", "x":8.5, "y":2.75}, - {"label":"O", "x":9.5, "y":2.75}, - {"label":"P", "x":10.5, "y":2.75}, - {"label":"{", "x":11.5, "y":2.75}, - {"label":"}", "x":12.5, "y":2.75}, - {"label":"|", "x":13.5, "y":2.75, "w":1.5}, - {"label":"7", "x":15.5, "y":2.75}, - {"label":"8", "x":16.5, "y":2.75}, - {"label":"9", "x":17.5, "y":2.75}, - - {"label":"Caps Lock", "x":0, "y":3.75, "w":1.75}, - {"label":"A", "x":1.75, "y":3.75}, - {"label":"S", "x":2.75, "y":3.75}, - {"label":"D", "x":3.75, "y":3.75}, - {"label":"F", "x":4.75, "y":3.75}, - {"label":"G", "x":5.75, "y":3.75}, - {"label":"H", "x":6.75, "y":3.75}, - {"label":"J", "x":7.75, "y":3.75}, - {"label":"K", "x":8.75, "y":3.75}, - {"label":"L", "x":9.75, "y":3.75}, - {"label":":", "x":10.75, "y":3.75}, - {"label":"\"", "x":11.75, "y":3.75}, - {"label":"Enter", "x":12.75, "y":3.75, "w":2.25}, - {"label":"4", "x":15.5, "y":3.75}, - {"label":"5", "x":16.5, "y":3.75}, - {"label":"6", "x":17.5, "y":3.75}, - {"label":"+", "x":18.5, "y":2.75, "h":2}, - - {"label":"Shift", "x":0, "y":4.75, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.75}, - {"label":"X", "x":3.25, "y":4.75}, - {"label":"C", "x":4.25, "y":4.75}, - {"label":"V", "x":5.25, "y":4.75}, - {"label":"B", "x":6.25, "y":4.75}, - {"label":"N", "x":7.25, "y":4.75}, - {"label":"M", "x":8.25, "y":4.75}, - {"label":"<", "x":9.25, "y":4.75}, - {"label":">", "x":10.25, "y":4.75}, - {"label":"?", "x":11.25, "y":4.75}, - {"label":"Shift", "x":12.25, "y":4.75, "w":1.75}, - {"label":"\u2191", "x":14.25, "y":5}, - {"label":"1", "x":15.5, "y":4.75}, - {"label":"2", "x":16.5, "y":4.75}, - {"label":"3", "x":17.5, "y":4.75}, - - {"label":"Ctrl", "x":0, "y":5.75, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.75}, - {"label":"Alt", "x":2.25, "y":5.75}, - {"label":"MO(1)", "x":3.25, "y":5.75}, - {"label":"Space", "x":4.25, "y":5.75, "w":6.25}, - {"label":"Alt", "x":10.5, "y":5.75, "w":1.25}, - {"label":"Ctrl", "x":11.75, "y":5.75, "w":1.25}, - {"label":"\u2190", "x":13.25, "y":6}, - {"label":"\u2193", "x":14.25, "y":6}, - {"label":"\u2192", "x":15.25, "y":6}, - {"label":"0", "x":16.5, "y":5.75}, - {"label":".", "x":17.5, "y":5.75}, - {"label":"Enter", "x":18.5, "y":4.75, "h":2} + {"matrix": [1, 0], "x": 0, "y": 0.5}, + + {"matrix": [0, 1], "x": 1.667, "y": 0.5}, + {"matrix": [1, 1], "x": 2.667, "y": 0.5}, + {"matrix": [0, 2], "x": 3.667, "y": 0.5}, + {"matrix": [1, 2], "x": 4.667, "y": 0.5}, + + {"matrix": [0, 3], "x": 6.333, "y": 0.5}, + {"matrix": [1, 3], "x": 7.333, "y": 0.5}, + {"matrix": [0, 4], "x": 8.333, "y": 0.5}, + {"matrix": [1, 4], "x": 9.333, "y": 0.5}, + + {"matrix": [0, 5], "x": 11, "y": 0.5}, + {"matrix": [1, 5], "x": 12, "y": 0.5}, + {"matrix": [1, 6], "x": 13, "y": 0.5}, + {"matrix": [1, 7], "x": 14, "y": 0.5}, + + {"matrix": [5, 7], "x": 15.5, "y": 0.5}, + {"matrix": [0, 0], "x": 16.9, "y": 0, "w": 0.6, "h": 0.5}, + {"matrix": [4, 8], "x": 17, "y": 0.5}, + {"matrix": [2, 0], "x": 17.5, "y": 0, "w": 0.6, "h": 0.5}, + {"matrix": [6, 0], "x": 18.4, "y": 0, "w": 0.6, "h": 0.5}, + + {"matrix": [4, 0], "x": 18.5, "y": 0.5}, + {"matrix": [8, 0], "x": 19, "y": 0, "w": 0.6, "h": 0.5}, + + {"matrix": [3, 0], "x": 0, "y": 1.75}, + {"matrix": [2, 1], "x": 1, "y": 1.75}, + {"matrix": [3, 1], "x": 2, "y": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 1.75}, + {"matrix": [3, 2], "x": 4, "y": 1.75}, + {"matrix": [2, 3], "x": 5, "y": 1.75}, + {"matrix": [3, 3], "x": 6, "y": 1.75}, + {"matrix": [2, 4], "x": 7, "y": 1.75}, + {"matrix": [3, 4], "x": 8, "y": 1.75}, + {"matrix": [2, 5], "x": 9, "y": 1.75}, + {"matrix": [3, 5], "x": 10, "y": 1.75}, + {"matrix": [2, 6], "x": 11, "y": 1.75}, + {"matrix": [3, 6], "x": 12, "y": 1.75}, + {"matrix": [3, 7], "x": 13, "y": 1.75, "w": 2}, + + {"matrix": [3, 9], "x": 15.5, "y": 1.75}, + {"matrix": [4, 9], "x": 16.5, "y": 1.75}, + {"matrix": [4, 10], "x": 17.5, "y": 1.75}, + {"matrix": [5, 10], "x": 18.5, "y": 1.75}, + + {"matrix": [5, 0], "x": 0, "y": 2.75, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 2.75}, + {"matrix": [5, 1], "x": 2.5, "y": 2.75}, + {"matrix": [4, 2], "x": 3.5, "y": 2.75}, + {"matrix": [5, 2], "x": 4.5, "y": 2.75}, + {"matrix": [4, 3], "x": 5.5, "y": 2.75}, + {"matrix": [5, 3], "x": 6.5, "y": 2.75}, + {"matrix": [4, 4], "x": 7.5, "y": 2.75}, + {"matrix": [5, 4], "x": 8.5, "y": 2.75}, + {"matrix": [4, 5], "x": 9.5, "y": 2.75}, + {"matrix": [5, 5], "x": 10.5, "y": 2.75}, + {"matrix": [4, 6], "x": 11.5, "y": 2.75}, + {"matrix": [5, 6], "x": 12.5, "y": 2.75}, + {"matrix": [4, 7], "x": 13.5, "y": 2.75, "w": 1.5}, + + {"matrix": [5, 9], "x": 15.5, "y": 2.75}, + {"matrix": [6, 9], "x": 16.5, "y": 2.75}, + {"matrix": [6, 10], "x": 17.5, "y": 2.75}, + + {"matrix": [7, 0], "x": 0, "y": 3.75, "w": 1.75}, + {"matrix": [6, 1], "x": 1.75, "y": 3.75}, + {"matrix": [7, 1], "x": 2.75, "y": 3.75}, + {"matrix": [6, 2], "x": 3.75, "y": 3.75}, + {"matrix": [7, 2], "x": 4.75, "y": 3.75}, + {"matrix": [6, 3], "x": 5.75, "y": 3.75}, + {"matrix": [7, 3], "x": 6.75, "y": 3.75}, + {"matrix": [6, 4], "x": 7.75, "y": 3.75}, + {"matrix": [7, 4], "x": 8.75, "y": 3.75}, + {"matrix": [6, 5], "x": 9.75, "y": 3.75}, + {"matrix": [7, 5], "x": 10.75, "y": 3.75}, + {"matrix": [6, 6], "x": 11.75, "y": 3.75}, + {"matrix": [7, 7], "x": 12.75, "y": 3.75, "w": 2.25}, + + {"matrix": [7, 9], "x": 15.5, "y": 3.75}, + {"matrix": [8, 9], "x": 16.5, "y": 3.75}, + {"matrix": [8, 10], "x": 17.5, "y": 3.75}, + {"matrix": [7, 10], "x": 18.5, "y": 2.75, "h": 2}, + + {"matrix": [9, 0], "x": 0, "y": 4.75, "w": 2.25}, + {"matrix": [9, 1], "x": 2.25, "y": 4.75}, + {"matrix": [8, 2], "x": 3.25, "y": 4.75}, + {"matrix": [9, 2], "x": 4.25, "y": 4.75}, + {"matrix": [8, 3], "x": 5.25, "y": 4.75}, + {"matrix": [9, 3], "x": 6.25, "y": 4.75}, + {"matrix": [8, 4], "x": 7.25, "y": 4.75}, + {"matrix": [9, 4], "x": 8.25, "y": 4.75}, + {"matrix": [8, 5], "x": 9.25, "y": 4.75}, + {"matrix": [9, 5], "x": 10.25, "y": 4.75}, + {"matrix": [8, 6], "x": 11.25, "y": 4.75}, + {"matrix": [9, 7], "x": 12.25, "y": 4.75, "w": 1.75}, + + {"matrix": [8, 8], "x": 14.25, "y": 5}, + + {"matrix": [9, 9], "x": 15.5, "y": 4.75}, + {"matrix": [10, 9], "x": 16.5, "y": 4.75}, + {"matrix": [9, 10], "x": 17.5, "y": 4.75}, + + {"matrix": [11, 0], "x": 0, "y": 5.75, "w": 1.25}, + {"matrix": [10, 1], "x": 1.25, "y": 5.75}, + {"matrix": [11, 1], "x": 2.25, "y": 5.75}, + {"matrix": [11, 3], "x": 3.25, "y": 5.75}, + {"matrix": [11, 2], "x": 4.25, "y": 5.75, "w": 6.25}, + {"matrix": [11, 5], "x": 10.5, "y": 5.75, "w": 1.25}, + {"matrix": [10, 7], "x": 11.75, "y": 5.75, "w": 1.25}, + + {"matrix": [11, 7], "x": 13.25, "y": 6}, + {"matrix": [10, 8], "x": 14.25, "y": 6}, + {"matrix": [11, 8], "x": 15.25, "y": 6}, + + {"matrix": [11, 9], "x": 16.5, "y": 5.75}, + {"matrix": [10, 10], "x": 17.5, "y": 5.75}, + {"matrix": [11, 10], "x": 18.5, "y": 4.75, "h": 2} ] } } diff --git a/keyboards/kabedon/kabedon98e/kabedon98e.c b/keyboards/kabedon/kabedon98e/kabedon98e.c index 69847900064f..9fd34b58af32 100644 --- a/keyboards/kabedon/kabedon98e/kabedon98e.c +++ b/keyboards/kabedon/kabedon98e/kabedon98e.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "kabedon98e.h" +#include "quantum.h" static uint8_t encoder_state[NUM_ENCODERS] = {0}; static keypos_t encoder_cw[NUM_ENCODERS] = ENCODERS_CW_KEY; diff --git a/keyboards/kabedon/kabedon98e/kabedon98e.h b/keyboards/kabedon/kabedon98e/kabedon98e.h deleted file mode 100644 index ce4b3fa0b2bf..000000000000 --- a/keyboards/kabedon/kabedon98e/kabedon98e.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Copyright 2021 KDon<370490639@qq.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 . - */ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* ┌──┬──┐ ┌──┬──┐ - * │00│20│ │60│80│ - * └──┴──┘ └──┴──┘ - * \─en1┘ └en2─/ - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ ┌───┐ ┌───┐ - * │10 │ │01 │11 │02 │12 │ │03 │13 │04 │14 │ │05 │15 │16 │17 │ │57 │ │48 │ │40 │ - * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘ └───┘ └───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐ - * │30 │21 │31 │22 │32 │23 │33 │24 │34 │25 │35 │26 │36 │37 │ │39 │49 │4A │5A │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤ - * │50 │41 │51 │42 │52 │43 │53 │44 │54 │45 │55 │46 │56 │47 │ │59 │69 │6A │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤ │ - * │70 │61 │71 │62 │72 │63 │73 │64 │74 │65 │75 │66 │77 │ │79 │89 │8A │7A │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤ - * │90 │91 │82 │92 │83 │93 │84 │94 │85 │95 │86 │97 │┌───┐│99 │A9 │9A │ │ - * ├────┬───┼───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴──┬───┘│88 │└───┼───┼───┤ │ - * │B0 │A1 │B1 │B3 │B2 │B5 │A7 │┌───┼───┼───┐│B9 │AA │BA │ - * └────┴───┴───┴───┴────────────────────────┴────┴────┘│B7 │A8 │B8 │└───┴───┴───┘ - * └───┴───┴───┘ - */ - -#define LAYOUT( \ - K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K16, K17, K57, K00,K48,K20, K60,K40,K80, \ - K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, K39, K49, K4A, K5A, \ - K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47, K59, K69, K6A, \ - K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K77, K79, K89, K8A, K7A, \ - K90, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K97, K88, K99, KA9, K9A, \ - KB0, KA1, KB1, KB3, KB2, KB5, KA7, KB7, KA8, KB8, KB9, KAA, KBA \ -) { \ - { K00, K01, K02, K03, K04, K05, XXX, XXX, XXX, XXX, XXX }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, XXX, XXX, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, XXX, XXX, XXX, XXX }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, XXX, K39, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, XXX, K59, K5A }, \ - { K60, K61, K62, K63, K64, K65, K66, XXX, XXX, K69, K6A }, \ - { K70, K71, K72, K73, K74, K75, XXX, K77, XXX, K79, K7A }, \ - { K80, XXX, K82, K83, K84, K85, K86, XXX, K88, K89, K8A }, \ - { K90, K91, K92, K93, K94, K95, XXX, K97, XXX, K99, K9A }, \ - { XXX, KA1, XXX, XXX, XXX, XXX, XXX, KA7, KA8, KA9, KAA }, \ - { KB0, KB1, KB2, KB3, XXX, KB5, XXX, KB7, KB8, KB9, KBA } \ -} diff --git a/keyboards/kagizaraya/halberd/halberd.h b/keyboards/kagizaraya/halberd/halberd.h deleted file mode 100644 index d2adb4a15cb6..000000000000 --- a/keyboards/kagizaraya/halberd/halberd.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, \ - K11, K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, \ - K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, \ - K33, K34, K35, K36, K37, K38, K39 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10 }, \ - { K11, K12, K13, K14, K15, K16, K17, K18, K19, K20, K21 }, \ - { K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32 }, \ - { KC_NO, KC_NO, K33, K34, K35, K36, K37, K38, K39, KC_NO, KC_NO } \ -} - diff --git a/keyboards/kagizaraya/halberd/info.json b/keyboards/kagizaraya/halberd/info.json index b6540cc780aa..45c6138f2ce4 100644 --- a/keyboards/kagizaraya/halberd/info.json +++ b/keyboards/kagizaraya/halberd/info.json @@ -20,7 +20,51 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"!", "x":0, "y":0}, {"label":"@", "x":1, "y":0}, {"label":"#", "x":2, "y":0}, {"label":"$", "x":3, "y":0}, {"label":"%", "x":4, "y":0}, {"label":"Tab", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"Tab", "x":0, "y":1}, {"label":"_", "x":1, "y":1}, {"label":"+", "x":2, "y":1}, {"label":"|", "x":3, "y":1}, {"label":"~", "x":4, "y":1}, {"label":"BkSp", "x":5, "y":1}, {"label":":", "x":6, "y":1}, {"label":"\"", "x":7, "y":1}, {"label":">", "x":8, "y":1}, {"label":"{", "x":9, "y":1}, {"label":"}", "x":10, "y":1}, {"label":"Caps", "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":"Enter", "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":"GUI", "x":2, "y":3}, {"label":"Lower", "x":3, "y":3}, {"label":"Esc", "x":4, "y":3}, {"x":5, "y":3}, {"label":"Shift", "x":6, "y":3}, {"label":"Raise", "x":7, "y":3}, {"label":"Alt", "x":8, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3} + ] } } } diff --git a/keyboards/kagizaraya/scythe/info.json b/keyboards/kagizaraya/scythe/info.json index a4731bae00aa..bacca0ef6d28 100644 --- a/keyboards/kagizaraya/scythe/info.json +++ b/keyboards/kagizaraya/scythe/info.json @@ -26,7 +26,82 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":2, "y":0}, {"label":"1", "x":3, "y":0}, {"label":"2", "x":4, "y":0}, {"label":"3", "x":5, "y":0}, {"label":"4", "x":6, "y":0}, {"label":"5", "x":7, "y":0}, {"label":"_", "x":8, "y":0}, {"label":"+", "x":9.5, "y":0}, {"label":"6", "x":10.5, "y":0}, {"label":"7", "x":11.5, "y":0}, {"label":"8", "x":12.5, "y":0}, {"label":"9", "x":13.5, "y":0}, {"label":"0", "x":14.5, "y":0}, {"label":"\\", "x":15.5, "y":0}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"{", "x":7.75, "y":1}, {"label":"}", "x":9.75, "y":1}, {"label":"Y", "x":10.75, "y":1}, {"label":"U", "x":11.75, "y":1}, {"label":"I", "x":12.75, "y":1}, {"label":"O", "x":13.75, "y":1}, {"label":"P", "x":14.75, "y":1}, {"label":"Backace", "x":15.75, "y":1, "w":1.5}, {"label":"Control", "x":0.75, "y":2, "w":1.75}, {"label":"A", "x":2.5, "y":2}, {"label":"S", "x":3.5, "y":2}, {"label":"D", "x":4.5, "y":2}, {"label":"F", "x":5.5, "y":2}, {"label":"G", "x":6.5, "y":2}, {"label":"~", "x":7.5, "y":2}, {"label":"\"", "x":10, "y":2}, {"label":"H", "x":11, "y":2}, {"label":"J", "x":12, "y":2}, {"label":"K", "x":13, "y":2}, {"label":"L", "x":14, "y":2}, {"label":":", "x":15, "y":2}, {"label":"Return", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"Caps", "x":7.25, "y":3}, {"label":"Del", "x":10.25, "y":3}, {"label":"N", "x":11.25, "y":3}, {"label":"M", "x":12.25, "y":3}, {"label":"<", "x":13.25, "y":3}, {"label":">", "x":14.25, "y":3}, {"label":"?", "x":15.25, "y":3}, {"label":"Shift", "x":16.25, "y":3, "w":1.75}, {"label":"Fn", "x":18, "y":3}, {"label":"", "x":2.75, "y":4, "w":1.25}, {"label":"", "x":4, "y":4, "w":1.25}, {"label":"Fn", "x":5.25, "y":4, "w":1.25}, {"x":6.5, "y":4, "w":2}, {"x":10, "y":4, "w":2}, {"label":"Fn", "x":12, "y":4, "w":1.25}, {"label":"", "x":13.25, "y":4, "w":1.25}, {"label":"", "x":14.5, "y":4, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [0, 3], "x": 5, "y": 0}, + {"matrix": [0, 4], "x": 6, "y": 0}, + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + + {"matrix": [5, 0], "x": 9.5, "y": 0}, + {"matrix": [5, 1], "x": 10.5, "y": 0}, + {"matrix": [5, 2], "x": 11.5, "y": 0}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 4], "x": 13.5, "y": 0}, + {"matrix": [5, 5], "x": 14.5, "y": 0}, + {"matrix": [5, 6], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.75, "y": 1}, + {"matrix": [1, 2], "x": 3.75, "y": 1}, + {"matrix": [1, 3], "x": 4.75, "y": 1}, + {"matrix": [1, 4], "x": 5.75, "y": 1}, + {"matrix": [1, 5], "x": 6.75, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + + {"matrix": [6, 0], "x": 9.75, "y": 1}, + {"matrix": [6, 1], "x": 10.75, "y": 1}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 4], "x": 13.75, "y": 1}, + {"matrix": [6, 5], "x": 14.75, "y": 1}, + {"matrix": [6, 6], "x": 15.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.75, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.5, "y": 2}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 3], "x": 4.5, "y": 2}, + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 5], "x": 6.5, "y": 2}, + {"matrix": [2, 6], "x": 7.5, "y": 2}, + + {"matrix": [7, 0], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 4], "x": 14, "y": 2}, + {"matrix": [7, 5], "x": 15, "y": 2}, + {"matrix": [7, 6], "x": 16, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + + {"matrix": [8, 0], "x": 10.25, "y": 3}, + {"matrix": [8, 1], "x": 11.25, "y": 3}, + {"matrix": [8, 2], "x": 12.25, "y": 3}, + {"matrix": [8, 3], "x": 13.25, "y": 3}, + {"matrix": [8, 4], "x": 14.25, "y": 3}, + {"matrix": [8, 5], "x": 15.25, "y": 3}, + {"matrix": [8, 6], "x": 16.25, "y": 3, "w": 1.75}, + {"matrix": [9, 6], "x": 18, "y": 3}, + + {"matrix": [4, 0], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 6.5, "y": 4, "w": 2}, + + {"matrix": [9, 0], "x": 10, "y": 4, "w": 2}, + {"matrix": [9, 1], "x": 12, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 14.5, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/kagizaraya/scythe/scythe.h b/keyboards/kagizaraya/scythe/scythe.h deleted file mode 100644 index c13c63fdd030..000000000000 --- a/keyboards/kagizaraya/scythe/scythe.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2019 ENDO Katsuhiro - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -// readability -#define ___ KC_NO - -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, L07, R01, R02, R03, R04, R05, R06, R07, \ - L08, L09, L10, L11, L12, L13, L14, R08, R09, R10, R11, R12, R13, R14, \ - L15, L16, L17, L18, L19, L20, L21, R15, R16, R17, R18, R19, R20, R21, \ - L22, L23, L24, L25, L26, L27, L28, R22, R23, R24, R25, R26, R27, R28, R33, \ - L29, L30, L31, L32, R29, R30, R31, R32 \ - ) \ - { \ - { L01, L02, L03, L04, L05, L06, L07 }, \ - { L08, L09, L10, L11, L12, L13, L14 }, \ - { L15, L16, L17, L18, L19, L20, L21 }, \ - { L22, L23, L24, L25, L26, L27, L28 }, \ - { L29, L30, L31, L32, ___, ___, ___ }, \ - { R01, R02, R03, R04, R05, R06, R07 }, \ - { R08, R09, R10, R11, R12, R13, R14 }, \ - { R15, R16, R17, R18, R19, R20, R21 }, \ - { R22, R23, R24, R25, R26, R27, R28 }, \ - { R29, R30, R31, R32, ___, ___, R33 } \ - } - diff --git a/keyboards/kakunpc/angel64/alpha/alpha.h b/keyboards/kakunpc/angel64/alpha/alpha.h deleted file mode 100644 index 6c0898a56af1..000000000000 --- a/keyboards/kakunpc/angel64/alpha/alpha.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \ - k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, \ - k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, \ - k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64\ -) \ -{ \ - { k01, k13, k25, k37, k49, k61 }, \ - { k02, k14, k26, k38, k50, k62 }, \ - { k03, k15, k27, k39, k51, k63 }, \ - { k04, k16, k28, k40, k52, k64 }, \ - { k05, k17, k29, k41, k53, KC_NO }, \ - { k06, k18, k30, k42, k54, KC_NO }, \ - { k07, k19, k31, k43, k55, KC_NO }, \ - { k08, k20, k32, k44, k56, KC_NO }, \ - { k09, k21, k33, k45, k57, KC_NO }, \ - { k10, k22, k34, k46, k58, KC_NO }, \ - { k11, k23, k35, k47, k59, KC_NO }, \ - { k12, k24, k36, k48, k60, KC_NO } \ -} diff --git a/keyboards/kakunpc/angel64/alpha/info.json b/keyboards/kakunpc/angel64/alpha/info.json index fd2fbb736b60..3429799a752c 100644 --- a/keyboards/kakunpc/angel64/alpha/info.json +++ b/keyboards/kakunpc/angel64/alpha/info.json @@ -15,7 +15,76 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"back", "x":13, "y":0}, {"label":"Q", "x":0, "y":1, "w":1.5}, {"label":"W", "x":1.5, "y":1}, {"label":"E", "x":2.5, "y":1}, {"label":"R", "x":3.5, "y":1}, {"label":"T", "x":4.5, "y":1}, {"label":"Y", "x":5.5, "y":1}, {"label":"U", "x":6.5, "y":1}, {"label":"I", "x":7.5, "y":1}, {"label":"O", "x":8.5, "y":1}, {"label":"P", "x":9.5, "y":1}, {"label":"[", "x":10.5, "y":1}, {"label":"]", "x":11.5, "y":1}, {"label":"|", "x":12.5, "y":1, "w":1.5}, {"label":"Ctrl", "x":0, "y":2}, {"label":"A", "x":1, "y":2}, {"label":"S", "x":2, "y":2}, {"label":"D", "x":3, "y":2}, {"label":"F", "x":4, "y":2}, {"label":"G", "x":5, "y":2}, {"label":"H", "x":6, "y":2}, {"label":"J", "x":7, "y":2}, {"label":"K", "x":8, "y":2}, {"label":"L", "x":9, "y":2}, {"label":";:", "x":10, "y":2}, {"label":"`", "x":11, "y":2}, {"label":"Enter", "x":12, "y":2, "w":2}, {"label":"Shift", "x":0, "y":3, "w":1.5}, {"label":"Z", "x":1.5, "y":3}, {"label":"X", "x":2.5, "y":3}, {"label":"C", "x":3.5, "y":3}, {"label":"V", "x":4.5, "y":3}, {"label":"B", "x":5.5, "y":3}, {"label":"N", "x":6.5, "y":3}, {"label":"M", "x":7.5, "y":3}, {"label":"<", "x":8.5, "y":3}, {"label":">", "x":9.5, "y":3}, {"label":"?", "x":10.5, "y":3}, {"label":"\u2191", "x":11.5, "y":3}, {"label":"Fn", "x":12.5, "y":3, "w":1.5}, {"label":"Caps", "x":0, "y":4}, {"label":"Alt", "x":1, "y":4}, {"label":"Start", "x":2, "y":4, "w":1.5}, {"label":"Ctrl", "x":3.5, "y":4, "w":1.5}, {"label":"Space", "x":5, "y":4, "w":2}, {"label":"Ctrl", "x":7, "y":4, "w":1.5}, {"label":"Alt", "x":8.5, "y":4, "w":1.5}, {"label":"\u2190", "x":10, "y":4}, {"label":"\u2193", "x":11, "y":4}, {"label":"\u2192", "x":12, "y":4}, {"label":"Alt", "x":13, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + {"matrix": [5, 0], "x": 5, "y": 0}, + {"matrix": [6, 0], "x": 6, "y": 0}, + {"matrix": [7, 0], "x": 7, "y": 0}, + {"matrix": [8, 0], "x": 8, "y": 0}, + {"matrix": [9, 0], "x": 9, "y": 0}, + {"matrix": [10, 0], "x": 10, "y": 0}, + {"matrix": [11, 0], "x": 11, "y": 0}, + {"matrix": [0, 1], "x": 12, "y": 0}, + {"matrix": [1, 1], "x": 13, "y": 0}, + + {"matrix": [2, 1], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [4, 1], "x": 2.5, "y": 1}, + {"matrix": [5, 1], "x": 3.5, "y": 1}, + {"matrix": [6, 1], "x": 4.5, "y": 1}, + {"matrix": [7, 1], "x": 5.5, "y": 1}, + {"matrix": [8, 1], "x": 6.5, "y": 1}, + {"matrix": [9, 1], "x": 7.5, "y": 1}, + {"matrix": [10, 1], "x": 8.5, "y": 1}, + {"matrix": [11, 1], "x": 9.5, "y": 1}, + {"matrix": [0, 2], "x": 10.5, "y": 1}, + {"matrix": [1, 2], "x": 11.5, "y": 1}, + {"matrix": [2, 2], "x": 12.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 2], "x": 0, "y": 2}, + {"matrix": [4, 2], "x": 1, "y": 2}, + {"matrix": [5, 2], "x": 2, "y": 2}, + {"matrix": [6, 2], "x": 3, "y": 2}, + {"matrix": [7, 2], "x": 4, "y": 2}, + {"matrix": [8, 2], "x": 5, "y": 2}, + {"matrix": [9, 2], "x": 6, "y": 2}, + {"matrix": [10, 2], "x": 7, "y": 2}, + {"matrix": [11, 2], "x": 8, "y": 2}, + {"matrix": [0, 3], "x": 9, "y": 2}, + {"matrix": [1, 3], "x": 10, "y": 2}, + {"matrix": [2, 3], "x": 11, "y": 2}, + {"matrix": [3, 3], "x": 12, "y": 2, "w": 2}, + + {"matrix": [4, 3], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [5, 3], "x": 1.5, "y": 3}, + {"matrix": [6, 3], "x": 2.5, "y": 3}, + {"matrix": [7, 3], "x": 3.5, "y": 3}, + {"matrix": [8, 3], "x": 4.5, "y": 3}, + {"matrix": [9, 3], "x": 5.5, "y": 3}, + {"matrix": [10, 3], "x": 6.5, "y": 3}, + {"matrix": [11, 3], "x": 7.5, "y": 3}, + {"matrix": [0, 4], "x": 8.5, "y": 3}, + {"matrix": [1, 4], "x": 9.5, "y": 3}, + {"matrix": [2, 4], "x": 10.5, "y": 3}, + {"matrix": [3, 4], "x": 11.5, "y": 3}, + {"matrix": [4, 4], "x": 12.5, "y": 3, "w": 1.5}, + + {"matrix": [5, 4], "x": 0, "y": 4}, + {"matrix": [6, 4], "x": 1, "y": 4}, + {"matrix": [7, 4], "x": 2, "y": 4, "w": 1.5}, + {"matrix": [8, 4], "x": 3.5, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 5, "y": 4, "w": 2}, + {"matrix": [10, 4], "x": 7, "y": 4, "w": 1.5}, + {"matrix": [11, 4], "x": 8.5, "y": 4, "w": 1.5}, + {"matrix": [0, 5], "x": 10, "y": 4}, + {"matrix": [1, 5], "x": 11, "y": 4}, + {"matrix": [2, 5], "x": 12, "y": 4}, + {"matrix": [3, 5], "x": 13, "y": 4} + ] } } } diff --git a/keyboards/kakunpc/suihankey/alpha/alpha.h b/keyboards/kakunpc/suihankey/alpha/alpha.h deleted file mode 100644 index 02bba4710457..000000000000 --- a/keyboards/kakunpc/suihankey/alpha/alpha.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the Leys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, \ - L10, L11, L12, L13, L14, \ - L20, L21, L22, L23, L24, \ - L30, L31, L32 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32 }, \ -} diff --git a/keyboards/kakunpc/suihankey/alpha/info.json b/keyboards/kakunpc/suihankey/alpha/info.json index 2f60036d35af..b48aab842270 100644 --- a/keyboards/kakunpc/suihankey/alpha/info.json +++ b/keyboards/kakunpc/suihankey/alpha/info.json @@ -21,27 +21,27 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.125}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.125}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.125}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.125}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.125}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.125}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.125}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, - {"x": 3.4, "y": 3.25}, - {"x": 4.4, "y": 3.55}, - {"x": 5.4, "y": 3.85} + {"matrix": [3, 0], "x": 3.4, "y": 3.25}, + {"matrix": [3, 1], "x": 4.4, "y": 3.55}, + {"matrix": [3, 2], "x": 5.4, "y": 3.85} ] } } diff --git a/keyboards/kakunpc/suihankey/rev1/info.json b/keyboards/kakunpc/suihankey/rev1/info.json index b2a6c3671621..4f5caa6c634f 100644 --- a/keyboards/kakunpc/suihankey/rev1/info.json +++ b/keyboards/kakunpc/suihankey/rev1/info.json @@ -21,27 +21,27 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.375}, - {"x": 1, "y": 0.125}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.125}, - {"x": 4, "y": 0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [1, 0], "x": 1, "y": 0.125}, + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0.125}, + {"matrix": [4, 0], "x": 4, "y": 0.25}, - {"x": 0, "y": 1.375}, - {"x": 1, "y": 1.125}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.125}, - {"x": 4, "y": 1.25}, + {"matrix": [0, 1], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.125}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1.125}, + {"matrix": [4, 1], "x": 4, "y": 1.25}, - {"x": 0, "y": 2.375}, - {"x": 1, "y": 2.125}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.125}, - {"x": 4, "y": 2.25}, + {"matrix": [0, 2], "x": 0, "y": 2.375}, + {"matrix": [1, 2], "x": 1, "y": 2.125}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [3, 2], "x": 3, "y": 2.125}, + {"matrix": [4, 2], "x": 4, "y": 2.25}, - {"x": 3.4, "y": 3.25}, - {"x": 4.4, "y": 3.55}, - {"x": 5.4, "y": 3.85} + {"matrix": [0, 3], "x": 3.4, "y": 3.25}, + {"matrix": [1, 3], "x": 4.4, "y": 3.55}, + {"matrix": [2, 3], "x": 5.4, "y": 3.85} ] } } diff --git a/keyboards/kakunpc/suihankey/rev1/rev1.h b/keyboards/kakunpc/suihankey/rev1/rev1.h deleted file mode 100644 index cbc877abd554..000000000000 --- a/keyboards/kakunpc/suihankey/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2019 kakunpc - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the Leys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, \ - L10, L11, L12, L13, L14, \ - L20, L21, L22, L23, L24, \ - L30, L31, L32 \ -) \ -{ \ - { L00, L10, L20, L30 }, \ - { L01, L11, L21, L31 }, \ - { L02, L12, L22, L32 }, \ - { L03, L13, L23, KC_NO }, \ - { L04, L14, L24, KC_NO }, \ -} diff --git a/keyboards/kapl/rev1/info.json b/keyboards/kapl/rev1/info.json index 9c5891d119a0..f9da64a38043 100644 --- a/keyboards/kapl/rev1/info.json +++ b/keyboards/kapl/rev1/info.json @@ -25,83 +25,88 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT": { - "layout": [ - {"label":"L00", "x":0, "y":0.38}, - {"label":"L01", "x":1, "y":0.38}, - {"label":"L02", "x":2, "y":0.13}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0.13}, - {"label":"L05", "x":5, "y":0.25}, - {"label":"L06", "x":6, "y":0.35}, - {"label":"R00", "x":8.67, "y":0.35}, - {"label":"R01", "x":9.67, "y":0.25}, - {"label":"R02", "x":10.67, "y":0.13}, - {"label":"R03", "x":11.67, "y":0}, - {"label":"R04", "x":12.67, "y":0.13}, - {"label":"R05", "x":13.67, "y":0.38}, - {"label":"R06", "x":14.67, "y":0.38}, + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.38}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0.13}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.13}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.35}, - {"label":"L10", "x":0, "y":1.38}, - {"label":"L11", "x":1, "y":1.38}, - {"label":"L12", "x":2, "y":1.13}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1.13}, - {"label":"L15", "x":5, "y":1.25}, - {"label":"L16", "x":6, "y":1.35}, - {"label":"R10", "x":8.67, "y":1.35}, - {"label":"R11", "x":9.67, "y":1.25}, - {"label":"R12", "x":10.67, "y":1.13}, - {"label":"R13", "x":11.67, "y":1}, - {"label":"R14", "x":12.67, "y":1.13}, - {"label":"R15", "x":13.67, "y":1.38}, - {"label":"R16", "x":14.67, "y":1.38}, + {"matrix": [5, 6], "x": 8.67, "y": 0.35}, + {"matrix": [5, 5], "x": 9.67, "y": 0.25}, + {"matrix": [5, 4], "x": 10.67, "y": 0.13}, + {"matrix": [5, 3], "x": 11.67, "y": 0}, + {"matrix": [5, 2], "x": 12.67, "y": 0.13}, + {"matrix": [5, 1], "x": 13.67, "y": 0.38}, + {"matrix": [5, 0], "x": 14.67, "y": 0.38}, - {"label":"L20", "x":0, "y":2.38}, - {"label":"L21", "x":1, "y":2.38}, - {"label":"L22", "x":2, "y":2.13}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2.13}, - {"label":"L25", "x":5, "y":2.25}, - {"label":"L26", "x":6, "y":2.35}, - {"label":"R20", "x":8.67, "y":2.35}, - {"label":"R21", "x":9.67, "y":2.25}, - {"label":"R22", "x":10.67, "y":2.13}, - {"label":"R23", "x":11.67, "y":2}, - {"label":"R24", "x":12.67, "y":2.13}, - {"label":"R25", "x":13.67, "y":2.38}, - {"label":"R26", "x":14.67, "y":2.38}, + {"matrix": [1, 0], "x": 0, "y": 1.38}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1.13}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.13}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.35}, - {"label":"L30", "x":0, "y":3.38}, - {"label":"L31", "x":1, "y":3.38}, - {"label":"L32", "x":2, "y":3.13}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3.13}, - {"label":"L35", "x":5, "y":3.25}, - {"label":"L36", "x":6, "y":3.35}, - {"label":"R30", "x":8.67, "y":3.35}, - {"label":"R31", "x":9.67, "y":3.25}, - {"label":"R32", "x":10.67, "y":3.13}, - {"label":"R33", "x":11.67, "y":3}, - {"label":"R34", "x":12.67, "y":3.13}, - {"label":"R35", "x":13.67, "y":3.38}, - {"label":"R36", "x":14.67, "y":3.38}, + {"matrix": [6, 6], "x": 8.67, "y": 1.35}, + {"matrix": [6, 5], "x": 9.67, "y": 1.25}, + {"matrix": [6, 4], "x": 10.67, "y": 1.13}, + {"matrix": [6, 3], "x": 11.67, "y": 1}, + {"matrix": [6, 2], "x": 12.67, "y": 1.13}, + {"matrix": [6, 1], "x": 13.67, "y": 1.38}, + {"matrix": [6, 0], "x": 14.67, "y": 1.38}, - {"label":"L40", "x":0, "y":4.38}, - {"label":"L41", "x":1, "y":4.38}, - {"label":"L42", "x":2, "y":4.13}, - {"label":"L43", "x":3, "y":4}, - {"label":"L44", "x":4, "y":4.13}, - {"label":"L45", "x":5.35, "y":4.92}, - {"label":"L46", "x":6.35, "y":4.45, "h":1.5}, - {"label":"R40", "x":8.02, "y":4.45, "h":1.5}, - {"label":"R41", "x":9.02, "y":4.92}, - {"label":"R42", "x":10.67, "y":4.13}, - {"label":"R43", "x":11.67, "y":4}, - {"label":"R44", "x":12.67, "y":4.13}, - {"label":"R45", "x":13.67, "y":4.38}, - {"label":"R46", "x":14.67, "y":4.38} - ] - } + {"matrix": [2, 0], "x": 0, "y": 2.38}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2.13}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.13}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.35}, + + {"matrix": [7, 6], "x": 8.67, "y": 2.35}, + {"matrix": [7, 5], "x": 9.67, "y": 2.25}, + {"matrix": [7, 4], "x": 10.67, "y": 2.13}, + {"matrix": [7, 3], "x": 11.67, "y": 2}, + {"matrix": [7, 2], "x": 12.67, "y": 2.13}, + {"matrix": [7, 1], "x": 13.67, "y": 2.38}, + {"matrix": [7, 0], "x": 14.67, "y": 2.38}, + + {"matrix": [3, 0], "x": 0, "y": 3.38}, + {"matrix": [3, 1], "x": 1, "y": 3.38}, + {"matrix": [3, 2], "x": 2, "y": 3.13}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.13}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.35}, + + {"matrix": [8, 6], "x": 8.67, "y": 3.35}, + {"matrix": [8, 5], "x": 9.67, "y": 3.25}, + {"matrix": [8, 4], "x": 10.67, "y": 3.13}, + {"matrix": [8, 3], "x": 11.67, "y": 3}, + {"matrix": [8, 2], "x": 12.67, "y": 3.13}, + {"matrix": [8, 1], "x": 13.67, "y": 3.38}, + {"matrix": [8, 0], "x": 14.67, "y": 3.38}, + + {"matrix": [4, 0], "x": 0, "y": 4.38}, + {"matrix": [4, 1], "x": 1, "y": 4.38}, + {"matrix": [4, 2], "x": 2, "y": 4.13}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.13}, + {"matrix": [4, 5], "x": 5.35, "y": 4.92}, + {"matrix": [4, 6], "x": 6.35, "y": 4.45, "h": 1.5}, + + {"matrix": [9, 6], "x": 8.02, "y": 4.45, "h": 1.5}, + {"matrix": [9, 5], "x": 9.02, "y": 4.92}, + {"matrix": [9, 4], "x": 10.67, "y": 4.13}, + {"matrix": [9, 3], "x": 11.67, "y": 4}, + {"matrix": [9, 2], "x": 12.67, "y": 4.13}, + {"matrix": [9, 1], "x": 13.67, "y": 4.38}, + {"matrix": [9, 0], "x": 14.67, "y": 4.38} + ] + } } } diff --git a/keyboards/kapl/rev1/rev1.c b/keyboards/kapl/rev1/rev1.c index e0e32cf5e868..fd3b9289dca0 100644 --- a/keyboards/kapl/rev1/rev1.c +++ b/keyboards/kapl/rev1/rev1.c @@ -1,6 +1,6 @@ // Copyright 2022 Alexander Lozyuk (@keyzog) // SPDX-License-Identifier: GPL-2.0-or-later -#include "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/kapl/rev1/rev1.h b/keyboards/kapl/rev1/rev1.h deleted file mode 100644 index 686ff89e924d..000000000000 --- a/keyboards/kapl/rev1/rev1.h +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2022 Alexander Lozyuk (@keyzog) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} diff --git a/keyboards/kb58/info.json b/keyboards/kb58/info.json index 8ae75ee34b1c..b1b1cc985511 100644 --- a/keyboards/kb58/info.json +++ b/keyboards/kb58/info.json @@ -27,68 +27,68 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, + {"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": [5, 0], "x": 6, "y": 0}, + {"matrix": [5, 1], "x": 7, "y": 0}, + {"matrix": [5, 2], "x": 8, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 6], "x": 12, "y": 0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6, "y":1}, - {"label":"U", "x":7, "y":1}, - {"label":"I", "x":8, "y":1}, - {"label":"O", "x":9, "y":1}, - {"label":"P", "x":10, "y":1}, - {"label":"[", "x":11, "y":1}, - {"label":"]", "x":12, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 0], "x": 6, "y": 1}, + {"matrix": [6, 1], "x": 7, "y": 1}, + {"matrix": [6, 2], "x": 8, "y": 1}, + {"matrix": [6, 3], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 6], "x": 12, "y": 1}, - {"label":"Control", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":";", "x":10, "y":2}, - {"label":"'", "x":11, "y":2}, - {"label":"Enter", "x":12, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [7, 0], "x": 6, "y": 2}, + {"matrix": [7, 1], "x": 7, "y": 2}, + {"matrix": [7, 2], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 6], "x": 12, "y": 2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"Y", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6, "y":3}, - {"label":"M", "x":7, "y":3}, - {"label":",", "x":8, "y":3}, - {"label":".", "x":9, "y":3}, - {"label":"/", "x":10, "y":3}, - {"label":"\\", "x":11, "y":3}, - {"label":"Shift", "x":12, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [8, 0], "x": 6, "y": 3}, + {"matrix": [8, 1], "x": 7, "y": 3}, + {"matrix": [8, 2], "x": 8, "y": 3}, + {"matrix": [8, 3], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 6], "x": 12, "y": 3}, - {"label":"Alt", "x":3, "y":4}, - {"label":"GUI", "x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"label":"Fn", "x":7, "y":4}, - {"label":"Delete", "x":8, "y":4} + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [9, 0], "x": 6, "y": 4}, + {"matrix": [9, 1], "x": 7, "y": 4}, + {"matrix": [9, 2], "x": 8, "y": 4} ] } } diff --git a/keyboards/kb58/kb58.h b/keyboards/kb58/kb58.h deleted file mode 100644 index d936215ae869..000000000000 --- a/keyboards/kb58/kb58.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 beanaccle - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, \ - L06, L07, L08, L09, L10, L11, R07, R08, R09, R10, R11, R12, R13, \ - L12, L13, L14, L15, L16, L17, R14, R15, R16, R17, R18, R19, R20, \ - L18, L19, L20, L21, L22, L23, R21, R22, R23, R24, R25, R26, R27, \ - L24, L25, L26, R28, R29, R30 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L06, L07, L08, L09, L10, L11 }, \ - { L12, L13, L14, L15, L16, L17 }, \ - { L18, L19, L20, L21, L22, L23 }, \ - { KC_NO, KC_NO, KC_NO, L24, L25, L26 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R07, R08, R09, R10, R11, R12, R13 }, \ - { R14, R15, R16, R17, R18, R19, R20 }, \ - { R21, R22, R23, R24, R25, R26, R27 }, \ - { R28, R29, R30, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/kb_elmo/aek2_usb/aek2_usb.h b/keyboards/kb_elmo/aek2_usb/aek2_usb.h deleted file mode 100644 index 37c252f29a8c..000000000000 --- a/keyboards/kb_elmo/aek2_usb/aek2_usb.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k52, k12, k105, k91, k90, k84, \ - k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k104, k78, k79, k80, k81, k83, k85, \ - k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k92, k93, k94, k95, k82, k97, k99, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k53, k54, k89, k96, k98, k86, \ - k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k73, k103, k88, k87, \ - k67, k68, k69, k70, k75, k76, k77, k72, k74, k71, k102, k101, k100 \ -) { \ - { k01, KC_NO, k02, k03, k04, k05, k06, k07, k08, k09, KC_NO, k10, k11, k12 }, \ - { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26 }, \ - { k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 }, \ - { k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54 }, \ - { k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, KC_NO, KC_NO, k66 }, \ - { k67, k68, k69, KC_NO, KC_NO, k70, k71, k72, k73, k74, k75, k76, KC_NO, k77 }, \ - { k78, k79, k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k90, k91 }, \ - { k92, k93, k94, k95, k96, k97, k98, k99, k100, k101, k102, k103, k104, k105 } \ -} diff --git a/keyboards/kb_elmo/aek2_usb/info.json b/keyboards/kb_elmo/aek2_usb/info.json index a74553ba11c2..4e5a13f87093 100644 --- a/keyboards/kb_elmo/aek2_usb/info.json +++ b/keyboards/kb_elmo/aek2_usb/info.json @@ -23,111 +23,130 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.5, "y":0}, - {"x":16.5, "y":0}, - {"x":17.5, "y":0}, - {"x":22, "y":0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2, "w":2}, - {"x":15.5, "y":2}, - {"x":16.5, "y":2}, - {"x":17.5, "y":2}, - {"x":19, "y":2}, - {"x":20, "y":2}, - {"x":21, "y":2}, - {"x":22, "y":2}, - {"x":0, "y":3, "w":1.5}, - {"x":1.5, "y":3}, - {"x":2.5, "y":3}, - {"x":3.5, "y":3}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.5, "y":3}, - {"x":7.5, "y":3}, - {"x":8.5, "y":3}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3, "w":1.5}, - {"x":15.5, "y":3}, - {"x":16.5, "y":3}, - {"x":17.5, "y":3}, - {"x":19, "y":3}, - {"x":20, "y":3}, - {"x":21, "y":3}, - {"x":22, "y":3}, - {"x":0, "y":4, "w":1.75}, - {"x":1.75, "y":4}, - {"x":2.75, "y":4}, - {"x":3.75, "y":4}, - {"x":4.75, "y":4}, - {"x":5.75, "y":4}, - {"x":6.75, "y":4}, - {"x":7.75, "y":4}, - {"x":8.75, "y":4}, - {"x":9.75, "y":4}, - {"x":10.75, "y":4}, - {"x":11.75, "y":4}, - {"x":12.75, "y":4, "w":2.25}, - {"x":19, "y":4}, - {"x":20, "y":4}, - {"x":21, "y":4}, - {"x":22, "y":4}, - {"x":0, "y":5, "w":2.25}, - {"x":2.25, "y":5}, - {"x":3.25, "y":5}, - {"x":4.25, "y":5}, - {"x":5.25, "y":5}, - {"x":6.25, "y":5}, - {"x":7.25, "y":5}, - {"x":8.25, "y":5}, - {"x":9.25, "y":5}, - {"x":10.25, "y":5}, - {"x":11.25, "y":5}, - {"x":12.25, "y":5, "w":2.75}, - {"x":16.5, "y":5}, - {"x":19, "y":5}, - {"x":20, "y":5}, - {"x":21, "y":5}, - {"x":22, "y":5, "h":2}, - {"x":0, "y":6, "w":1.5}, - {"x":1.5, "y":6, "w":1.25}, - {"x":2.75, "y":6, "w":1.5}, - {"x":4.25, "y":6, "w":6.5}, - {"x":10.75, "y":6, "w":1.5}, - {"x":12.25, "y":6, "w":1.25}, - {"x":13.5, "y":6, "w":1.5}, - {"x":15.5, "y":6}, - {"x":16.5, "y":6}, - {"x":17.5, "y":6}, - {"x":19, "y":6, "w":2}, - {"x":21, "y":6} + {"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, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [3, 11], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [7, 13], "x": 15.5, "y": 0}, + {"matrix": [6, 13], "x": 16.5, "y": 0}, + {"matrix": [6, 12], "x": 17.5, "y": 0}, + + {"matrix": [6, 6], "x": 22, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "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, 8], "x": 8, "y": 2}, + {"matrix": [1, 9], "x": 9, "y": 2}, + {"matrix": [1, 10], "x": 10, "y": 2}, + {"matrix": [1, 11], "x": 11, "y": 2}, + {"matrix": [1, 12], "x": 12, "y": 2}, + {"matrix": [1, 13], "x": 13, "y": 2, "w": 2}, + + {"matrix": [7, 12], "x": 15.5, "y": 2}, + {"matrix": [6, 0], "x": 16.5, "y": 2}, + {"matrix": [6, 1], "x": 17.5, "y": 2}, + + {"matrix": [6, 2], "x": 19, "y": 2}, + {"matrix": [6, 3], "x": 20, "y": 2}, + {"matrix": [6, 5], "x": 21, "y": 2}, + {"matrix": [6, 7], "x": 22, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 3}, + {"matrix": [2, 2], "x": 2.5, "y": 3}, + {"matrix": [2, 3], "x": 3.5, "y": 3}, + {"matrix": [2, 4], "x": 4.5, "y": 3}, + {"matrix": [2, 5], "x": 5.5, "y": 3}, + {"matrix": [2, 6], "x": 6.5, "y": 3}, + {"matrix": [2, 7], "x": 7.5, "y": 3}, + {"matrix": [2, 8], "x": 8.5, "y": 3}, + {"matrix": [2, 9], "x": 9.5, "y": 3}, + {"matrix": [2, 10], "x": 10.5, "y": 3}, + {"matrix": [2, 11], "x": 11.5, "y": 3}, + {"matrix": [2, 12], "x": 12.5, "y": 3}, + {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [7, 0], "x": 15.5, "y": 3}, + {"matrix": [7, 1], "x": 16.5, "y": 3}, + {"matrix": [7, 2], "x": 17.5, "y": 3}, + + {"matrix": [7, 3], "x": 19, "y": 3}, + {"matrix": [6, 4], "x": 20, "y": 3}, + {"matrix": [7, 5], "x": 21, "y": 3}, + {"matrix": [7, 7], "x": 22, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 4}, + {"matrix": [3, 2], "x": 2.75, "y": 4}, + {"matrix": [3, 3], "x": 3.75, "y": 4}, + {"matrix": [3, 4], "x": 4.75, "y": 4}, + {"matrix": [3, 5], "x": 5.75, "y": 4}, + {"matrix": [3, 6], "x": 6.75, "y": 4}, + {"matrix": [3, 7], "x": 7.75, "y": 4}, + {"matrix": [3, 8], "x": 8.75, "y": 4}, + {"matrix": [3, 9], "x": 9.75, "y": 4}, + {"matrix": [3, 10], "x": 10.75, "y": 4}, + {"matrix": [3, 12], "x": 11.75, "y": 4}, + {"matrix": [3, 13], "x": 12.75, "y": 4, "w": 2.25}, + + {"matrix": [6, 11], "x": 19, "y": 4}, + {"matrix": [7, 4], "x": 20, "y": 4}, + {"matrix": [7, 6], "x": 21, "y": 4}, + {"matrix": [6, 8], "x": 22, "y": 4}, + + {"matrix": [4, 0], "x": 0, "y": 5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 5}, + {"matrix": [4, 2], "x": 3.25, "y": 5}, + {"matrix": [4, 3], "x": 4.25, "y": 5}, + {"matrix": [4, 4], "x": 5.25, "y": 5}, + {"matrix": [4, 5], "x": 6.25, "y": 5}, + {"matrix": [4, 6], "x": 7.25, "y": 5}, + {"matrix": [4, 7], "x": 8.25, "y": 5}, + {"matrix": [4, 8], "x": 9.25, "y": 5}, + {"matrix": [4, 9], "x": 10.25, "y": 5}, + {"matrix": [4, 10], "x": 11.25, "y": 5}, + {"matrix": [4, 13], "x": 12.25, "y": 5, "w": 2.75}, + + {"matrix": [5, 8], "x": 16.5, "y": 5}, + + {"matrix": [7, 11], "x": 19, "y": 5}, + {"matrix": [6, 10], "x": 20, "y": 5}, + {"matrix": [6, 9], "x": 21, "y": 5}, + {"matrix": [5, 0], "x": 22, "y": 5, "h": 2}, + + {"matrix": [5, 1], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [5, 2], "x": 1.5, "y": 6, "w": 1.25}, + {"matrix": [5, 5], "x": 2.75, "y": 6, "w": 1.5}, + {"matrix": [5, 10], "x": 4.25, "y": 6, "w": 6.5}, + {"matrix": [5, 11], "x": 10.75, "y": 6, "w": 1.5}, + {"matrix": [5, 13], "x": 12.25, "y": 6, "w": 1.25}, + {"matrix": [5, 7], "x": 13.5, "y": 6, "w": 1.5}, + + {"matrix": [5, 9], "x": 15.5, "y": 6}, + {"matrix": [5, 6], "x": 16.5, "y": 6}, + {"matrix": [7, 10], "x": 17.5, "y": 6}, + + {"matrix": [7, 9], "x": 19, "y": 6, "w": 2}, + {"matrix": [7, 8], "x": 21, "y": 6} ] } } diff --git a/keyboards/kb_elmo/m0110a_usb/info.json b/keyboards/kb_elmo/m0110a_usb/info.json index 2e147e432598..4c37db13ea90 100644 --- a/keyboards/kb_elmo/m0110a_usb/info.json +++ b/keyboards/kb_elmo/m0110a_usb/info.json @@ -18,88 +18,94 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":1.5}, - {"label":"Delete", "x":15.25, "y":0}, - {"label":"=+", "x":16.25, "y":0}, - {"label":"/", "x":17.25, "y":0}, - {"label":"*", "x":18.25, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [4, 8], "x": 13, "y": 0, "w": 1.5}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[{", "x":11.5, "y":1}, - {"label":"]}", "x":12.5, "y":1}, - {"label":"7", "x":15.25, "y":1}, - {"label":"8", "x":16.25, "y":1}, - {"label":"9", "x":17.25, "y":1}, - {"label":"-", "x":18.25, "y":1}, + {"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": [0, 16], "x": 18.25, "y": 0}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";:", "x":10.75, "y":2}, - {"label":"'\"", "x":11.75, "y":2}, - {"label":"Enter", "x":13.5, "y":1, "h":2}, - {"label":"4", "x":15.25, "y":2}, - {"label":"5", "x":16.25, "y":2}, - {"label":"6", "x":17.25, "y":2}, - {"label":"+", "x":18.25, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",<", "x":9.25, "y":3}, - {"label":".>", "x":10.25, "y":3}, - {"label":"/?", "x":11.25, "y":3}, - {"label":"MO(1)", "x":12.25, "y":3, "w":1.25}, - {"label":"Up", "x":13.5, "y":3}, - {"label":"1", "x":15.25, "y":3}, - {"label":"2", "x":16.25, "y":3}, - {"label":"3", "x":17.25, "y":3}, + {"matrix": [1, 13], "x": 15.25, "y": 1}, + {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 15], "x": 17.25, "y": 1}, + {"matrix": [1, 16], "x": 18.25, "y": 1}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"GUI", "x":1.5, "y":4, "w":2}, - {"label":"Space", "x":3.5, "y":4, "w":7}, - {"label":"\\|", "x":10.5, "y":4}, - {"label":"Left", "x":11.5, "y":4}, - {"label":"Right", "x":12.5, "y":4}, - {"label":"Down", "x":13.5, "y":4}, - {"label":"0", "x":15.25, "y":4, "w":2}, - {"label":".", "x":17.25, "y":4}, - {"label":"Enter", "x":18.25, "y":3, "h":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 1, "h": 2}, + + {"matrix": [2, 13], "x": 15.25, "y": 2}, + {"matrix": [2, 14], "x": 16.25, "y": 2}, + {"matrix": [2, 15], "x": 17.25, "y": 2}, + {"matrix": [2, 16], "x": 18.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.25}, + + {"matrix": [3, 12], "x": 13.5, "y": 3}, + + {"matrix": [3, 13], "x": 15.25, "y": 3}, + {"matrix": [3, 14], "x": 16.25, "y": 3}, + {"matrix": [3, 15], "x": 17.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 3.5, "y": 4, "w": 7}, + {"matrix": [4, 9], "x": 10.5, "y": 4}, + {"matrix": [4, 10], "x": 11.5, "y": 4}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 12], "x": 13.5, "y": 4}, + + {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 2}, + {"matrix": [4, 15], "x": 17.25, "y": 4}, + {"matrix": [4, 16], "x": 18.25, "y": 3, "h": 2} ] } } diff --git a/keyboards/kb_elmo/m0110a_usb/m0110a_usb.h b/keyboards/kb_elmo/m0110a_usb/m0110a_usb.h deleted file mode 100644 index a33c70a6d11e..000000000000 --- a/keyboards/kb_elmo/m0110a_usb/m0110a_usb.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k76, k13, k14, k15, k16, \ - k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, \ - k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, \ - k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, \ - k68, k69, k72, k77, k78, k79, k80, k81, k83, k84 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, }, \ - { k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, }, \ - { k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, }, \ - { k51, k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, KC_NO, }, \ - { k68, k69, KC_NO, KC_NO, k72, KC_NO, KC_NO, KC_NO, k76, k77, k78, k79, k80, k81, KC_NO, k83, k84 } \ -} diff --git a/keyboards/kb_elmo/m0116_usb/info.json b/keyboards/kb_elmo/m0116_usb/info.json index e0e1b234230c..e8accd844825 100644 --- a/keyboards/kb_elmo/m0116_usb/info.json +++ b/keyboards/kb_elmo/m0116_usb/info.json @@ -21,92 +21,98 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Print Screen", "x":5, "y":0, "w":2}, + {"matrix": [4, 5], "x": 5, "y": 0, "w": 2}, - {"label":"Esc", "x":0, "y":1.15}, - {"label":"1!", "x":1, "y":1.15}, - {"label":"2@", "x":2, "y":1.15}, - {"label":"3#", "x":3, "y":1.15}, - {"label":"4$", "x":4, "y":1.15}, - {"label":"5%", "x":5, "y":1.15}, - {"label":"6^", "x":6, "y":1.15}, - {"label":"7&", "x":7, "y":1.15}, - {"label":"8*", "x":8, "y":1.15}, - {"label":"9(", "x":9, "y":1.15}, - {"label":"0)", "x":10, "y":1.15}, - {"label":"-_", "x":11, "y":1.15}, - {"label":"=+", "x":12, "y":1.15}, - {"label":"Backspace", "x":13, "y":1.15, "w":1.5}, - {"label":"Delete", "x":15.25, "y":1.15}, - {"label":"=+", "x":16.25, "y":1.15}, - {"label":"/", "x":17.25, "y":1.15}, - {"label":"*", "x":18.25, "y":1.15}, + {"matrix": [0, 0], "x": 0, "y": 1.15}, + {"matrix": [0, 1], "x": 1, "y": 1.15}, + {"matrix": [0, 2], "x": 2, "y": 1.15}, + {"matrix": [0, 3], "x": 3, "y": 1.15}, + {"matrix": [0, 4], "x": 4, "y": 1.15}, + {"matrix": [0, 5], "x": 5, "y": 1.15}, + {"matrix": [0, 6], "x": 6, "y": 1.15}, + {"matrix": [0, 7], "x": 7, "y": 1.15}, + {"matrix": [0, 8], "x": 8, "y": 1.15}, + {"matrix": [0, 9], "x": 9, "y": 1.15}, + {"matrix": [0, 10], "x": 10, "y": 1.15}, + {"matrix": [0, 11], "x": 11, "y": 1.15}, + {"matrix": [0, 12], "x": 12, "y": 1.15}, + {"matrix": [0, 13], "x": 13, "y": 1.15, "w": 1.5}, - {"label":"Tab", "x":0, "y":2.15, "w":1.5}, - {"label":"Q", "x":1.5, "y":2.15}, - {"label":"W", "x":2.5, "y":2.15}, - {"label":"E", "x":3.5, "y":2.15}, - {"label":"R", "x":4.5, "y":2.15}, - {"label":"T", "x":5.5, "y":2.15}, - {"label":"Y", "x":6.5, "y":2.15}, - {"label":"U", "x":7.5, "y":2.15}, - {"label":"I", "x":8.5, "y":2.15}, - {"label":"O", "x":9.5, "y":2.15}, - {"label":"P", "x":10.5, "y":2.15}, - {"label":"[{", "x":11.5, "y":2.15}, - {"label":"]}", "x":12.5, "y":2.15}, - {"label":"7", "x":15.25, "y":2.15}, - {"label":"8", "x":16.25, "y":2.15}, - {"label":"9", "x":17.25, "y":2.15}, - {"label":"+", "x":18.25, "y":2.15}, + {"matrix": [0, 14], "x": 15.25, "y": 1.15}, + {"matrix": [0, 15], "x": 16.25, "y": 1.15}, + {"matrix": [0, 16], "x": 17.25, "y": 1.15}, + {"matrix": [0, 17], "x": 18.25, "y": 1.15}, - {"label":"Ctrl", "x":0, "y":3.15, "w":1.75}, - {"label":"A", "x":1.75, "y":3.15}, - {"label":"S", "x":2.75, "y":3.15}, - {"label":"D", "x":3.75, "y":3.15}, - {"label":"F", "x":4.75, "y":3.15}, - {"label":"G", "x":5.75, "y":3.15}, - {"label":"H", "x":6.75, "y":3.15}, - {"label":"J", "x":7.75, "y":3.15}, - {"label":"K", "x":8.75, "y":3.15}, - {"label":"L", "x":9.75, "y":3.15}, - {"label":";:", "x":10.75, "y":3.15}, - {"label":"'\"", "x":11.75, "y":3.15}, - {"label":"Enter", "x":13.5, "y":2.15, "h":2}, - {"label":"4", "x":15.25, "y":3.15}, - {"label":"5", "x":16.25, "y":3.15}, - {"label":"6", "x":17.25, "y":3.15}, - {"label":"-", "x":18.25, "y":3.15}, + {"matrix": [1, 0], "x": 0, "y": 2.15, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 2.15}, + {"matrix": [1, 2], "x": 2.5, "y": 2.15}, + {"matrix": [1, 3], "x": 3.5, "y": 2.15}, + {"matrix": [1, 4], "x": 4.5, "y": 2.15}, + {"matrix": [1, 5], "x": 5.5, "y": 2.15}, + {"matrix": [1, 6], "x": 6.5, "y": 2.15}, + {"matrix": [1, 7], "x": 7.5, "y": 2.15}, + {"matrix": [1, 8], "x": 8.5, "y": 2.15}, + {"matrix": [1, 9], "x": 9.5, "y": 2.15}, + {"matrix": [1, 10], "x": 10.5, "y": 2.15}, + {"matrix": [1, 11], "x": 11.5, "y": 2.15}, + {"matrix": [1, 12], "x": 12.5, "y": 2.15}, + {"matrix": [1, 14], "x": 15.25, "y": 2.15}, + {"matrix": [1, 15], "x": 16.25, "y": 2.15}, + {"matrix": [1, 16], "x": 17.25, "y": 2.15}, + {"matrix": [1, 17], "x": 18.25, "y": 2.15}, + {"matrix": [2, 0], "x": 0, "y": 3.15, "w": 1.75}, - {"label":"Shift", "x":0, "y":4.15, "w":2.25}, - {"label":"Z", "x":2.25, "y":4.15}, - {"label":"X", "x":3.25, "y":4.15}, - {"label":"C", "x":4.25, "y":4.15}, - {"label":"V", "x":5.25, "y":4.15}, - {"label":"B", "x":6.25, "y":4.15}, - {"label":"N", "x":7.25, "y":4.15}, - {"label":"M", "x":8.25, "y":4.15}, - {"label":",<", "x":9.25, "y":4.15}, - {"label":".>", "x":10.25, "y":4.15}, - {"label":"/?", "x":11.25, "y":4.15}, - {"label":"MO(1)", "x":12.25, "y":4.15, "w":2.25}, - {"label":"1", "x":15.25, "y":4.15}, - {"label":"2", "x":16.25, "y":4.15}, - {"label":"3", "x":17.25, "y":4.15}, + {"matrix": [2, 1], "x": 1.75, "y": 3.15}, + {"matrix": [2, 2], "x": 2.75, "y": 3.15}, + {"matrix": [2, 3], "x": 3.75, "y": 3.15}, + {"matrix": [2, 4], "x": 4.75, "y": 3.15}, + {"matrix": [2, 5], "x": 5.75, "y": 3.15}, + {"matrix": [2, 6], "x": 6.75, "y": 3.15}, + {"matrix": [2, 7], "x": 7.75, "y": 3.15}, + {"matrix": [2, 8], "x": 8.75, "y": 3.15}, + {"matrix": [2, 9], "x": 9.75, "y": 3.15}, + {"matrix": [2, 10], "x": 10.75, "y": 3.15}, + {"matrix": [2, 11], "x": 11.75, "y": 3.15}, + {"matrix": [1, 13], "x": 13.5, "y": 2.15, "h": 2}, - {"label":"Caps Lock", "x":0, "y":5.15}, - {"label":"GUI", "x":1, "y":5.15}, - {"label":"Alt", "x":2, "y":5.15, "w":1.75}, - {"label":"`~", "x":3.75, "y":5.15}, - {"label":"Space", "x":4.75, "y":5.15, "w":4.75}, - {"label":"\\|", "x":9.5, "y":5.15}, - {"label":"Left", "x":10.5, "y":5.15}, - {"label":"Right", "x":11.5, "y":5.15}, - {"label":"Down", "x":12.5, "y":5.15}, - {"label":"Up", "x":13.5, "y":5.15}, - {"label":"0", "x":15.25, "y":5.15, "w":2}, - {"label":".", "x":17.25, "y":5.15}, - {"label":"Enter", "x":18.25, "y":4.15, "h":2} + {"matrix": [2, 14], "x": 15.25, "y": 3.15}, + {"matrix": [2, 15], "x": 16.25, "y": 3.15}, + {"matrix": [2, 16], "x": 17.25, "y": 3.15}, + {"matrix": [2, 17], "x": 18.25, "y": 3.15}, + + {"matrix": [3, 0], "x": 0, "y": 4.15, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 4.15}, + {"matrix": [3, 2], "x": 3.25, "y": 4.15}, + {"matrix": [3, 3], "x": 4.25, "y": 4.15}, + {"matrix": [3, 4], "x": 5.25, "y": 4.15}, + {"matrix": [3, 5], "x": 6.25, "y": 4.15}, + {"matrix": [3, 6], "x": 7.25, "y": 4.15}, + {"matrix": [3, 7], "x": 8.25, "y": 4.15}, + {"matrix": [3, 8], "x": 9.25, "y": 4.15}, + {"matrix": [3, 9], "x": 10.25, "y": 4.15}, + {"matrix": [3, 10], "x": 11.25, "y": 4.15}, + {"matrix": [3, 13], "x": 12.25, "y": 4.15, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.25, "y": 4.15}, + {"matrix": [3, 15], "x": 16.25, "y": 4.15}, + {"matrix": [3, 16], "x": 17.25, "y": 4.15}, + + {"matrix": [4, 0], "x": 0, "y": 5.15}, + {"matrix": [4, 1], "x": 1, "y": 5.15}, + {"matrix": [4, 2], "x": 2, "y": 5.15, "w": 1.75}, + {"matrix": [4, 3], "x": 3.75, "y": 5.15}, + {"matrix": [4, 7], "x": 4.75, "y": 5.15, "w": 4.75}, + {"matrix": [4, 8], "x": 9.5, "y": 5.15}, + + {"matrix": [4, 9], "x": 10.5, "y": 5.15}, + {"matrix": [4, 10], "x": 11.5, "y": 5.15}, + {"matrix": [4, 11], "x": 12.5, "y": 5.15}, + + {"matrix": [4, 13], "x": 13.5, "y": 5.15}, + + {"matrix": [4, 14], "x": 15.25, "y": 5.15, "w": 2}, + {"matrix": [4, 16], "x": 17.25, "y": 5.15}, + {"matrix": [4, 17], "x": 18.25, "y": 4.15, "h": 2} ] } } diff --git a/keyboards/kb_elmo/m0116_usb/m0116_usb.h b/keyboards/kb_elmo/m0116_usb/m0116_usb.h deleted file mode 100644 index 9e98e19ea2f2..000000000000 --- a/keyboards/kb_elmo/m0116_usb/m0116_usb.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 kb-elmo - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k71, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, \ - k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k32, k33, k34, k35, \ - k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, k31, k48, k49, k50, k51, \ - k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, \ - k67, k68, k69, k70, k72, k73, k74, k75, k76, k77, k78, k79, k80 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, k15, k16, k17, }, \ - { k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, }, \ - { k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47, KC_NO, KC_NO, k48, k49, k50, k51, }, \ - { k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, KC_NO, KC_NO, k63, k64, k65, k66, KC_NO }, \ - { k67, k68, k69, k70, KC_NO, k71, KC_NO, k72, k73, k74, k75, k76, KC_NO, k77, k78, KC_NO, k79, k80, } \ -} diff --git a/keyboards/kbdfans/bella/rgb/info.json b/keyboards/kbdfans/bella/rgb/info.json index 818283adc1fc..64ec94448d64 100644 --- a/keyboards/kbdfans/bella/rgb/info.json +++ b/keyboards/kbdfans/bella/rgb/info.json @@ -20,7 +20,102 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15.25, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15.25, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15.25, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Fn", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.25}, {"label":"\u2193", "x":14.25, "y":5.25}, {"label":"\u2192", "x":15.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, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [3, 15], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [4, 14], "x": 14.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.25}, + {"matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"matrix": [5, 15], "x": 15.25, "y": 5.25} + ] } } } diff --git a/keyboards/kbdfans/bella/rgb/rgb.c b/keyboards/kbdfans/bella/rgb/rgb.c index e8c2cc0282b2..aac16dd82073 100644 --- a/keyboards/kbdfans/bella/rgb/rgb.c +++ b/keyboards/kbdfans/bella/rgb/rgb.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ diff --git a/keyboards/kbdfans/bella/rgb/rgb.h b/keyboards/kbdfans/bella/rgb/rgb.h deleted file mode 100644 index dfd098c216dd..000000000000 --- a/keyboards/kbdfans/bella/rgb/rgb.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 dztech - * - * 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( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K315, \ - K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, \ - K500, K501, K502, K506, K510, K511, K512, K514, K515 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, KC_NO, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, KC_NO }, \ - { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, KC_NO, K514, K515 } \ -} diff --git a/keyboards/kbdfans/bella/rgb_iso/info.json b/keyboards/kbdfans/bella/rgb_iso/info.json index aa5202c1d4a6..95b888536979 100644 --- a/keyboards/kbdfans/bella/rgb_iso/info.json +++ b/keyboards/kbdfans/bella/rgb_iso/info.json @@ -20,7 +20,103 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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":"Page Up", "x":15.25, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Insert", "x":15.25, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"Delete", "x":15.25, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"~", "x":12.75, "y":3}, {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2}, {"label":"Page Down", "x":15.25, "y":3}, {"label":"Shift", "x":0, "y":4, "w":1.25}, {"label":"|", "x":1.25, "y":4}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Fn", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13.25, "y":5.25}, {"label":"\u2193", "x":14.25, "y":5.25}, {"label":"\u2192", "x":15.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, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 14], "x": 13, "y": 1, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + + {"matrix": [2, 15], "x": 15.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [2, 13], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 2, "w": 1.25, "h": 2}, + + {"matrix": [3, 15], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + + {"matrix": [4, 14], "x": 14.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.25}, + {"matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"matrix": [5, 15], "x": 15.25, "y": 5.25} + ] } } } diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c index 3e356faa91ba..30371614d812 100644 --- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c +++ b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rgb_iso.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {0, CS18_SW1, CS17_SW1, CS16_SW1}, /* RGB6 */ diff --git a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.h b/keyboards/kbdfans/bella/rgb_iso/rgb_iso.h deleted file mode 100644 index 65d326f19f6e..000000000000 --- a/keyboards/kbdfans/bella/rgb_iso/rgb_iso.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 dztech - * - * 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( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K213, K313, K315, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, \ - K500, K501, K502, K506, K510, K511, K512, K514, K515 \ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, KC_NO, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414, KC_NO }, \ - { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, KC_NO, K514, K515 } \ -} diff --git a/keyboards/kbdfans/kbd6x/info.json b/keyboards/kbdfans/kbd6x/info.json index 97868ebe1d33..2161ecdd8b24 100644 --- a/keyboards/kbdfans/kbd6x/info.json +++ b/keyboards/kbdfans/kbd6x/info.json @@ -27,7 +27,74 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Win", "x":1.5, "y":4}, {"label":"Alt", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"label":"Alt", "x":11, "y":4, "w":1.5}, {"label":"Win", "x":12.5, "y":4}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [4, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.5, "y": 4}, + {"matrix": [4, 12], "x": 13.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/kbdfans/kbd6x/kbd6x.h b/keyboards/kbdfans/kbd6x/kbd6x.h deleted file mode 100644 index 46e3c2460736..000000000000 --- a/keyboards/kbdfans/kbd6x/kbd6x.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K4D,\ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K46, K4A, K4B, K4C \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D }, \ -} diff --git a/keyboards/kbdfans/kbdmini/info.json b/keyboards/kbdfans/kbdmini/info.json index b329a4ec562e..a97ad09cec89 100644 --- a/keyboards/kbdfans/kbdmini/info.json +++ b/keyboards/kbdfans/kbdmini/info.json @@ -22,61 +22,61 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - {"x": 8, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, - {"x": 6, "y": 3}, - {"x": 7, "y": 3}, - {"x": 8, "y": 3}, - {"x": 9, "y": 3}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3} ] } } diff --git a/keyboards/kbdfans/kbdmini/kbdmini.c b/keyboards/kbdfans/kbdmini/kbdmini.c index 80ba687b6d3b..4dd76e974edc 100644 --- a/keyboards/kbdfans/kbdmini/kbdmini.c +++ b/keyboards/kbdfans/kbdmini/kbdmini.c @@ -1,4 +1,4 @@ -#include "kbdmini.h" +#include "quantum.h" const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { { 0, B_9, A_9, C_9 }, //LA33 diff --git a/keyboards/kbdfans/kbdmini/kbdmini.h b/keyboards/kbdfans/kbdmini/kbdmini.h deleted file mode 100644 index b97da5708014..000000000000 --- a/keyboards/kbdfans/kbdmini/kbdmini.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C } \ -} diff --git a/keyboards/kbdfans/maja/info.json b/keyboards/kbdfans/maja/info.json index 9df60b9bfa91..68dc1d16e6a5 100644 --- a/keyboards/kbdfans/maja/info.json +++ b/keyboards/kbdfans/maja/info.json @@ -22,73 +22,86 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.75, "y": 0.25}, - {"x": 1.75, "y": 0.25}, - {"x": 2.75, "y": 0}, - {"x": 3.75, "y": 0.25}, - {"x": 4.75, "y": 0.25}, - {"x": 5.75, "y": 0.25}, - {"x": 6.75, "y": 0.25}, - {"x": 8.75, "y": 0.25}, - {"x": 9.75, "y": 0.25}, - {"x": 10.75, "y": 0.25}, - {"x": 11.75, "y": 0.25}, - {"x": 12.75, "y": 0}, - {"x": 13.75, "y": 0.25}, - {"x": 14.75, "y": 0.25, "w": 2}, - {"x": 17.75, "y": 0.25}, - {"x": 0.5, "y": 1.25, "w": 1.5}, - {"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": 8.5, "y": 1.25}, - {"x": 9.5, "y": 1.25}, - {"x": 10.5, "y": 1.25}, - {"x": 11.5, "y": 1.25}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.25}, - {"x": 14.5, "y": 1.25}, - {"x": 15.5, "y": 1.25, "w": 1.5}, - {"x": 17.75, "y": 1.25}, - {"x": 0.25, "y": 2.25, "w": 1.75}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.25}, - {"x": 9, "y": 2.25}, - {"x": 10, "y": 2.25}, - {"x": 11, "y": 2.25}, - {"x": 12, "y": 2.25}, - {"x": 13, "y": 2.25}, - {"x": 14, "y": 2.25}, - {"x": 15, "y": 2.25, "w": 2.25}, - {"x": 17.75, "y": 2.25}, - {"x": 0, "y": 3.25, "w": 2.25}, - {"x": 2.25, "y": 3.25}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3.25}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.25}, - {"x": 8.25, "y": 3.25}, - {"x": 9.25, "y": 3.25}, - {"x": 10.25, "y": 3.25}, - {"x": 11.25, "y": 3.25}, - {"x": 12.25, "y": 3.25}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3.25, "w": 2.25}, - {"x": 16.75, "y": 3.5}, - {"x": 0, "y": 4.25, "w": 1.5}, - {"x": 3, "y": 4.25, "w": 1.5}, - {"x": 4.5, "y": 4.25, "w": 2}, - {"x": 6.5, "y": 4.25, "w": 1.25}, - {"x": 8.25, "y": 4.25, "w": 2.75}, - {"x": 11, "y": 4.25, "w": 1.5}, - {"x": 15.75, "y": 4.5}, - {"x": 16.75, "y": 4.5}, - {"x": 17.75, "y": 4.5} + {"matrix": [0, 0], "x": 0.75, "y": 0.25}, + {"matrix": [0, 1], "x": 1.75, "y": 0.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0.25}, + {"matrix": [0, 4], "x": 4.75, "y": 0.25}, + {"matrix": [0, 5], "x": 5.75, "y": 0.25}, + {"matrix": [0, 6], "x": 6.75, "y": 0.25}, + + {"matrix": [0, 7], "x": 8.75, "y": 0.25}, + {"matrix": [0, 8], "x": 9.75, "y": 0.25}, + {"matrix": [0, 9], "x": 10.75, "y": 0.25}, + {"matrix": [0, 10], "x": 11.75, "y": 0.25}, + {"matrix": [0, 11], "x": 12.75, "y": 0}, + {"matrix": [0, 12], "x": 13.75, "y": 0.25}, + {"matrix": [0, 13], "x": 14.75, "y": 0.25, "w": 2}, + + {"matrix": [0, 14], "x": 17.75, "y": 0.25}, + + {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.25}, + + {"matrix": [1, 6], "x": 8.5, "y": 1.25}, + {"matrix": [1, 7], "x": 9.5, "y": 1.25}, + {"matrix": [1, 8], "x": 10.5, "y": 1.25}, + {"matrix": [1, 9], "x": 11.5, "y": 1.25}, + {"matrix": [1, 10], "x": 12.5, "y": 1.25}, + {"matrix": [1, 11], "x": 13.5, "y": 1.25}, + {"matrix": [1, 12], "x": 14.5, "y": 1.25}, + {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5}, + + {"matrix": [1, 14], "x": 17.75, "y": 1.25}, + + {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2.25}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, + + {"matrix": [2, 6], "x": 9, "y": 2.25}, + {"matrix": [2, 7], "x": 10, "y": 2.25}, + {"matrix": [2, 8], "x": 11, "y": 2.25}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.25}, + {"matrix": [2, 11], "x": 14, "y": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25}, + + {"matrix": [2, 14], "x": 17.75, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + {"matrix": [3, 6], "x": 8.25, "y": 3.25}, + {"matrix": [3, 7], "x": 9.25, "y": 3.25}, + {"matrix": [3, 8], "x": 10.25, "y": 3.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3.25}, + {"matrix": [3, 10], "x": 12.25, "y": 3.25}, + {"matrix": [3, 11], "x": 13.25, "y": 3.25}, + {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25}, + + {"matrix": [3, 13], "x": 16.75, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25}, + + {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.75, "y": 4.5}, + {"matrix": [4, 13], "x": 16.75, "y": 4.5}, + {"matrix": [4, 14], "x": 17.75, "y": 4.5} ] } } diff --git a/keyboards/kbdfans/maja/maja.c b/keyboards/kbdfans/maja/maja.c index 0185a7ce2bff..43153808d937 100755 --- a/keyboards/kbdfans/maja/maja.c +++ b/keyboards/kbdfans/maja/maja.c @@ -1,4 +1,4 @@ -#include "maja.h" +#include "quantum.h" const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { {0, C2_1, C3_1, C4_1}, // LA0 diff --git a/keyboards/kbdfans/maja/maja.h b/keyboards/kbdfans/maja/maja.h deleted file mode 100755 index 7e6027bac2b4..000000000000 --- a/keyboards/kbdfans/maja/maja.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K42, K43, K45, K47, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \ - { K40, XXX, K42, K43, XXX, K45, XXX, K47, XXX, K49, XXX, XXX, K4C, K4D, K4E } \ -} diff --git a/keyboards/kbdfans/maja_soldered/info.json b/keyboards/kbdfans/maja_soldered/info.json index b4bc430b3fda..197f26870b8e 100644 --- a/keyboards/kbdfans/maja_soldered/info.json +++ b/keyboards/kbdfans/maja_soldered/info.json @@ -22,74 +22,88 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.75, "y": 0.25}, - {"x": 1.75, "y": 0.25}, - {"x": 2.75, "y": 0}, - {"x": 3.75, "y": 0.25}, - {"x": 4.75, "y": 0.25}, - {"x": 5.75, "y": 0.25}, - {"x": 6.75, "y": 0.25}, - {"x": 8.75, "y": 0.25}, - {"x": 9.75, "y": 0.25}, - {"x": 10.75, "y": 0.25}, - {"x": 11.75, "y": 0.25}, - {"x": 12.75, "y": 0}, - {"x": 13.75, "y": 0.25}, - {"x": 14.75, "y": 0.25}, - {"x": 15.75, "y": 0.25}, - {"x": 17.75, "y": 0.25}, - {"x": 0.5, "y": 1.25, "w": 1.5}, - {"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": 8.5, "y": 1.25}, - {"x": 9.5, "y": 1.25}, - {"x": 10.5, "y": 1.25}, - {"x": 11.5, "y": 1.25}, - {"x": 12.5, "y": 1.25}, - {"x": 13.5, "y": 1.25}, - {"x": 14.5, "y": 1.25}, - {"x": 15.5, "y": 1.25, "w": 1.5}, - {"x": 17.75, "y": 1.25}, - {"x": 0.25, "y": 2.25, "w": 1.75}, - {"x": 2, "y": 2.25}, - {"x": 3, "y": 2.25}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 2.25}, - {"x": 6, "y": 2.25}, - {"x": 9, "y": 2.25}, - {"x": 10, "y": 2.25}, - {"x": 11, "y": 2.25}, - {"x": 12, "y": 2.25}, - {"x": 13, "y": 2.25}, - {"x": 14, "y": 2.25}, - {"x": 15, "y": 2.25, "w": 2.25}, - {"x": 17.75, "y": 2.25}, - {"x": 0, "y": 3.25, "w": 2.25}, - {"x": 2.25, "y": 3.25}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3.25}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.25}, - {"x": 8.25, "y": 3.25}, - {"x": 9.25, "y": 3.25}, - {"x": 10.25, "y": 3.25}, - {"x": 11.25, "y": 3.25}, - {"x": 12.25, "y": 3.25}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3.25, "w": 2.25}, - {"x": 16.75, "y": 3.5}, - {"x": 0, "y": 4.25, "w": 1.5}, - {"x": 3, "y": 4.25, "w": 1.5}, - {"x": 4.5, "y": 4.25, "w": 2}, - {"x": 6.5, "y": 4.25, "w": 1.25}, - {"x": 8.25, "y": 4.25, "w": 2.75}, - {"x": 11, "y": 4.25, "w": 1.5}, - {"x": 15.75, "y": 4.5}, - {"x": 16.75, "y": 4.5}, - {"x": 17.75, "y": 4.5} + {"matrix": [0, 0], "x": 0.75, "y": 0.25}, + {"matrix": [0, 1], "x": 1.75, "y": 0.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0.25}, + {"matrix": [0, 4], "x": 4.75, "y": 0.25}, + {"matrix": [0, 5], "x": 5.75, "y": 0.25}, + {"matrix": [0, 6], "x": 6.75, "y": 0.25}, + + {"matrix": [0, 7], "x": 8.75, "y": 0.25}, + {"matrix": [0, 8], "x": 9.75, "y": 0.25}, + {"matrix": [0, 9], "x": 10.75, "y": 0.25}, + {"matrix": [0, 10], "x": 11.75, "y": 0.25}, + {"matrix": [0, 11], "x": 12.75, "y": 0}, + {"matrix": [0, 12], "x": 13.75, "y": 0.25}, + {"matrix": [0, 13], "x": 14.75, "y": 0.25}, + {"matrix": [3, 14], "x": 15.75, "y": 0.25}, + + {"matrix": [0, 14], "x": 17.75, "y": 0.25}, + + {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4, "y": 1.25}, + {"matrix": [1, 4], "x": 5, "y": 1.25}, + {"matrix": [1, 5], "x": 6, "y": 1.25}, + + {"matrix": [1, 6], "x": 8.5, "y": 1.25}, + {"matrix": [1, 7], "x": 9.5, "y": 1.25}, + {"matrix": [1, 8], "x": 10.5, "y": 1.25}, + {"matrix": [1, 9], "x": 11.5, "y": 1.25}, + {"matrix": [1, 10], "x": 12.5, "y": 1.25}, + {"matrix": [1, 11], "x": 13.5, "y": 1.25}, + {"matrix": [1, 12], "x": 14.5, "y": 1.25}, + {"matrix": [1, 13], "x": 15.5, "y": 1.25, "w": 1.5}, + + {"matrix": [1, 14], "x": 17.75, "y": 1.25}, + + {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2.25}, + {"matrix": [2, 2], "x": 3, "y": 2.25}, + {"matrix": [2, 3], "x": 4, "y": 2.25}, + {"matrix": [2, 4], "x": 5, "y": 2.25}, + {"matrix": [2, 5], "x": 6, "y": 2.25}, + + {"matrix": [2, 6], "x": 9, "y": 2.25}, + {"matrix": [2, 7], "x": 10, "y": 2.25}, + {"matrix": [2, 8], "x": 11, "y": 2.25}, + {"matrix": [2, 9], "x": 12, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.25}, + {"matrix": [2, 11], "x": 14, "y": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2.25, "w": 2.25}, + + {"matrix": [2, 14], "x": 17.75, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + + {"matrix": [3, 6], "x": 8.25, "y": 3.25}, + {"matrix": [3, 7], "x": 9.25, "y": 3.25}, + {"matrix": [3, 8], "x": 10.25, "y": 3.25}, + {"matrix": [3, 9], "x": 11.25, "y": 3.25}, + {"matrix": [3, 10], "x": 12.25, "y": 3.25}, + {"matrix": [3, 11], "x": 13.25, "y": 3.25}, + {"matrix": [3, 12], "x": 14.25, "y": 3.25, "w": 2.25}, + + {"matrix": [3, 13], "x": 16.75, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4.25, "w": 1.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 1.25}, + + {"matrix": [4, 7], "x": 8.25, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 11, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.75, "y": 4.5}, + {"matrix": [4, 13], "x": 16.75, "y": 4.5}, + {"matrix": [4, 14], "x": 17.75, "y": 4.5} ] } } diff --git a/keyboards/kbdfans/maja_soldered/maja_soldered.c b/keyboards/kbdfans/maja_soldered/maja_soldered.c index 1f0f48c4cd72..c77402778061 100755 --- a/keyboards/kbdfans/maja_soldered/maja_soldered.c +++ b/keyboards/kbdfans/maja_soldered/maja_soldered.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "maja_soldered.h" +#include "quantum.h" void matrix_init_kb(void) { setPinOutput(D4); diff --git a/keyboards/kbdfans/maja_soldered/maja_soldered.h b/keyboards/kbdfans/maja_soldered/maja_soldered.h deleted file mode 100755 index 4834c2b74f52..000000000000 --- a/keyboards/kbdfans/maja_soldered/maja_soldered.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K3E, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K42, K43, K45, K47, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, XXX, K42, K43, XXX, K45, XXX, K47, XXX, K49, XXX, XXX, K4C, K4D, K4E } \ -} diff --git a/keyboards/kbdfans/odin/v2/info.json b/keyboards/kbdfans/odin/v2/info.json index 4fc091358b80..ec7ef06d10f9 100644 --- a/keyboards/kbdfans/odin/v2/info.json +++ b/keyboards/kbdfans/odin/v2/info.json @@ -26,106 +26,124 @@ "layouts": { "LAYOUT": { "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": "Scroll Lock", "x": 15.25, "y": 0 }, - { "x": 16.5, "y": 0 }, - { "x": 17.5, "y": 0 }, - { "x": 18.5, "y": 0 }, - { "x": 19.5, "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", "w": 2, "x": 13, "y": 1.5 }, - { "label": "Insert", "x": 15.25, "y": 1.5 }, - { "label": "Num Lock", "x": 16.5, "y": 1.5 }, - { "label": "/", "x": 17.5, "y": 1.5 }, - { "label": "*", "x": 18.5, "y": 1.5 }, - { "label": "-", "x": 19.5, "y": 1.5 }, - { "label": "Tab", "w": 1.5, "x": 0, "y": 2.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": "|", "w": 1.5, "x": 13.5, "y": 2.5 }, - { "label": "Delete", "x": 15.25, "y": 2.5 }, - { "label": "7", "x": 16.5, "y": 2.5 }, - { "label": "8", "x": 17.5, "y": 2.5 }, - { "label": "9", "x": 18.5, "y": 2.5 }, - { "h": 2, "label": "+", "x": 19.5, "y": 2.5 }, - { "label": "Caps Lock", "w": 1.75, "x": 0, "y": 3.5 }, - { "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": "Enter", "w": 2.25, "x": 12.75, "y": 3.5 }, - { "label": "4", "x": 16.5, "y": 3.5 }, - { "label": "5", "x": 17.5, "y": 3.5 }, - { "label": "6", "x": 18.5, "y": 3.5 }, - { "label": "Shift", "w": 2.25, "x": 0, "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": "Shift", "w": 2.75, "x": 12.25, "y": 4.5 }, - { "label": "\u2191", "x": 15.25, "y": 4.75 }, - { "label": "1", "x": 16.5, "y": 4.5 }, - { "label": "2", "x": 17.5, "y": 4.5 }, - { "label": "3", "x": 18.5, "y": 4.5 }, - { "h": 2, "label": "Enter", "x": 19.5, "y": 4.5 }, - { "label": "Ctrl", "w": 1.25, "x": 0, "y": 5.5 }, - { "label": "Win", "w": 1.25, "x": 1.25, "y": 5.5 }, - { "label": "Alt", "w": 1.25, "x": 2.5, "y": 5.5 }, - { "w": 7, "x": 3.75, "y": 5.5 }, - { "label": "Alt", "w": 1.5, "x": 10.75, "y": 5.5 }, - { "label": "Win", "w": 1.5, "x": 12.25, "y": 5.5 }, - { "label": "\u2190", "x": 14.25, "y": 5.75 }, - { "label": "\u2193", "x": 15.25, "y": 5.75 }, - { "label": "\u2192", "x": 16.25, "y": 5.75 }, - { "label": "0", "x": 17.5, "y": 5.5 }, - { "label": ".", "x": 18.5, "y": 5.5 } + {"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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + + {"matrix": [0, 16], "x": 16.5, "y": 0}, + {"matrix": [0, 17], "x": 17.5, "y": 0}, + {"matrix": [0, 18], "x": 18.5, "y": 0}, + {"matrix": [0, 19], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.5}, + + {"matrix": [1, 16], "x": 16.5, "y": 1.5}, + {"matrix": [1, 17], "x": 17.5, "y": 1.5}, + {"matrix": [1, 18], "x": 18.5, "y": 1.5}, + {"matrix": [1, 19], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 15], "x": 15.25, "y": 2.5}, + + {"matrix": [2, 16], "x": 16.5, "y": 2.5}, + {"matrix": [2, 17], "x": 17.5, "y": 2.5}, + {"matrix": [2, 18], "x": 18.5, "y": 2.5}, + {"matrix": [2, 19], "x": 19.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [3, 16], "x": 16.5, "y": 3.5}, + {"matrix": [3, 17], "x": 17.5, "y": 3.5}, + {"matrix": [3, 18], "x": 18.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 15.25, "y": 4.75}, + + {"matrix": [4, 16], "x": 16.5, "y": 4.5}, + {"matrix": [4, 17], "x": 17.5, "y": 4.5}, + {"matrix": [4, 18], "x": 18.5, "y": 4.5}, + + {"matrix": [4, 19], "x": 19.5, "y": 4.5, "h": 2}, + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 7}, + {"matrix": [5, 11], "x": 10.75, "y": 5.5, "w": 1.5}, + {"matrix": [5, 13], "x": 12.25, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 14], "x": 14.25, "y": 5.75}, + {"matrix": [5, 15], "x": 15.25, "y": 5.75}, + {"matrix": [5, 16], "x": 16.25, "y": 5.75}, + + {"matrix": [5, 17], "x": 17.5, "y": 5.5}, + {"matrix": [5, 18], "x": 18.5, "y": 5.5} ] } } diff --git a/keyboards/kbdfans/odin/v2/v2.h b/keyboards/kbdfans/odin/v2/v2.h deleted file mode 100644 index 9e183e449899..000000000000 --- a/keyboards/kbdfans/odin/v2/v2.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 lexbrugman - * - * 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( \ - k00, k02, k03, k04, k05, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, k1I, k1J, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2F, k2G, k2H, k2I, k2J, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3G, k3H, k3I, \ - k40, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4F, k4G, k4H, k4I, k4J, \ - k50, k51, k52, k56, k5B, k5D, k5E, k5F, k5G, k5H, k5I \ -) \ -{ \ - {k00, KC_NO, k02, k03, k04, k05, KC_NO, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, k0H, k0I, k0J }, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, KC_NO, k1F, k1G, k1H, k1I, k1J }, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO, k2F, k2G, k2H, k2I, k2J }, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, KC_NO, KC_NO, k3G, k3H, k3I, KC_NO}, \ - {k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, KC_NO, k4D, KC_NO, k4F, k4G, k4H, k4I, k4J }, \ - {k50, k51, k52, KC_NO, KC_NO, KC_NO, k56, KC_NO, KC_NO, KC_NO, KC_NO, k5B, KC_NO, k5D, k5E, k5F, k5G, k5H, k5I, KC_NO} \ -} diff --git a/keyboards/keebio/bfo9000/bfo9000.h b/keyboards/keebio/bfo9000/bfo9000.h deleted file mode 100644 index 985c7f67f137..000000000000 --- a/keyboards/keebio/bfo9000/bfo9000.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, L08, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L12, L13, L14, L15, L16, L17, L18, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28, \ - L30, L31, L32, L33, L34, L35, L36, L37, L38, R30, R31, R32, R33, R34, R35, R36, R37, R38, \ - L40, L41, L42, L43, L44, L45, L46, L47, L48, R40, R41, R42, R43, R44, R45, R46, R47, R48, \ - L50, L51, L52, L53, L54, L55, L56, L57, L58, R50, R51, R52, R53, R54, R55, R56, R57, R58 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07, L08 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, L18 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37, L38 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47, L48 }, \ - { L50, L51, L52, L53, L54, L55, L56, L57, L58 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47, R48 }, \ - { R50, R51, R52, R53, R54, R55, R56, R57, R58 } \ - } diff --git a/keyboards/keebio/bfo9000/info.json b/keyboards/keebio/bfo9000/info.json index d9dde626f293..9900dbe951d5 100644 --- a/keyboards/keebio/bfo9000/info.json +++ b/keyboards/keebio/bfo9000/info.json @@ -24,119 +24,119 @@ "layouts": { "LAYOUT": { "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":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":16, "y":0}, - {"x":17, "y":0}, - {"x":18, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [6, 0], "x": 10, "y": 0}, + {"matrix": [6, 1], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + {"matrix": [6, 7], "x": 17, "y": 0}, + {"matrix": [6, 8], "x": 18, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, - {"x":17, "y":1}, - {"x":18, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [7, 0], "x": 10, "y": 1}, + {"matrix": [7, 1], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1}, + {"matrix": [7, 3], "x": 13, "y": 1}, + {"matrix": [7, 4], "x": 14, "y": 1}, + {"matrix": [7, 5], "x": 15, "y": 1}, + {"matrix": [7, 6], "x": 16, "y": 1}, + {"matrix": [7, 7], "x": 17, "y": 1}, + {"matrix": [7, 8], "x": 18, "y": 1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, - {"x":17, "y":2}, - {"x":18, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [8, 0], "x": 10, "y": 2}, + {"matrix": [8, 1], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2}, + {"matrix": [8, 3], "x": 13, "y": 2}, + {"matrix": [8, 4], "x": 14, "y": 2}, + {"matrix": [8, 5], "x": 15, "y": 2}, + {"matrix": [8, 6], "x": 16, "y": 2}, + {"matrix": [8, 7], "x": 17, "y": 2}, + {"matrix": [8, 8], "x": 18, "y": 2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - {"x":15, "y":3}, - {"x":16, "y":3}, - {"x":17, "y":3}, - {"x":18, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [9, 0], "x": 10, "y": 3}, + {"matrix": [9, 1], "x": 11, "y": 3}, + {"matrix": [9, 2], "x": 12, "y": 3}, + {"matrix": [9, 3], "x": 13, "y": 3}, + {"matrix": [9, 4], "x": 14, "y": 3}, + {"matrix": [9, 5], "x": 15, "y": 3}, + {"matrix": [9, 6], "x": 16, "y": 3}, + {"matrix": [9, 7], "x": 17, "y": 3}, + {"matrix": [9, 8], "x": 18, "y": 3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4}, - {"x":16, "y":4}, - {"x":17, "y":4}, - {"x":18, "y":4}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, 8], "x": 8, "y": 4}, + {"matrix": [10, 0], "x": 10, "y": 4}, + {"matrix": [10, 1], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 12, "y": 4}, + {"matrix": [10, 3], "x": 13, "y": 4}, + {"matrix": [10, 4], "x": 14, "y": 4}, + {"matrix": [10, 5], "x": 15, "y": 4}, + {"matrix": [10, 6], "x": 16, "y": 4}, + {"matrix": [10, 7], "x": 17, "y": 4}, + {"matrix": [10, 8], "x": 18, "y": 4}, - {"x":0, "y":5}, - {"x":1, "y":5}, - {"x":2, "y":5}, - {"x":3, "y":5}, - {"x":4, "y":5}, - {"x":5, "y":5}, - {"x":6, "y":5}, - {"x":7, "y":5}, - {"x":8, "y":5}, - {"x":10, "y":5}, - {"x":11, "y":5}, - {"x":12, "y":5}, - {"x":13, "y":5}, - {"x":14, "y":5}, - {"x":15, "y":5}, - {"x":16, "y":5}, - {"x":17, "y":5}, - {"x":18, "y":5} + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [11, 0], "x": 10, "y": 5}, + {"matrix": [11, 1], "x": 11, "y": 5}, + {"matrix": [11, 2], "x": 12, "y": 5}, + {"matrix": [11, 3], "x": 13, "y": 5}, + {"matrix": [11, 4], "x": 14, "y": 5}, + {"matrix": [11, 5], "x": 15, "y": 5}, + {"matrix": [11, 6], "x": 16, "y": 5}, + {"matrix": [11, 7], "x": 17, "y": 5}, + {"matrix": [11, 8], "x": 18, "y": 5} ] } } diff --git a/keyboards/keebio/ergodicity/ergodicity.c b/keyboards/keebio/ergodicity/ergodicity.c index acba8a6ed359..76fb136c039d 100644 --- a/keyboards/keebio/ergodicity/ergodicity.c +++ b/keyboards/keebio/ergodicity/ergodicity.c @@ -1,4 +1,4 @@ -#include "ergodicity.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/ergodicity/ergodicity.h b/keyboards/keebio/ergodicity/ergodicity.h deleted file mode 100644 index a6a9cf4d7a60..000000000000 --- a/keyboards/keebio/ergodicity/ergodicity.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Keebio - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - kA1, kA2, kA3, kE3, kA4, kA5, kA6, kA7, kA8, kA9, kA10, kA11, kA12, kA13, kA15, \ - kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kB10, kB11, kB12, kB13, kB14, kB15, \ - kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kC10, kC11, kC12, kC13, kC15, \ - kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kD10, kD11, kD12, kD13, kD14, kD15, \ - kE2, kE4, kE6, kE7, kE9, kE11, kE15 \ -) \ -{ \ - { kA1, kA2, kA3, kA4, kA5, kA6, kA7, kA8, kA9, kA10, kA11, kA12, kA13, KC_NO, kA15 }, \ - { kB1, kB2, kB3, kB4, kB5, kB6, kB7, kB8, kB9, kB10, kB11, kB12, kB13, kB14, kB15 }, \ - { kC1, kC2, kC3, kC4, kC5, kC6, kC7, kC8, kC9, kC10, kC11, kC12, kC13, KC_NO, kC15 }, \ - { KC_NO, kD2, kD3, kD4, kD5, kD6, kD7, kD8, kD9, kD10, kD11, kD12, kD13, kD14, kD15 }, \ - { KC_NO, kE2, kE3, kE4, KC_NO, kE6, kE7, KC_NO, kE9, KC_NO, kE11, KC_NO, KC_NO, KC_NO, kE15 } \ -} diff --git a/keyboards/keebio/ergodicity/info.json b/keyboards/keebio/ergodicity/info.json index ca3b20c1e09c..c6a9f2d6a3cb 100644 --- a/keyboards/keebio/ergodicity/info.json +++ b/keyboards/keebio/ergodicity/info.json @@ -26,75 +26,83 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.5, "y":0}, - {"label":"`", "x":1.75, "y":0.25}, - {"label":"1", "x":2.75, "y":0.25}, - {"label":"2", "x":3.75, "y":0}, - {"label":"3", "x":4.75, "y":0.25}, - {"label":"4", "x":5.75, "y":0.25}, - {"label":"5", "x":6.75, "y":0.25}, - {"label":"6", "x":7.75, "y":0.25}, - {"label":"7", "x":11, "y":0.25}, - {"label":"8", "x":12, "y":0.25}, - {"label":"9", "x":13, "y":0.25}, - {"label":"0", "x":14, "y":0.25}, - {"label":"-", "x":15, "y":0}, - {"label":"=", "x":16, "y":0.25}, - {"label":"Backspace", "x":17, "y":0.25, "w":2}, + {"matrix": [0, 0], "x": 0.5, "y": 0}, - {"label":"PgUp", "x":0.25, "y":1}, - {"label":"Tab", "x":1.5, "y":1.25, "w":1.5}, - {"label":"Q", "x":3, "y":1.25}, - {"label":"W", "x":4.25, "y":1.25}, - {"label":"E", "x":5.25, "y":1.25}, - {"label":"R", "x":6.25, "y":1.25}, - {"label":"T", "x":7.25, "y":1.25}, - {"label":"Y", "x":10.5, "y":1.25}, - {"label":"U", "x":11.5, "y":1.25}, - {"label":"I", "x":12.5, "y":1.25}, - {"label":"O", "x":13.5, "y":1.25}, - {"label":"P", "x":14.75, "y":1.25}, - {"label":"[", "x":15.75, "y":1.25}, - {"label":"]", "x":16.75, "y":1.25}, - {"label":"Backslash", "x":17.75, "y":1.25, "w":1.5}, + {"matrix": [0, 1], "x": 1.75, "y": 0.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0.25}, + {"matrix": [4, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0.25}, + {"matrix": [0, 4], "x": 5.75, "y": 0.25}, + {"matrix": [0, 5], "x": 6.75, "y": 0.25}, + {"matrix": [0, 6], "x": 7.75, "y": 0.25}, - {"label":"PgDn", "x":0, "y":2}, - {"label":"Caps Lock", "x":1.25, "y":2.25, "w":2}, - {"label":"A", "x":3.25, "y":2.25}, - {"label":"S", "x":4.5, "y":2.25}, - {"label":"D", "x":5.5, "y":2.25}, - {"label":"F", "x":6.5, "y":2.25}, - {"label":"G", "x":7.5, "y":2.25}, - {"label":"H", "x":10.75, "y":2.25}, - {"label":"J", "x":11.75, "y":2.25}, - {"label":"K", "x":12.75, "y":2.25}, - {"label":"L", "x":13.75, "y":2.25}, - {"label":";", "x":15.25, "y":2.25}, - {"label":"'", "x":16.25, "y":2.25}, - {"label":"Enter", "x":17.25, "y":2.25, "w":2}, + {"matrix": [0, 7], "x": 11, "y": 0.25}, + {"matrix": [0, 8], "x": 12, "y": 0.25}, + {"matrix": [0, 9], "x": 13, "y": 0.25}, + {"matrix": [0, 10], "x": 14, "y": 0.25}, + {"matrix": [0, 11], "x": 15, "y": 0}, + {"matrix": [0, 12], "x": 16, "y": 0.25}, + {"matrix": [0, 14], "x": 17, "y": 0.25, "w": 2}, - {"label":"Shift", "x":1.25, "y":3.25, "w":2.5}, - {"label":"Z", "x":3.75, "y":3.25}, - {"label":"X", "x":5, "y":3.25}, - {"label":"C", "x":6, "y":3.25}, - {"label":"V", "x":7, "y":3.25}, - {"label":"B", "x":8, "y":3.25}, - {"label":"B", "x":10.25, "y":3.25}, - {"label":"N", "x":11.25, "y":3.25}, - {"label":"M", "x":12.25, "y":3.25}, - {"label":",", "x":13.25, "y":3.25}, - {"label":".", "x":14.75, "y":3.25}, - {"label":"/", "x":15.75, "y":3.25}, - {"label":"Shift", "x":16.75, "y":3.25, "w":1.5}, - {"label":"Fn", "x":18.25, "y":3.25}, + {"matrix": [1, 0], "x": 0.25, "y": 1}, - {"label":"Alt", "x":1.25, "y":4.25, "w":1.5}, - {"label":"Gui", "x":5, "y":4.25, "w":1.5}, - {"label":"Space", "x":6.5, "y":4.25, "w":2}, - {"label":"Menu", "x":8.5, "y":4.25}, - {"label":"Space", "x":10.25, "y":4.25, "w":2.5}, - {"label":"Alt", "x":12.75, "y":4.25, "w":1.5}, - {"label":"Fn", "x":17.75, "y":4.25, "w":1.5} + {"matrix": [1, 1], "x": 1.5, "y": 1.25, "w": 1.5}, + {"matrix": [1, 2], "x": 3, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1.25}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.25}, + {"matrix": [1, 6], "x": 7.25, "y": 1.25}, + + {"matrix": [1, 7], "x": 10.5, "y": 1.25}, + {"matrix": [1, 8], "x": 11.5, "y": 1.25}, + {"matrix": [1, 9], "x": 12.5, "y": 1.25}, + {"matrix": [1, 10], "x": 13.5, "y": 1.25}, + {"matrix": [1, 11], "x": 14.75, "y": 1.25}, + {"matrix": [1, 12], "x": 15.75, "y": 1.25}, + {"matrix": [1, 13], "x": 16.75, "y": 1.25}, + {"matrix": [1, 14], "x": 17.75, "y": 1.25, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 2}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.5, "y": 2.25}, + {"matrix": [2, 4], "x": 5.5, "y": 2.25}, + {"matrix": [2, 5], "x": 6.5, "y": 2.25}, + {"matrix": [2, 6], "x": 7.5, "y": 2.25}, + + {"matrix": [2, 7], "x": 10.75, "y": 2.25}, + {"matrix": [2, 8], "x": 11.75, "y": 2.25}, + {"matrix": [2, 9], "x": 12.75, "y": 2.25}, + {"matrix": [2, 10], "x": 13.75, "y": 2.25}, + {"matrix": [2, 11], "x": 15.25, "y": 2.25}, + {"matrix": [2, 12], "x": 16.25, "y": 2.25}, + {"matrix": [2, 14], "x": 17.25, "y": 2.25, "w": 2}, + + {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 2.5}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [3, 3], "x": 5, "y": 3.25}, + {"matrix": [3, 4], "x": 6, "y": 3.25}, + {"matrix": [3, 5], "x": 7, "y": 3.25}, + {"matrix": [3, 6], "x": 8, "y": 3.25}, + + {"matrix": [3, 7], "x": 10.25, "y": 3.25}, + {"matrix": [3, 8], "x": 11.25, "y": 3.25}, + {"matrix": [3, 9], "x": 12.25, "y": 3.25}, + {"matrix": [3, 10], "x": 13.25, "y": 3.25}, + {"matrix": [3, 11], "x": 14.75, "y": 3.25}, + {"matrix": [3, 12], "x": 15.75, "y": 3.25}, + {"matrix": [3, 13], "x": 16.75, "y": 3.25, "w": 1.5}, + {"matrix": [3, 14], "x": 18.25, "y": 3.25}, + + {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.5}, + {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 1.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4.25, "w": 2}, + {"matrix": [4, 6], "x": 8.5, "y": 4.25}, + + {"matrix": [4, 8], "x": 10.25, "y": 4.25, "w": 2.5}, + {"matrix": [4, 10], "x": 12.75, "y": 4.25, "w": 1.5}, + {"matrix": [4, 14], "x": 17.75, "y": 4.25, "w": 1.5} ] } } diff --git a/keyboards/keebio/foldkb/rev1/info.json b/keyboards/keebio/foldkb/rev1/info.json index dba0395842d7..92df98ffed8b 100644 --- a/keyboards/keebio/foldkb/rev1/info.json +++ b/keyboards/keebio/foldkb/rev1/info.json @@ -32,82 +32,91 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Mute", "x": 0, "y": 0 }, - { "label": "Esc", "x": 1.25, "y": 0 }, - { "label": "~", "x": 2.25, "y": 0 }, - { "label": "1", "x": 3.25, "y": 0 }, - { "label": "2", "x": 4.25, "y": 0 }, - { "label": "3", "x": 5.25, "y": 0 }, - { "label": "4", "x": 6.25, "y": 0 }, - { "label": "5", "x": 7.25, "y": 0 }, - { "label": "6", "x": 9, "y": 0 }, - { "label": "7", "x": 10, "y": 0 }, - { "label": "8", "x": 11, "y": 0 }, - { "label": "9", "x": 12, "y": 0 }, - { "label": "0", "x": 13, "y": 0 }, - { "label": "-", "x": 14, "y": 0 }, - { "label": "=", "x": 15, "y": 0 }, - { "label": "Bksp", "x": 16, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, - { "label": "Home", "x": 0, "y": 1 }, - { "label": "Tab", "x": 1.75, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 3.25, "y": 1 }, - { "label": "W", "x": 4.25, "y": 1 }, - { "label": "E", "x": 5.25, "y": 1 }, - { "label": "R", "x": 6.25, "y": 1 }, - { "label": "T", "x": 7.25, "y": 1 }, - { "label": "Y", "x": 9, "y": 1 }, - { "label": "U", "x": 10, "y": 1 }, - { "label": "I", "x": 11, "y": 1 }, - { "label": "O", "x": 12, "y": 1 }, - { "label": "P", "x": 13, "y": 1 }, - { "label": "[", "x": 14, "y": 1 }, - { "label": "]", "x": 15, "y": 1 }, - { "label": "\\", "x": 16, "y": 1, "w": 1.5 }, + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, - { "label": "End", "x": 0, "y": 2 }, - { "label": "Caps", "x": 1.5, "y": 2, "w": 1.75 }, - { "label": "A", "x": 3.25, "y": 2 }, - { "label": "S", "x": 4.25, "y": 2 }, - { "label": "D", "x": 5.25, "y": 2 }, - { "label": "F", "x": 6.25, "y": 2 }, - { "label": "G", "x": 7.25, "y": 2 }, - { "label": "H", "x": 9, "y": 2 }, - { "label": "J", "x": 10, "y": 2 }, - { "label": "K", "x": 11, "y": 2 }, - { "label": "L", "x": 12, "y": 2 }, - { "label": ";", "x": 13, "y": 2 }, - { "label": "'", "x": 14, "y": 2 }, - { "label": "Enter", "x": 15, "y": 2, "w": 2.25 }, + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + {"matrix": [5, 7], "x": 16, "y": 0}, - { "label": "PgUp", "x": 0, "y": 3 }, - { "label": "Shift", "x": 1, "y": 3, "w": 2.25 }, - { "label": "Z", "x": 3.25, "y": 3 }, - { "label": "X", "x": 4.25, "y": 3 }, - { "label": "C", "x": 5.25, "y": 3 }, - { "label": "V", "x": 6.25, "y": 3 }, - { "label": "B", "x": 7.25, "y": 3 }, - { "label": "N", "x": 9, "y": 3 }, - { "label": "M", "x": 10, "y": 3 }, - { "label": ",", "x": 11, "y": 3 }, - { "label": ".", "x": 12, "y": 3 }, - { "label": "/", "x": 13, "y": 3 }, - { "label": "Shift", "x": 14, "y": 3, "w": 1.75 }, - { "label": "Fn1", "x": 15.75, "y": 3 }, + {"matrix": [1, 0], "x": 0, "y": 1}, - { "label": "PgDn", "x": 0, "y": 4 }, - { "label": "Ctrl", "x": 1.5, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 2.75, "y": 4, "w": 1.25 }, - { "label": "Alt", "x": 4, "y": 4, "w": 1.25 }, - { "label": "Fn1", "x": 5.25, "y": 4 }, - { "label": "Space", "x": 6.25, "y": 4 }, - { "label": "Space", "x": 7.25, "y": 4 }, - { "label": "Space", "x": 9, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 10.25, "y": 4, "w": 1.5 }, - { "label": "Alt", "x": 11.75, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 13, "y": 4, "w": 1.25 }, - { "label": "Menu", "x": 14.25, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "x": 15.5, "y": 4, "w": 1.25 } + {"matrix": [1, 2], "x": 1.75, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + + {"matrix": [6, 0], "x": 9, "y": 1}, + {"matrix": [6, 1], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 4], "x": 13, "y": 1}, + {"matrix": [6, 5], "x": 14, "y": 1}, + {"matrix": [6, 6], "x": 15, "y": 1}, + {"matrix": [6, 7], "x": 16, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 2], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 7], "x": 15, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3}, + {"matrix": [8, 1], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 5], "x": 14, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 15.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + + {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + + {"matrix": [9, 0], "x": 9, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 15.5, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/keebio/foldkb/rev1/rev1.c b/keyboards/keebio/foldkb/rev1/rev1.c index efb9fd53fcb3..c2ba942a30c5 100644 --- a/keyboards/keebio/foldkb/rev1/rev1.c +++ b/keyboards/keebio/foldkb/rev1/rev1.c @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/foldkb/rev1/rev1.h b/keyboards/keebio/foldkb/rev1/rev1.h deleted file mode 100644 index 7349258f66af..000000000000 --- a/keyboards/keebio/foldkb/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Danny Nguyen - -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( \ - LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \ - LB1, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \ - LC1, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, \ - LD1, LD3, LD4, LD5, LD6, LD7, LD8, RD1, RD2, RD3, RD4, RD5, RD6, RD8, \ - LE1, LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE4, RE5, RE6, RE8 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8 }, \ - { LB1, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8 }, \ - { LC1, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8 }, \ - { LD1, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8 }, \ - { LE1, KC_NO, LE3, LE4, LE5, LE6, LE7, LE8 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6, KC_NO, RD8 }, \ - { RE1, RE2, KC_NO, RE4, RE5, RE6, KC_NO, RE8 }, \ - } diff --git a/keyboards/keebio/fourier/fourier.h b/keyboards/keebio/fourier/fourier.h deleted file mode 100644 index 1bc5e1653cc6..000000000000 --- a/keyboards/keebio/fourier/fourier.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA1, RA2, RA3, RA4, RA5, RA6, RA7, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB7, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC3, RC4, RC5, RC6, RC7, \ - LD1, LD2, LD3, LD4, LD5, RD1, RD4, RD5, RD6, RD7 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO}, \ - { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO}, \ - { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO}, \ - { LD1, LD2, LD3, LD4, LD5, KC_NO, KC_NO}, \ - { RA1, RA2, RA3, RA4, RA5, RA6, RA7}, \ - { RB1, RB2, RB3, RB4, RB5, KC_NO, RB7}, \ - { RC1, KC_NO, RC3, RC4, RC5, RC6, RC7}, \ - { RD1, KC_NO, KC_NO, RD4, RD5, RD6, RD7} \ - } diff --git a/keyboards/keebio/fourier/info.json b/keyboards/keebio/fourier/info.json index 48b04f122e79..22c24e13c859 100644 --- a/keyboards/keebio/fourier/info.json +++ b/keyboards/keebio/fourier/info.json @@ -30,60 +30,60 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, + {"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}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0}, - {"label":"Del", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, + {"matrix": [4, 6], "x": 13, "y": 0}, - {"label":"Esc", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, - {"label":"H", "x":7.25, "y":1}, - {"label":"J", "x":8.25, "y":1}, - {"label":"K", "x":9.25, "y":1}, - {"label":"L", "x":10.25, "y":1}, - {"label":";", "x":11.25, "y":1}, - {"label":"Enter", "x":12.25, "y":1, "w":1.75}, + {"matrix": [5, 0], "x": 7.25, "y": 1}, + {"matrix": [5, 1], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 3], "x": 10.25, "y": 1}, + {"matrix": [5, 4], "x": 11.25, "y": 1}, + {"matrix": [5, 6], "x": 12.25, "y": 1, "w": 1.75}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, - {"label":"N", "x":7.75, "y":2}, - {"label":"M", "x":8.75, "y":2}, - {"label":"<", "x":9.75, "y":2}, - {"label":">", "x":10.75, "y":2}, - {"label":"?", "x":11.75, "y":2}, - {"label":"Shift", "x":12.75, "y":2, "w":1.25}, + {"matrix": [6, 0], "x": 7.75, "y": 2}, + {"matrix": [6, 2], "x": 8.75, "y": 2}, + {"matrix": [6, 3], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [6, 5], "x": 11.75, "y": 2}, + {"matrix": [6, 6], "x": 12.75, "y": 2, "w": 1.25}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"Alt", "x":1, "y":3}, - {"label":"Gui", "x":2, "y":3}, - {"label":"Fn1", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3, "w":2.25}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3, "w": 2.25}, - {"label":"Backspace", "x":7.25, "y":3, "w":2.25}, - {"label":"Gui", "x":9.5, "y":3}, - {"label":"Alt", "x":10.5, "y":3, "w":1.25}, - {"label":"Fn2", "x":11.75, "y":3}, - {"label":"Ctrl", "x":12.75, "y":3, "w":1.25} + {"matrix": [7, 0], "x": 7.25, "y": 3, "w": 2.25}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 4], "x": 10.5, "y": 3, "w": 1.25}, + {"matrix": [7, 5], "x": 11.75, "y": 3}, + {"matrix": [7, 6], "x": 12.75, "y": 3, "w": 1.25} ] } } diff --git a/keyboards/keebio/iris/info.json b/keyboards/keebio/iris/info.json index 8641eed9c16b..669038aff1fe 100644 --- a/keyboards/keebio/iris/info.json +++ b/keyboards/keebio/iris/info.json @@ -4,21 +4,5 @@ "maintainer": "Keebio", "usb": { "vid": "0xCB10" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0.375}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, - {"x":9, "y":0.25}, {"x":10, "y":0.125}, {"x":11, "y":0}, {"x":12, "y":0.125}, {"x":13, "y":0.375}, {"x":14, "y":0.375}, - {"x":0, "y":1.375}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, - {"x":9, "y":1.25}, {"x":10, "y":1.125}, {"x":11, "y":1}, {"x":12, "y":1.125}, {"x":13, "y":1.375}, {"x":14, "y":1.375}, - {"x":0, "y":2.375}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, - {"x":9, "y":2.25}, {"x":10, "y":2.125}, {"x":11, "y":2}, {"x":12, "y":2.125}, {"x":13, "y":2.375}, {"x":14, "y":2.375}, - {"x":0, "y":3.375}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, - {"x":6.15, "y":3.75}, {"x":7.85, "y":3.75}, - {"x":9, "y":3.25}, {"x":10, "y":3.125}, {"x":11, "y":3}, {"x":12, "y":3.125}, {"x":13, "y":3.375}, {"x":14, "y":3.375}, - {"x":3.5, "y":4.25}, {"x":4.5, "y":4.375}, {"x":5.6, "y":4.75}, {"x":8.4, "y":4.75}, {"x":9.5, "y":4.375}, {"x":10.5, "y":4.25} - ] - } } } diff --git a/keyboards/keebio/iris/rev1/info.json b/keyboards/keebio/iris/rev1/info.json index 0fa11194c1bc..af3c7acd426f 100644 --- a/keyboards/keebio/iris/rev1/info.json +++ b/keyboards/keebio/iris/rev1/info.json @@ -20,5 +20,76 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 2], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 2], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 3], "x": 3.5, "y": 4.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4.375}, + {"matrix": [4, 5], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 5], "x": 8.4, "y": 4.75}, + {"matrix": [9, 4], "x": 9.5, "y": 4.375}, + {"matrix": [9, 3], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev1/rev1.c b/keyboards/keebio/iris/rev1/rev1.c index 369af1bae777..e05b758a4492 100644 --- a/keyboards/keebio/iris/rev1/rev1.c +++ b/keyboards/keebio/iris/rev1/rev1.c @@ -1,4 +1,4 @@ -#include "rev1.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/iris/rev1/rev1.h b/keyboards/keebio/iris/rev1/rev1.h deleted file mode 100644 index d94716242c4f..000000000000 --- a/keyboards/keebio/iris/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT4, RT4, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, LT4, LT1, LT2, LT3 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ - } diff --git a/keyboards/keebio/iris/rev1_led/info.json b/keyboards/keebio/iris/rev1_led/info.json index 1d51067d520c..bc19a0cc8be6 100644 --- a/keyboards/keebio/iris/rev1_led/info.json +++ b/keyboards/keebio/iris/rev1_led/info.json @@ -20,5 +20,76 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 2], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 2], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 3], "x": 3.5, "y": 4.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4.375}, + {"matrix": [4, 5], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 5], "x": 8.4, "y": 4.75}, + {"matrix": [9, 4], "x": 9.5, "y": 4.375}, + {"matrix": [9, 3], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.c b/keyboards/keebio/iris/rev1_led/rev1_led.c index 0ba10f1db96c..e05b758a4492 100644 --- a/keyboards/keebio/iris/rev1_led/rev1_led.c +++ b/keyboards/keebio/iris/rev1_led/rev1_led.c @@ -1,4 +1,4 @@ -#include "rev1_led.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/iris/rev1_led/rev1_led.h b/keyboards/keebio/iris/rev1_led/rev1_led.h deleted file mode 100644 index d94716242c4f..000000000000 --- a/keyboards/keebio/iris/rev1_led/rev1_led.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT4, RT4, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, LT4, LT1, LT2, LT3 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ - } diff --git a/keyboards/keebio/iris/rev2/info.json b/keyboards/keebio/iris/rev2/info.json index 447c1cfddf94..80e65aa8e2e3 100644 --- a/keyboards/keebio/iris/rev2/info.json +++ b/keyboards/keebio/iris/rev2/info.json @@ -20,5 +20,76 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 2], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 2], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 3], "x": 3.5, "y": 4.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4.375}, + {"matrix": [4, 5], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 5], "x": 8.4, "y": 4.75}, + {"matrix": [9, 4], "x": 9.5, "y": 4.375}, + {"matrix": [9, 3], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev2/rev2.c b/keyboards/keebio/iris/rev2/rev2.c index 365d2c97b56b..87d4b4029d0d 100644 --- a/keyboards/keebio/iris/rev2/rev2.c +++ b/keyboards/keebio/iris/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "rev2.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/iris/rev2/rev2.h b/keyboards/keebio/iris/rev2/rev2.h deleted file mode 100644 index d94716242c4f..000000000000 --- a/keyboards/keebio/iris/rev2/rev2.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT4, RT4, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, LT4, LT1, LT2, LT3 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, RT4, RT1, RT2, RT3 } \ - } diff --git a/keyboards/keebio/iris/rev3/info.json b/keyboards/keebio/iris/rev3/info.json index ecee0bc87e97..adc4b713548f 100644 --- a/keyboards/keebio/iris/rev3/info.json +++ b/keyboards/keebio/iris/rev3/info.json @@ -31,5 +31,76 @@ "soft_serial_pin": "D0" }, "processor": "atmega32u4", - "bootloader": "qmk-dfu" + "bootloader": "qmk-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 2], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 2], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 3], "x": 3.5, "y": 4.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4.375}, + {"matrix": [4, 5], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 5], "x": 8.4, "y": 4.75}, + {"matrix": [9, 4], "x": 9.5, "y": 4.375}, + {"matrix": [9, 3], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev3/rev3.c b/keyboards/keebio/iris/rev3/rev3.c index 60add02883ce..8b12388cac8c 100644 --- a/keyboards/keebio/iris/rev3/rev3.c +++ b/keyboards/keebio/iris/rev3/rev3.c @@ -1,4 +1,4 @@ -#include "rev3.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/keebio/iris/rev3/rev3.h b/keyboards/keebio/iris/rev3/rev3.h deleted file mode 100644 index c808c4bef349..000000000000 --- a/keyboards/keebio/iris/rev3/rev3.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L42, R43, R30, R31, R32, R33, R34, R35, \ - L43, L44, L45, R40, R41, R42 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, R43, R42, R41, R40 } \ - } diff --git a/keyboards/keebio/iris/rev4/info.json b/keyboards/keebio/iris/rev4/info.json index db7dd32ae51f..6ddb257d21be 100644 --- a/keyboards/keebio/iris/rev4/info.json +++ b/keyboards/keebio/iris/rev4/info.json @@ -44,5 +44,76 @@ } }, "processor": "atmega32u4", - "bootloader": "qmk-dfu" + "bootloader": "qmk-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 5], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 4], "x": 8.4, "y": 4.75}, + {"matrix": [9, 3], "x": 9.5, "y": 4.375}, + {"matrix": [9, 2], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev4/rev4.c b/keyboards/keebio/iris/rev4/rev4.c index db7bdd615b9c..04a2241966f5 100644 --- a/keyboards/keebio/iris/rev4/rev4.c +++ b/keyboards/keebio/iris/rev4/rev4.c @@ -1,4 +1,4 @@ -#include "rev4.h" +#include "quantum.h" void eeconfig_init_kb(void) { #ifdef BACKLIGHT_ENABLE diff --git a/keyboards/keebio/iris/rev4/rev4.h b/keyboards/keebio/iris/rev4/rev4.h deleted file mode 100644 index 0e99bd501ac6..000000000000 --- a/keyboards/keebio/iris/rev4/rev4.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE3, LE4, LE5, RE5, RE4, RE3 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6 }, \ - { LC1, LC2, LC3, LC4, LC5, LC6 }, \ - { LD1, LD2, LD3, LD4, LD5, LD6 }, \ - { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6 }, \ - { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ - } diff --git a/keyboards/keebio/iris/rev5/info.json b/keyboards/keebio/iris/rev5/info.json index 92bea8d83fe9..268d0993750d 100644 --- a/keyboards/keebio/iris/rev5/info.json +++ b/keyboards/keebio/iris/rev5/info.json @@ -44,5 +44,76 @@ } }, "processor": "atmega32u4", - "bootloader": "qmk-dfu" + "bootloader": "qmk-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 5], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 4], "x": 8.4, "y": 4.75}, + {"matrix": [9, 3], "x": 9.5, "y": 4.375}, + {"matrix": [9, 2], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev5/rev5.c b/keyboards/keebio/iris/rev5/rev5.c index b597c05de8c1..1547a0a6e87a 100644 --- a/keyboards/keebio/iris/rev5/rev5.c +++ b/keyboards/keebio/iris/rev5/rev5.c @@ -11,7 +11,7 @@ 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 . */ -#include "rev5.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/keebio/iris/rev5/rev5.h b/keyboards/keebio/iris/rev5/rev5.h deleted file mode 100644 index cbc032ad31d3..000000000000 --- a/keyboards/keebio/iris/rev5/rev5.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Danny Nguyen - -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( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE3, LE4, LE5, RE5, RE4, RE3 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6 }, \ - { LC1, LC2, LC3, LC4, LC5, LC6 }, \ - { LD1, LD2, LD3, LD4, LD5, LD6 }, \ - { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6 }, \ - { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ - } diff --git a/keyboards/keebio/iris/rev6/info.json b/keyboards/keebio/iris/rev6/info.json index 54e3736ffc03..cdf68492bf5d 100644 --- a/keyboards/keebio/iris/rev6/info.json +++ b/keyboards/keebio/iris/rev6/info.json @@ -30,5 +30,76 @@ } }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 5], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 4], "x": 8.4, "y": 4.75}, + {"matrix": [9, 3], "x": 9.5, "y": 4.375}, + {"matrix": [9, 2], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev6/rev6.c b/keyboards/keebio/iris/rev6/rev6.c index 0900ae589564..3d9e18fd0140 100644 --- a/keyboards/keebio/iris/rev6/rev6.c +++ b/keyboards/keebio/iris/rev6/rev6.c @@ -11,7 +11,7 @@ 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 . */ -#include "rev6.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/iris/rev6/rev6.h b/keyboards/keebio/iris/rev6/rev6.h deleted file mode 100644 index cbc032ad31d3..000000000000 --- a/keyboards/keebio/iris/rev6/rev6.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Danny Nguyen - -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( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE3, LE4, LE5, RE5, RE4, RE3 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6 }, \ - { LC1, LC2, LC3, LC4, LC5, LC6 }, \ - { LD1, LD2, LD3, LD4, LD5, LD6 }, \ - { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6 }, \ - { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ - } diff --git a/keyboards/keebio/iris/rev6a/info.json b/keyboards/keebio/iris/rev6a/info.json index c44b7c4a0afd..340581354de4 100644 --- a/keyboards/keebio/iris/rev6a/info.json +++ b/keyboards/keebio/iris/rev6a/info.json @@ -30,5 +30,76 @@ } }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 5], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 4], "x": 8.4, "y": 4.75}, + {"matrix": [9, 3], "x": 9.5, "y": 4.375}, + {"matrix": [9, 2], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev6a/rev6a.c b/keyboards/keebio/iris/rev6a/rev6a.c index a78c6a7c08a5..5d065f4bcbef 100644 --- a/keyboards/keebio/iris/rev6a/rev6a.c +++ b/keyboards/keebio/iris/rev6a/rev6a.c @@ -11,7 +11,7 @@ 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 . */ -#include "rev6a.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/iris/rev6a/rev6a.h b/keyboards/keebio/iris/rev6a/rev6a.h deleted file mode 100644 index cbc032ad31d3..000000000000 --- a/keyboards/keebio/iris/rev6a/rev6a.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Danny Nguyen - -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( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE3, LE4, LE5, RE5, RE4, RE3 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6 }, \ - { LC1, LC2, LC3, LC4, LC5, LC6 }, \ - { LD1, LD2, LD3, LD4, LD5, LD6 }, \ - { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6 }, \ - { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ - } diff --git a/keyboards/keebio/iris/rev6b/info.json b/keyboards/keebio/iris/rev6b/info.json index f59bc0946239..8ae05d9a1102 100644 --- a/keyboards/keebio/iris/rev6b/info.json +++ b/keyboards/keebio/iris/rev6b/info.json @@ -30,5 +30,76 @@ } }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 5], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 4], "x": 8.4, "y": 4.75}, + {"matrix": [9, 3], "x": 9.5, "y": 4.375}, + {"matrix": [9, 2], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev6b/rev6b.c b/keyboards/keebio/iris/rev6b/rev6b.c index 883154c5c3d2..e8ba59051e58 100644 --- a/keyboards/keebio/iris/rev6b/rev6b.c +++ b/keyboards/keebio/iris/rev6b/rev6b.c @@ -11,7 +11,7 @@ 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 . */ -#include "rev6b.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/iris/rev6b/rev6b.h b/keyboards/keebio/iris/rev6b/rev6b.h deleted file mode 100644 index cbc032ad31d3..000000000000 --- a/keyboards/keebio/iris/rev6b/rev6b.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Danny Nguyen - -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( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE3, LE4, LE5, RE5, RE4, RE3 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6 }, \ - { LC1, LC2, LC3, LC4, LC5, LC6 }, \ - { LD1, LD2, LD3, LD4, LD5, LD6 }, \ - { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6 }, \ - { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ - } diff --git a/keyboards/keebio/iris/rev7/info.json b/keyboards/keebio/iris/rev7/info.json index 530a91f09a81..34ab080488bd 100644 --- a/keyboards/keebio/iris/rev7/info.json +++ b/keyboards/keebio/iris/rev7/info.json @@ -31,5 +31,76 @@ } }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 9, "y": 0.25}, + {"matrix": [5, 4], "x": 10, "y": 0.125}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.125}, + {"matrix": [5, 1], "x": 13, "y": 0.375}, + {"matrix": [5, 0], "x": 14, "y": 0.375}, + + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 9, "y": 1.25}, + {"matrix": [6, 4], "x": 10, "y": 1.125}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.125}, + {"matrix": [6, 1], "x": 13, "y": 1.375}, + {"matrix": [6, 0], "x": 14, "y": 1.375}, + + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 9, "y": 2.25}, + {"matrix": [7, 4], "x": 10, "y": 2.125}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.125}, + {"matrix": [7, 1], "x": 13, "y": 2.375}, + {"matrix": [7, 0], "x": 14, "y": 2.375}, + + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6.15, "y": 3.75}, + + {"matrix": [9, 5], "x": 7.85, "y": 3.75}, + {"matrix": [8, 5], "x": 9, "y": 3.25}, + {"matrix": [8, 4], "x": 10, "y": 3.125}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.125}, + {"matrix": [8, 1], "x": 13, "y": 3.375}, + {"matrix": [8, 0], "x": 14, "y": 3.375}, + + {"matrix": [4, 2], "x": 3.5, "y": 4.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4.375}, + {"matrix": [4, 4], "x": 5.6, "y": 4.75}, + + {"matrix": [9, 4], "x": 8.4, "y": 4.75}, + {"matrix": [9, 3], "x": 9.5, "y": 4.375}, + {"matrix": [9, 2], "x": 10.5, "y": 4.25} + ] + } + } } diff --git a/keyboards/keebio/iris/rev7/rev7.c b/keyboards/keebio/iris/rev7/rev7.c index 25f3760025dd..deab7acc8a9b 100644 --- a/keyboards/keebio/iris/rev7/rev7.c +++ b/keyboards/keebio/iris/rev7/rev7.c @@ -11,7 +11,7 @@ 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 . */ -#include "rev7.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/keebio/iris/rev7/rev7.h b/keyboards/keebio/iris/rev7/rev7.h deleted file mode 100644 index cbc032ad31d3..000000000000 --- a/keyboards/keebio/iris/rev7/rev7.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Danny Nguyen - -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( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE6, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE3, LE4, LE5, RE5, RE4, RE3 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6 }, \ - { LB1, LB2, LB3, LB4, LB5, LB6 }, \ - { LC1, LC2, LC3, LC4, LC5, LC6 }, \ - { LD1, LD2, LD3, LD4, LD5, LD6 }, \ - { KC_NO, KC_NO, LE3, LE4, LE5, LE6 }, \ - { RA1, RA2, RA3, RA4, RA5, RA6 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6 }, \ - { RC1, RC2, RC3, RC4, RC5, RC6 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6 }, \ - { KC_NO, KC_NO, RE3, RE4, RE5, RE6 } \ - } diff --git a/keyboards/keebio/laplace/info.json b/keyboards/keebio/laplace/info.json index 7af53b448909..325fd16b40a9 100644 --- a/keyboards/keebio/laplace/info.json +++ b/keyboards/keebio/laplace/info.json @@ -21,57 +21,58 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Del", "x":11, "y":0}, - {"label":"Backspace", "x":12, "y":0}, + {"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": [1, 6], "x": 7, "y": 0}, + {"matrix": [1, 5], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [1, 3], "x": 10, "y": 0}, + {"matrix": [1, 2], "x": 11, "y": 0}, + {"matrix": [1, 1], "x": 12, "y": 0}, - {"label":"Esc", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":";", "x":10.25, "y":1}, - {"label":"Enter", "x":11.25, "y":1, "w":1.75}, + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 1}, + {"matrix": [2, 2], "x": 2.25, "y": 1}, + {"matrix": [2, 3], "x": 3.25, "y": 1}, + {"matrix": [2, 4], "x": 4.25, "y": 1}, + {"matrix": [2, 5], "x": 5.25, "y": 1}, + {"matrix": [2, 6], "x": 6.25, "y": 1}, + {"matrix": [3, 6], "x": 7.25, "y": 1}, + {"matrix": [3, 5], "x": 8.25, "y": 1}, + {"matrix": [3, 4], "x": 9.25, "y": 1}, + {"matrix": [3, 3], "x": 10.25, "y": 1}, + {"matrix": [3, 1], "x": 11.25, "y": 1, "w": 1.75}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":"<", "x":8.75, "y":2}, - {"label":">", "x":9.75, "y":2}, - {"label":"?", "x":10.75, "y":2}, - {"label":"Shift", "x":11.75, "y":2, "w":1.25}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 2}, + {"matrix": [4, 2], "x": 2.75, "y": 2}, + {"matrix": [4, 3], "x": 3.75, "y": 2}, + {"matrix": [4, 4], "x": 4.75, "y": 2}, + {"matrix": [4, 5], "x": 5.75, "y": 2}, + {"matrix": [4, 6], "x": 6.75, "y": 2}, + {"matrix": [5, 5], "x": 7.75, "y": 2}, + {"matrix": [5, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 3], "x": 9.75, "y": 2}, + {"matrix": [5, 2], "x": 10.75, "y": 2}, + {"matrix": [5, 1], "x": 11.75, "y": 2, "w": 1.25}, - {"label":"Ctrl", "x":0, "y":3}, - {"label":"Alt", "x":1, "y":3}, - {"label":"Gui", "x":2, "y":3}, - {"label":"Fn1", "x":3, "y":3}, - {"label":"Space", "x":4, "y":3, "w":2.25}, - {"label":"Backspace", "x":6.25, "y":3, "w":2.25}, - {"label":"Gui", "x":8.5, "y":3}, - {"label":"Alt", "x":9.5, "y":3, "w":1.25}, - {"label":"Fn2", "x":10.75, "y":3}, - {"label":"Ctrl", "x":11.75, "y":3, "w":1.25} + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [6, 1], "x": 1, "y": 3}, + {"matrix": [6, 2], "x": 2, "y": 3}, + {"matrix": [6, 3], "x": 3, "y": 3}, + {"matrix": [6, 4], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 6], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [7, 4], "x": 8.5, "y": 3}, + {"matrix": [7, 3], "x": 9.5, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 10.75, "y": 3}, + {"matrix": [7, 1], "x": 11.75, "y": 3, "w": 1.25} ] } } + } diff --git a/keyboards/keebio/laplace/laplace.h b/keyboards/keebio/laplace/laplace.h deleted file mode 100644 index 0be1e95b9dfe..000000000000 --- a/keyboards/keebio/laplace/laplace.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, A11, A12, A13, \ - B1, B2, B3, B4, B5, B6, B7, B8, B9, B10, B11, B13, \ - C1, C2, C3, C4, C5, C6, C7, C9, C10, C11, C12, C13, \ - D1, D2, D3, D4, D5, D7, D10, D11, D12, D13 \ - ) { \ - {A1, A2, A3, A4, A5, A6, A7}, \ - {KC_NO, A13, A12, A11, A10, A9, A8}, \ - {B1, B2, B3, B4, B5, B6, B7}, \ - {KC_NO, B13, KC_NO, B11, B10, B9, B8}, \ - {C1, C2, C3, C4, C5, C6, C7}, \ - {KC_NO, C13, C12, C11, C10, C9, KC_NO}, \ - {D1, D2, D3, D4, D5, KC_NO, D7}, \ - {KC_NO, D13, D12, D11, D10, KC_NO, KC_NO} \ - } diff --git a/keyboards/keebio/rorschach/rev1/info.json b/keyboards/keebio/rorschach/rev1/info.json index 6b2c9244c0b3..a0b1188a7c9c 100644 --- a/keyboards/keebio/rorschach/rev1/info.json +++ b/keyboards/keebio/rorschach/rev1/info.json @@ -28,68 +28,67 @@ "layouts": { "LAYOUT": { "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 }, + {"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}, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "x": 13, "y": 0 }, - { "x": 14, "y": 0 }, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 13, "y": 1 }, - { "x": 14, "y": 1 }, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - { "x": 13, "y": 2 }, - { "x": 14, "y": 2 }, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 13, "y": 3 }, - { "x": 14, "y": 3 }, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, - { "x": 5.5, "y": 4 }, - { "x": 6, "y": 5 }, - - { "x": 8, "y": 5 }, - { "x": 8.5, "y": 4 } + {"matrix": [4, 4], "x": 5.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 5}, + {"matrix": [9, 5], "x": 8, "y": 5}, + {"matrix": [9, 4], "x": 8.5, "y": 4} ] } } diff --git a/keyboards/keebio/rorschach/rev1/rev1.h b/keyboards/keebio/rorschach/rev1/rev1.h deleted file mode 100644 index 32c421c7d0c4..000000000000 --- a/keyboards/keebio/rorschach/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, LT1, LT2 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, RT1, RT2 } \ - } diff --git a/keyboards/keyboardio/atreus/atreus.h b/keyboards/keyboardio/atreus/atreus.h deleted file mode 100644 index b03276ff60b6..000000000000 --- a/keyboards/keyboardio/atreus/atreus.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (C) 2019, 2020 Keyboard.io, Inc - * - * 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 XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, XXX, XXX, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, XXX, XXX, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \ -} diff --git a/keyboards/keyboardio/atreus/info.json b/keyboards/keyboardio/atreus/info.json index c228a491e37d..b251151be489 100644 --- a/keyboards/keyboardio/atreus/info.json +++ b/keyboards/keyboardio/atreus/info.json @@ -18,50 +18,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":0.6}, - {"label":"W", "x":1, "y":0.35}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0.35}, - {"label":"T", "x":4, "y":0.7}, - {"label":"Y", "x":8, "y":0.7}, - {"label":"U", "x":9, "y":0.35}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0.35}, - {"label":"P", "x":12, "y":0.6}, - {"label":"A", "x":0, "y":1.6}, - {"label":"S", "x":1, "y":1.35}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1.35}, - {"label":"G", "x":4, "y":1.7}, - {"label":"H", "x":8, "y":1.7}, - {"label":"J", "x":9, "y":1.35}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1.35}, - {"label":";", "x":12, "y":1.6}, - {"label":"Z", "x":0, "y":2.6}, - {"label":"X", "x":1, "y":2.35}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2.35}, - {"label":"B", "x":4, "y":2.7}, - {"label":"`", "x":5, "y":2.54}, - {"label":"\\", "x":7, "y":2.54}, - {"label":"N", "x":8, "y":2.7}, - {"label":"M", "x":9, "y":2.35}, - {"label":",", "x":10, "y":2}, - {"label":".", "x":11, "y":2.35}, - {"label":"/", "x":12, "y":2.6}, - {"label":"Esc", "x":0, "y":3.6}, - {"label":"Tab", "x":1, "y":3.35}, - {"label":"Super", "x":2, "y":3}, - {"label":"Shift", "x":3, "y":3.35}, - {"label":"Bksp", "x":4, "y":3.7}, - {"label":"Ctrl", "x":5, "y":3.54}, - {"label":"Alt", "x":7, "y":3.54}, - {"label":"Space", "x":8, "y":3.7}, - {"label":"Fun", "x":9, "y":3.35}, - {"label":"-", "x":10, "y":3}, - {"label":"'", "x":11, "y":3.35}, - {"label":"Enter", "x":12,"y":3.6} + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.35}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.35}, + {"matrix": [0, 4], "x": 4, "y": 0.7}, + + {"matrix": [0, 7], "x": 8, "y": 0.7}, + {"matrix": [0, 8], "x": 9, "y": 0.35}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0.35}, + {"matrix": [0, 11], "x": 12, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.35}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.35}, + {"matrix": [1, 4], "x": 4, "y": 1.7}, + + {"matrix": [1, 7], "x": 8, "y": 1.7}, + {"matrix": [1, 8], "x": 9, "y": 1.35}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1.35}, + {"matrix": [1, 11], "x": 12, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.35}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.35}, + {"matrix": [2, 4], "x": 4, "y": 2.7}, + {"matrix": [2, 5], "x": 5, "y": 2.54}, + + {"matrix": [2, 6], "x": 7, "y": 2.54}, + {"matrix": [2, 7], "x": 8, "y": 2.7}, + {"matrix": [2, 8], "x": 9, "y": 2.35}, + {"matrix": [2, 9], "x": 10, "y": 2}, + {"matrix": [2, 10], "x": 11, "y": 2.35}, + {"matrix": [2, 11], "x": 12, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.35}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.35}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [3, 5], "x": 5, "y": 3.54}, + + {"matrix": [3, 6], "x": 7, "y": 3.54}, + {"matrix": [3, 7], "x": 8, "y": 3.7}, + {"matrix": [3, 8], "x": 9, "y": 3.35}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3.35}, + {"matrix": [3, 11], "x": 12, "y": 3.6} ] } } diff --git a/keyboards/keycapsss/kimiko/rev1/info.json b/keyboards/keycapsss/kimiko/rev1/info.json index 160c7517e06e..56028f3f81ae 100644 --- a/keyboards/keycapsss/kimiko/rev1/info.json +++ b/keyboards/keycapsss/kimiko/rev1/info.json @@ -29,70 +29,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.8}, - {"x":1, "y":0.8}, - {"x":2, "y":0.15}, - {"x":3, "y":0}, - {"x":4, "y":0.15}, - {"x":5, "y":0.3}, - {"x":9, "y":0.3}, - {"x":10, "y":0.15}, - {"x":11, "y":0}, - {"x":12, "y":0.15}, - {"x":13, "y":0.8}, - {"x":14, "y":0.8}, + {"matrix": [0, 0], "x": 0, "y": 0.8}, + {"matrix": [0, 1], "x": 1, "y": 0.8}, + {"matrix": [0, 2], "x": 2, "y": 0.15}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.15}, + {"matrix": [0, 5], "x": 5, "y": 0.3}, - {"x":0, "y":1.8}, - {"x":1, "y":1.8}, - {"x":2, "y":1.15}, - {"x":3, "y":1}, - {"x":4, "y":1.15}, - {"x":5, "y":1.3}, - {"x":9, "y":1.3}, - {"x":10, "y":1.15}, - {"x":11, "y":1}, - {"x":12, "y":1.15}, - {"x":13, "y":1.8}, - {"x":14, "y":1.8}, + {"matrix": [5, 5], "x": 9, "y": 0.3}, + {"matrix": [5, 4], "x": 10, "y": 0.15}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0.15}, + {"matrix": [5, 1], "x": 13, "y": 0.8}, + {"matrix": [5, 0], "x": 14, "y": 0.8}, - {"x":0, "y":2.8}, - {"x":1, "y":2.8}, - {"x":2, "y":2.15}, - {"x":3, "y":2}, - {"x":4, "y":2.15}, - {"x":5, "y":2.3}, - {"x":9, "y":2.3}, - {"x":10, "y":2.15}, - {"x":11, "y":2}, - {"x":12, "y":2.15}, - {"x":13, "y":2.8}, - {"x":14, "y":2.8}, + {"matrix": [1, 0], "x": 0, "y": 1.8}, + {"matrix": [1, 1], "x": 1, "y": 1.8}, + {"matrix": [1, 2], "x": 2, "y": 1.15}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.15}, + {"matrix": [1, 5], "x": 5, "y": 1.3}, - {"x":0, "y":3.8}, - {"x":1, "y":3.8}, - {"x":2, "y":3.15}, - {"x":3, "y":3}, - {"x":4, "y":3.15}, - {"x":5, "y":3.3}, - {"x":6.25, "y":3.3}, - {"x":7.75, "y":3.3}, - {"x":9, "y":3.3}, - {"x":10, "y":3.15}, - {"x":11, "y":3}, - {"x":12, "y":3.15}, - {"x":13, "y":3.8}, - {"x":14, "y":3.8}, + {"matrix": [6, 5], "x": 9, "y": 1.3}, + {"matrix": [6, 4], "x": 10, "y": 1.15}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1.15}, + {"matrix": [6, 1], "x": 13, "y": 1.8}, + {"matrix": [6, 0], "x": 14, "y": 1.8}, - {"x":2, "y":4.15}, - {"x":3, "y":4}, - {"x":4, "y":4.15}, - {"x":5.25, "y":4.3}, - {"x":6.25, "y":4.25, "h":1.5}, - {"x":7.75, "y":4.25, "h":1.5}, - {"x":8.75, "y":4.3}, - {"x":10, "y":4.15}, - {"x":11, "y":4}, - {"x":12, "y":4.15} + {"matrix": [2, 0], "x": 0, "y": 2.8}, + {"matrix": [2, 1], "x": 1, "y": 2.8}, + {"matrix": [2, 2], "x": 2, "y": 2.15}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.15}, + {"matrix": [2, 5], "x": 5, "y": 2.3}, + + {"matrix": [7, 5], "x": 9, "y": 2.3}, + {"matrix": [7, 4], "x": 10, "y": 2.15}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2.15}, + {"matrix": [7, 1], "x": 13, "y": 2.8}, + {"matrix": [7, 0], "x": 14, "y": 2.8}, + + {"matrix": [3, 0], "x": 0, "y": 3.8}, + {"matrix": [3, 1], "x": 1, "y": 3.8}, + {"matrix": [3, 2], "x": 2, "y": 3.15}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.15}, + {"matrix": [3, 5], "x": 5, "y": 3.3}, + {"matrix": [4, 5], "x": 6.25, "y": 3.3}, + + {"matrix": [9, 5], "x": 7.75, "y": 3.3}, + {"matrix": [8, 5], "x": 9, "y": 3.3}, + {"matrix": [8, 4], "x": 10, "y": 3.15}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3.15}, + {"matrix": [8, 1], "x": 13, "y": 3.8}, + {"matrix": [8, 0], "x": 14, "y": 3.8}, + + {"matrix": [4, 0], "x": 2, "y": 4.15}, + {"matrix": [4, 1], "x": 3, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4.15}, + {"matrix": [4, 3], "x": 5.25, "y": 4.3}, + {"matrix": [4, 4], "x": 6.25, "y": 4.25, "h": 1.5}, + + {"matrix": [9, 4], "x": 7.75, "y": 4.25, "h": 1.5}, + {"matrix": [9, 3], "x": 8.75, "y": 4.3}, + {"matrix": [9, 2], "x": 10, "y": 4.15}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 0], "x": 12, "y": 4.15} ] } } diff --git a/keyboards/keycapsss/kimiko/rev1/rev1.h b/keyboards/keycapsss/kimiko/rev1/rev1.h deleted file mode 100644 index 3359a39838b1..000000000000 --- a/keyboards/keycapsss/kimiko/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 @ben_roe (keycapsss.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 . - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L40, R40, R30, R31, R32, R33, R34, R35, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L41, L42, L43, L44, L45, L40 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } - diff --git a/keyboards/keyhive/opus/info.json b/keyboards/keyhive/opus/info.json index fd508c100352..5bef38ca0a46 100644 --- a/keyboards/keyhive/opus/info.json +++ b/keyboards/keyhive/opus/info.json @@ -17,55 +17,55 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Tab", "x": 0, "y": 0.4 }, - { "label": "Q", "x": 1, "y": 0.4 }, - { "label": "W", "x": 2, "y": 0.2 }, - { "label": "E", "x": 3, "y": 0 }, - { "label": "R", "x": 4, "y": 0.4 }, - { "label": "T", "x": 5, "y": 0.5 }, + {"matrix": [0, 0], "x": 0, "y": 0.4}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.2}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - { "label": "Y", "x": 10, "y": 0.5 }, - { "label": "U", "x": 11, "y": 0.4 }, - { "label": "I", "x": 12, "y": 0 }, - { "label": "O", "x": 13, "y": 0.2 }, - { "label": "P", "x": 14, "y": 0.4 }, - { "label": "Back Space", "x": 15, "y": 0.4 }, + {"matrix": [0, 6], "x": 10, "y": 0.5}, + {"matrix": [0, 7], "x": 11, "y": 0.4}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0.2}, + {"matrix": [0, 10], "x": 14, "y": 0.4}, + {"matrix": [0, 11], "x": 15, "y": 0.4}, - { "label": "Ctrl / Esc", "x": 0, "y": 1.4 }, - { "label": "A", "x": 1, "y": 1.4 }, - { "label": "S", "x": 2, "y": 1.2 }, - { "label": "D", "x": 3, "y": 1 }, - { "label": "F", "x": 4, "y": 1.4 }, - { "label": "G", "x": 5, "y": 1.5 }, + {"matrix": [1, 0], "x": 0, "y": 1.4}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.2}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - { "label": "H", "x": 10, "y": 1.5 }, - { "label": "J", "x": 11, "y": 1.4 }, - { "label": "K", "x": 12, "y": 1 }, - { "label": "L", "x": 13, "y": 1.2 }, - { "label": ";", "x": 14, "y": 1.4 }, - { "label": "'", "x": 15, "y": 1.4 }, + {"matrix": [1, 6], "x": 10, "y": 1.5}, + {"matrix": [1, 7], "x": 11, "y": 1.4}, + {"matrix": [1, 8], "x": 12, "y": 1}, + {"matrix": [1, 9], "x": 13, "y": 1.2}, + {"matrix": [1, 10], "x": 14, "y": 1.4}, + {"matrix": [1, 11], "x": 15, "y": 1.4}, - { "label": "GUI", "x": 0, "y": 2.4 }, - { "label": "Z", "x": 1, "y": 2.4 }, - { "label": "X", "x": 2, "y": 2.2 }, - { "label": "C", "x": 3, "y": 2 }, - { "label": "V", "x": 4, "y": 2.4 }, - { "label": "B", "x": 5, "y": 2.5 }, + {"matrix": [2, 0], "x": 0, "y": 2.4}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, - { "label": "N", "x": 10, "y": 2.5 }, - { "label": "M", "x": 11, "y": 2.4 }, - { "label": ",", "x": 12, "y": 2 }, - { "label": ".", "x": 13, "y": 2.2 }, - { "label": "/", "x": 14, "y": 2.4 }, - { "label": "Enter", "x": 15, "y": 2.4 }, + {"matrix": [2, 6], "x": 10, "y": 2.5}, + {"matrix": [2, 7], "x": 11, "y": 2.4}, + {"matrix": [2, 8], "x": 12, "y": 2}, + {"matrix": [2, 9], "x": 13, "y": 2.2}, + {"matrix": [2, 10], "x": 14, "y": 2.4}, + {"matrix": [2, 11], "x": 15, "y": 2.4}, - { "label": "Lower", "x": 4.8, "y": 3.7 }, - { "label": "Shift", "x": 5.8, "y": 3.5 }, - { "label": "Tab", "x": 6.8, "y": 3.6 }, + {"matrix": [3, 3], "x": 4.8, "y": 3.7}, + {"matrix": [3, 4], "x": 5.8, "y": 3.5}, + {"matrix": [3, 5], "x": 6.8, "y": 3.6}, - { "label": "Enter", "x": 8.2, "y": 3.6 }, - { "label": "Space", "x": 9.2, "y": 3.5 }, - { "label": "Raise", "x": 10.2, "y": 3.7 } + {"matrix": [3, 6], "x": 8.2, "y": 3.6}, + {"matrix": [3, 7], "x": 9.2, "y": 3.5}, + {"matrix": [3, 8], "x": 10.2, "y": 3.7} ] } } diff --git a/keyboards/keyhive/opus/opus.h b/keyboards/keyhive/opus/opus.h deleted file mode 100644 index ec82c5bc9a14..000000000000 --- a/keyboards/keyhive/opus/opus.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 rtwayland - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - 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, \ - k33, k34, k35, k36, k37, k38 \ -) \ -{ \ - { 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 }, \ - { KC_NO, KC_NO, KC_NO, k33, k34, k35, k36, k37, k38, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/keyhive/smallice/info.json b/keyboards/keyhive/smallice/info.json index b3134b177183..a5ebe8c5881a 100644 --- a/keyboards/keyhive/smallice/info.json +++ b/keyboards/keyhive/smallice/info.json @@ -20,7 +20,71 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"V+", "x":0.5, "y":0}, {"label":"Tab", "x":1.75, "y":0}, {"label":"Q", "x":2.75, "y":0}, {"label":"W", "x":3.75, "y":0}, {"label":"E", "x":4.75, "y":0}, {"label":"R", "x":5.75, "y":0}, {"label":"T", "x":6.75, "y":0}, {"label":"Y", "x":8.25, "y":0}, {"label":"U", "x":9.25, "y":0}, {"label":"I", "x":10.25, "y":0}, {"label":"O", "x":11.25, "y":0}, {"label":"P", "x":12.25, "y":0}, {"label":"[ {", "x":13.25, "y":0}, {"label":"] }", "x":14.25, "y":0}, {"label":"Bcsp", "x":15.25, "y":0}, {"label":"V-", "x":0.25, "y":1}, {"label":"Caps", "x":1.5, "y":1, "w":1.25}, {"label":"A", "x":2.75, "y":1}, {"label":"S", "x":3.75, "y":1}, {"label":"D", "x":4.75, "y":1}, {"label":"F", "x":5.75, "y":1}, {"label":"G", "x":6.75, "y":1}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":": ;", "x":12.75, "y":1}, {"label":", \"", "x":13.75, "y":1}, {"label":"Enter", "x":14.75, "y":1, "w":1.75}, {"label":"V-", "x":0, "y":2}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.5, "y":2}, {"label":"N", "x":9.5, "y":2}, {"label":"M", "x":10.5, "y":2}, {"label":"<", "x":11.5, "y":2}, {"label":">", "x":12.5, "y":2}, {"label":"Shift", "x":13.5, "y":2, "w":1.25}, {"label":"Up", "x":14.75, "y":2}, {"label":"?", "x":15.75, "y":2}, {"label":"Ctrl", "x":1.25, "y":3}, {"label":"Alt", "x":3, "y":3, "w":1.25}, {"x":4.25, "y":3, "w":2}, {"label":"Win", "x":6.25, "y":3}, {"x":9.5, "y":3, "w":2.75}, {"label":"Fn", "x":12.25, "y":3}, {"label":"left", "x":13.75, "y":3}, {"label":"down", "x":14.75, "y":3}, {"label":"right", "x":15.75, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [0, 7], "x": 8.25, "y": 0}, + {"matrix": [0, 8], "x": 9.25, "y": 0}, + {"matrix": [0, 9], "x": 10.25, "y": 0}, + {"matrix": [0, 10], "x": 11.25, "y": 0}, + {"matrix": [0, 11], "x": 12.25, "y": 0}, + {"matrix": [0, 12], "x": 13.25, "y": 0}, + {"matrix": [0, 13], "x": 14.25, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + + {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1}, + {"matrix": [1, 12], "x": 13.75, "y": 1}, + {"matrix": [1, 14], "x": 14.75, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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.5, "y": 2}, + {"matrix": [2, 8], "x": 9.5, "y": 2}, + {"matrix": [2, 9], "x": 10.5, "y": 2}, + {"matrix": [2, 10], "x": 11.5, "y": 2}, + {"matrix": [2, 11], "x": 12.5, "y": 2}, + {"matrix": [2, 12], "x": 13.5, "y": 2, "w": 1.25}, + {"matrix": [2, 13], "x": 14.75, "y": 2}, + {"matrix": [2, 14], "x": 15.75, "y": 2}, + + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 4.25, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3, "w": 2.75}, + {"matrix": [3, 10], "x": 12.25, "y": 3}, + + {"matrix": [3, 12], "x": 13.75, "y": 3}, + {"matrix": [3, 13], "x": 14.75, "y": 3}, + {"matrix": [3, 14], "x": 15.75, "y": 3} + ] } } } diff --git a/keyboards/keyhive/smallice/smallice.h b/keyboards/keyhive/smallice/smallice.h deleted file mode 100644 index 12d4356795c1..000000000000 --- a/keyboards/keyhive/smallice/smallice.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 armastardo / quark - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K301, K303, K305, K306, K308, K310, K312, K313, K314 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { KC_NO, K301, KC_NO, K303, KC_NO, K305, K306, KC_NO, K308, KC_NO, K310, KC_NO, K312, K313, K314 } \ -} diff --git a/keyboards/keyhive/southpole/info.json b/keyboards/keyhive/southpole/info.json index 822864736246..8514a2998668 100644 --- a/keyboards/keyhive/southpole/info.json +++ b/keyboards/keyhive/southpole/info.json @@ -18,90 +18,100 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Num Lock", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - {"label":"Esc", "x":4.5, "y":0}, - {"label":"1", "x":5.5, "y":0}, - {"label":"2", "x":6.5, "y":0}, - {"label":"3", "x":7.5, "y":0}, - {"label":"4", "x":8.5, "y":0}, - {"label":"5", "x":9.5, "y":0}, - {"label":"6", "x":10.5, "y":0}, - {"label":"7", "x":11.5, "y":0}, - {"label":"8", "x":12.5, "y":0}, - {"label":"9", "x":13.5, "y":0}, - {"label":"0", "x":14.5, "y":0}, - {"label":"-", "x":15.5, "y":0}, - {"label":"=", "x":16.5, "y":0}, - {"label":"\\", "x":17.5, "y":0}, - {"label":"Delete", "x":18.5, "y":0}, - {"label":"Insert", "x":19.5, "y":0}, - {"label":"7", "x":0, "y":1}, - {"label":"8", "x":1, "y":1}, - {"label":"9", "x":2, "y":1}, - {"label":"+", "x":3, "y":1, "h":2}, - {"label":"Tab", "x":4.5, "y":1, "w":1.5}, - {"label":"Q", "x":6, "y":1}, - {"label":"W", "x":7, "y":1}, - {"label":"E", "x":8, "y":1}, - {"label":"R", "x":9, "y":1}, - {"label":"T", "x":10, "y":1}, - {"label":"Y", "x":11, "y":1}, - {"label":"U", "x":12, "y":1}, - {"label":"I", "x":13, "y":1}, - {"label":"O", "x":14, "y":1}, - {"label":"P", "x":15, "y":1}, - {"label":"[", "x":16, "y":1}, - {"label":"]", "x":17, "y":1}, - {"label":"Backspace", "x":18, "y":1, "w":1.5}, - {"label":"Vol +", "x":19.5, "y":1}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"Enter", "x":3, "y":3, "h":2}, - {"label":"Caps Lock", "x":4.5, "y":2, "w":1.75}, - {"label":"A", "x":6.25, "y":2}, - {"label":"S", "x":7.25, "y":2}, - {"label":"D", "x":8.25, "y":2}, - {"label":"F", "x":9.25, "y":2}, - {"label":"G", "x":10.25, "y":2}, - {"label":"H", "x":11.25, "y":2}, - {"label":"J", "x":12.25, "y":2}, - {"label":"K", "x":13.25, "y":2}, - {"label":"L", "x":14.25, "y":2}, - {"label":";", "x":15.25, "y":2}, - {"label":"'", "x":16.25, "y":2}, - {"label":"Enter", "x":17.25, "y":2, "w":2.25}, - {"label":"Vol -", "x":19.5, "y":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3}, - {"label":"Shift", "x":4.5, "y":3, "w":2.25}, - {"label":"Z", "x":6.75, "y":3}, - {"label":"X", "x":7.75, "y":3}, - {"label":"C", "x":8.75, "y":3}, - {"label":"V", "x":9.75, "y":3}, - {"label":"B", "x":10.75, "y":3}, - {"label":"N", "x":11.75, "y":3}, - {"label":"M", "x":12.75, "y":3}, - {"label":",", "x":13.75, "y":3}, - {"label":".", "x":14.75, "y":3}, - {"label":"/", "x":15.75, "y":3}, - {"label":"Shift", "x":16.75, "y":3, "w":1.75}, - {"label":"Up", "x":18.5, "y":3}, - {"label":"Mute", "x":19.5, "y":3}, - {"label":"0", "x":0, "y":4, "w":2}, - {"label":".", "x":2, "y":4}, - {"label":"Ctrl", "x":4.5, "y":4, "w":1.25}, - {"label":"GUI", "x":5.75, "y":4, "w":1.25}, - {"label":"Alt", "x":7, "y":4, "w":1.25}, - {"label":"Space", "x":8.25, "y":4, "w":7}, - {"label":"Fn", "x":15.25, "y":4, "w":1.5}, - {"label":"Left", "x":17.5, "y":4}, - {"label":"Down", "x":18.5, "y":4}, - {"label":"Right", "x":19.5, "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.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 14.5, "y": 0}, + {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [0, 16], "x": 16.5, "y": 0}, + {"matrix": [0, 17], "x": 17.5, "y": 0}, + {"matrix": [0, 18], "x": 18.5, "y": 0}, + {"matrix": [0, 19], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1, "h": 2}, + + {"matrix": [1, 4], "x": 4.5, "y": 1, "w": 1.5}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1}, + {"matrix": [1, 16], "x": 17, "y": 1}, + {"matrix": [1, 17], "x": 18, "y": 1, "w": 1.5}, + {"matrix": [1, 19], "x": 19.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 3, "h": 2}, + + {"matrix": [2, 4], "x": 4.5, "y": 2, "w": 1.75}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2}, + {"matrix": [2, 15], "x": 16.25, "y": 2}, + {"matrix": [2, 16], "x": 17.25, "y": 2, "w": 2.25}, + {"matrix": [2, 19], "x": 19.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 6.75, "y": 3}, + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3}, + {"matrix": [3, 13], "x": 14.75, "y": 3}, + {"matrix": [3, 14], "x": 15.75, "y": 3}, + {"matrix": [3, 15], "x": 16.75, "y": 3, "w": 1.75}, + {"matrix": [3, 16], "x": 18.5, "y": 3}, + {"matrix": [3, 19], "x": 19.5, "y": 3}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 7}, + {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 15], "x": 17.5, "y": 4}, + {"matrix": [4, 16], "x": 18.5, "y": 4}, + {"matrix": [4, 19], "x": 19.5, "y": 4} ] } } diff --git a/keyboards/keyhive/southpole/southpole.h b/keyboards/keyhive/southpole/southpole.h deleted file mode 100644 index 99cf2ce7b557..000000000000 --- a/keyboards/keyhive/southpole/southpole.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K119, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K219, \ - K300, K301, K302, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K319, \ - K401, K402, K404, K405, K406, K409, K413, K415, K416, K419 \ -) \ - { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, K018, K019 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, KC_NO, K119 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, KC_NO, KC_NO, K219 }, \ - { K300, K301, K302, KC_NO, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, KC_NO, KC_NO, K319 }, \ - { KC_NO, K401, K402, KC_NO, K404, K405, K406, KC_NO, KC_NO, K409, KC_NO, KC_NO, KC_NO, K413, KC_NO, K415, K416, KC_NO, KC_NO, K419 } \ -} diff --git a/keyboards/keyprez/corgi/corgi.h b/keyboards/keyprez/corgi/corgi.h deleted file mode 100644 index d697e436de34..000000000000 --- a/keyboards/keyprez/corgi/corgi.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Christian Sandven - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - 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, \ - r1t \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, r1t }, \ - { k06, k07, k08, k09, k0a, k0b, KC_NO }, \ - { k16, k17, k18, k19, k1a, k1b, KC_NO }, \ - { k26, k27, k28, k29, k2a, k2b, KC_NO }, \ - { k36, k37, k38, k39, k3a, k3b, KC_NO } \ -} - diff --git a/keyboards/keyprez/corgi/info.json b/keyboards/keyprez/corgi/info.json index 3c952fec992f..6e4c5682f522 100644 --- a/keyboards/keyprez/corgi/info.json +++ b/keyboards/keyprez/corgi/info.json @@ -24,59 +24,58 @@ "layouts": { "LAYOUT": { "layout": [ - {"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}, + {"matrix": [0, 0], "x": 1, "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, "y": 0}, + {"matrix": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [5, 0], "x": 7, "y": 1}, + {"matrix": [5, 1], "x": 8, "y": 1}, + {"matrix": [5, 2], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 4], "x": 11, "y": 1}, + {"matrix": [5, 5], "x": 12, "y": 1}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "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": [6, 0], "x": 7, "y": 2}, + {"matrix": [6, 1], "x": 8, "y": 2}, + {"matrix": [6, 2], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 4], "x": 11, "y": 2}, + {"matrix": [6, 5], "x": 12, "y": 2}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - - {"x":0, "y":3} + {"matrix": [3, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [7, 0], "x": 7, "y": 3}, + {"matrix": [7, 1], "x": 8, "y": 3}, + {"matrix": [7, 2], "x": 9, "y": 3}, + {"matrix": [7, 3], "x": 10, "y": 3}, + {"matrix": [7, 4], "x": 11, "y": 3}, + {"matrix": [7, 5], "x": 12, "y": 3}, + {"matrix": [3, 6], "x": 0, "y": 3} ] } } diff --git a/keyboards/keyprez/unicorn/info.json b/keyboards/keyprez/unicorn/info.json index 610413af8ab7..58d2a98d300b 100644 --- a/keyboards/keyprez/unicorn/info.json +++ b/keyboards/keyprez/unicorn/info.json @@ -32,86 +32,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"|\u00a7", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2\"", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4\u00a4", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6&", "x":6, "y":0}, - {"label":"7/", "x":8, "y":0}, - {"label":"8(", "x":9, "y":0}, - {"label":"9)", "x":10, "y":0}, - {"label":"0=", "x":11, "y":0}, - {"label":"+?", "x":12, "y":0}, - {"label":"\\`", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2}, - {"label":"Home", "x":16, "y":0}, - {"label":"Rotary", "x":17, "y":0}, + {"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}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"\u00c5", "x":12.5, "y":1}, - {"label":"\u00a8\u005e", "x":13.5, "y":1}, - {"label":"End", "x":16, "y":1}, - {"label":"Delete", "x":17, "y":1}, + {"matrix": [6, 0], "x": 8, "y": 0}, + {"matrix": [6, 1], "x": 9, "y": 0}, + {"matrix": [6, 2], "x": 10, "y": 0}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 4], "x": 12, "y": 0}, + {"matrix": [6, 5], "x": 13, "y": 0}, + {"matrix": [6, 6], "x": 14, "y": 0, "w": 2}, + {"matrix": [6, 7], "x": 16, "y": 0}, + {"matrix": [11, 2], "x": 17, "y": 0}, - {"label":"Esc", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":"\u00d8", "x":11.75, "y":2}, - {"label":"\u00c6", "x":12.75, "y":2}, - {"label":"'*", "x":13.75, "y":2}, - {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2}, - {"label":"PgUp", "x":16, "y":2}, - {"label":"Insert", "x":17, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"<>", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",;", "x":10.25, "y":3}, - {"label":".:", "x":11.25, "y":3}, - {"label":"-_", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":15, "y":3}, - {"label":"PgDn", "x":16, "y":3}, - {"label":"Copy", "x":17, "y":3}, + {"matrix": [7, 0], "x": 7.5, "y": 1}, + {"matrix": [7, 1], "x": 8.5, "y": 1}, + {"matrix": [7, 2], "x": 9.5, "y": 1}, + {"matrix": [7, 3], "x": 10.5, "y": 1}, + {"matrix": [7, 4], "x": 11.5, "y": 1}, + {"matrix": [7, 5], "x": 12.5, "y": 1}, + {"matrix": [7, 6], "x": 13.5, "y": 1}, + {"matrix": [11, 4], "x": 16, "y": 1}, + {"matrix": [11, 3], "x": 17, "y": 1}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":2.25}, - {"label":"Space", "x":6, "y":4, "w":1.25}, - {"label":"Space", "x":8.25, "y":4, "w":2.75}, - {"label":"AltGr", "x":11, "y":4}, - {"label":"Mod", "x":12, "y":4}, - {"label":"Ctrl", "x":13, "y":4}, - {"label":"\u2190", "x":14, "y":4}, - {"label":"\u2193", "x":15, "y":4}, - {"label":"\u2192", "x":16, "y":4}, - {"label":"Paste", "x":17, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [8, 0], "x": 7.75, "y": 2}, + {"matrix": [8, 1], "x": 8.75, "y": 2}, + {"matrix": [8, 2], "x": 9.75, "y": 2}, + {"matrix": [8, 3], "x": 10.75, "y": 2}, + {"matrix": [8, 4], "x": 11.75, "y": 2}, + {"matrix": [8, 5], "x": 12.75, "y": 2}, + {"matrix": [8, 6], "x": 13.75, "y": 2}, + {"matrix": [8, 7], "x": 14.75, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [11, 6], "x": 16, "y": 2}, + {"matrix": [11, 5], "x": 17, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + + {"matrix": [9, 0], "x": 8.25, "y": 3}, + {"matrix": [9, 1], "x": 9.25, "y": 3}, + {"matrix": [9, 2], "x": 10.25, "y": 3}, + {"matrix": [9, 3], "x": 11.25, "y": 3}, + {"matrix": [9, 4], "x": 12.25, "y": 3}, + {"matrix": [9, 5], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [9, 6], "x": 15, "y": 3}, + {"matrix": [9, 7], "x": 16, "y": 3}, + {"matrix": [11, 7], "x": 17, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25}, + + {"matrix": [10, 0], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [10, 1], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 12, "y": 4}, + {"matrix": [10, 3], "x": 13, "y": 4}, + {"matrix": [10, 4], "x": 14, "y": 4}, + {"matrix": [10, 5], "x": 15, "y": 4}, + {"matrix": [10, 6], "x": 16, "y": 4}, + {"matrix": [10, 7], "x": 17, "y": 4} ] } } diff --git a/keyboards/keyprez/unicorn/unicorn.c b/keyboards/keyprez/unicorn/unicorn.c deleted file mode 100644 index 213ed629ac07..000000000000 --- a/keyboards/keyprez/unicorn/unicorn.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2022 Keyprez (https://github.com/keyprez) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "unicorn.h" diff --git a/keyboards/keyprez/unicorn/unicorn.h b/keyboards/keyprez/unicorn/unicorn.h deleted file mode 100644 index 5eb036f50a41..000000000000 --- a/keyboards/keyprez/unicorn/unicorn.h +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2022 Keyprez (https://github.com/keyprez) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, RC10, \ - LD1, LD2, LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4, RD5, RD6, RD7, RD8, RD9, \ - LE1, LE2, LE3, LE5, LE6, RE1, RE2, RE3, RE4, RE5, RE6, RE7, RE8 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6, LA7, KC_NO }, \ - { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO, KC_NO }, \ - { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO, KC_NO }, \ - { LD1, LD2, LD3, LD4, LD5, LD6, LD7, KC_NO }, \ - { LE1, LE2, LE3, KC_NO, LE5, LE6, KC_NO, KC_NO }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \ - { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO }, \ - { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8 }, \ - { RD1, RD2, RD3, RD4, RD5, RD6, RD7, RD8 }, \ - { RE1, RE2, RE3, RE4, RE5, RE6, RE7, RE8 }, \ - { KC_NO, KC_NO, RA9, RB9, RB8, RC10, RC9, RD9 } \ - } diff --git a/keyboards/kingly_keys/ropro/info.json b/keyboards/kingly_keys/ropro/info.json index 51db685d50f3..ad77ae560858 100644 --- a/keyboards/kingly_keys/ropro/info.json +++ b/keyboards/kingly_keys/ropro/info.json @@ -25,7 +25,89 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Esc", "x":1, "y":1}, {"label":"1", "x":2, "y":1}, {"label":"2", "x":3, "y":1}, {"label":"3", "x":4, "y":1}, {"label":"4", "x":5, "y":1}, {"label":"5", "x":6, "y":1}, {"label":"6;", "x":7, "y":1}, {"label":"7", "x":8, "y":1}, {"label":"8", "x":9, "y":1}, {"label":"9", "x":10, "y":1}, {"label":"0", "x":11, "y":1}, {"label":"-", "x":12, "y":1}, {"label":"CAPS", "x":0, "y":2}, {"label":"Tab", "x":1, "y":2}, {"label":"Q", "x":2, "y":2}, {"label":"W", "x":3, "y":2}, {"label":"E", "x":4, "y":2}, {"label":"R", "x":5, "y":2}, {"label":"T", "x":6, "y":2}, {"label":"Y", "x":7, "y":2}, {"label":"U", "x":8, "y":2}, {"label":"I", "x":9, "y":2}, {"label":"O", "x":10, "y":2}, {"label":"P", "x":11, "y":2}, {"label":"Bksp", "x":12, "y":2}, {"label":"PgUp", "x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"A", "x":2, "y":3}, {"label":"S", "x":3, "y":3}, {"label":"D", "x":4, "y":3}, {"label":"F", "x":5, "y":3}, {"label":"G", "x":6, "y":3}, {"label":"H;", "x":7, "y":3}, {"label":"J", "x":8, "y":3}, {"label":"K", "x":9, "y":3}, {"label":"L", "x":10, "y":3}, {"label":";", "x":11, "y":3}, {"label":"'", "x":12, "y":3}, {"label":"Home", "x":0, "y":4}, {"label":"Shift", "x":1, "y":4}, {"label":"Z", "x":2, "y":4}, {"label":"X", "x":3, "y":4}, {"label":"C", "x":4, "y":4}, {"label":"V", "x":5, "y":4}, {"label":"B", "x":6, "y":4}, {"label":"N", "x":7, "y":4}, {"label":"M", "x":8, "y":4}, {"label":",", "x":9, "y":4}, {"label":".", "x":10, "y":4}, {"label":"/", "x":11, "y":4}, {"label":"Enter", "x":12, "y":4}, {"label":"PgDn", "x":0, "y":5}, {"label":"Del", "x":1, "y":5}, {"label":"Ctrl", "x":2, "y":5}, {"label":"GUI", "x":3, "y":5}, {"label":"Alt", "x":4, "y":5}, {"label":"Lower", "x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"label":"End", "x":8, "y":5}, {"label":"Left", "x":9, "y":5}, {"label":"Down", "x":10, "y":5}, {"label":"Up", "x":11, "y":5}, {"label":"Right", "x":12, "y":5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + + {"matrix": [2, 13], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [5, 1], "x": 1, "y": 5}, + {"matrix": [5, 2], "x": 2, "y": 5}, + {"matrix": [5, 3], "x": 3, "y": 5}, + {"matrix": [5, 4], "x": 4, "y": 5}, + {"matrix": [5, 5], "x": 5, "y": 5}, + {"matrix": [5, 6], "x": 6, "y": 5}, + {"matrix": [5, 7], "x": 7, "y": 5}, + {"matrix": [5, 8], "x": 8, "y": 5}, + {"matrix": [5, 9], "x": 9, "y": 5}, + {"matrix": [5, 10], "x": 10, "y": 5}, + {"matrix": [5, 11], "x": 11, "y": 5}, + {"matrix": [5, 12], "x": 12, "y": 5} + ] } } } diff --git a/keyboards/kingly_keys/ropro/ropro.h b/keyboards/kingly_keys/ropro/ropro.h deleted file mode 100644 index cb635cff3988..000000000000 --- a/keyboards/kingly_keys/ropro/ropro.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 Garret G. (TheRoyalSweatshirt) - * - * 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 . - * - * Note: Matrix is a little wacky with the rotary encoder click mapping being - * on the opposite side of the board. Remember to pay attention to - * the 13th column where the lone key mapped for rotary encoder click (K132). -*/ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K10, K20, K30, K40, K50, K60, K70, K80, K90, K100, K110, K120, \ - K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K121, \ - K132, K12, K22, K32, K42, K52, K62, K72, K82, K92, K102, K112, K122, \ - K03, K13, K23, K33, K43, K53, K63, K73, K83, K93, K103, K113, K123, \ - K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, \ - K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125 \ -) { \ - { KC_NO, K10, K20, K30, K40, K50, K60, K70, K80, K90, K100, K110, K120, KC_NO }, \ - { KC_NO, K11, K21, K31, K41, K51, K61, K71, K81, K91, K101, K111, K121, KC_NO }, \ - { KC_NO, K12, K22, K32, K42, K52, K62, K72, K82, K92, K102, K112, K122, K132 }, \ - { K03, K13, K23, K33, K43, K53, K63, K73, K83, K93, K103, K113, K123, KC_NO }, \ - { K04, K14, K24, K34, K44, K54, K64, K74, K84, K94, K104, K114, K124, KC_NO }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, K105, K115, K125, KC_NO } \ -} diff --git a/keyboards/kira75/info.json b/keyboards/kira75/info.json index a8b6a76ffb5f..2be8746471ae 100644 --- a/keyboards/kira75/info.json +++ b/keyboards/kira75/info.json @@ -24,7 +24,96 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 2}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [2, 7], "x": 6.5, "y": 2}, + {"matrix": [2, 8], "x": 7.5, "y": 2}, + {"matrix": [2, 9], "x": 8.5, "y": 2}, + {"matrix": [2, 10], "x": 9.5, "y": 2}, + {"matrix": [2, 11], "x": 10.5, "y": 2}, + {"matrix": [2, 12], "x": 11.5, "y": 2}, + {"matrix": [2, 13], "x": 12.5, "y": 2}, + {"matrix": [2, 14], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 13], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5, "w": 1.5}, + {"matrix": [5, 11], "x": 11.5, "y": 5, "w": 1.5}, + {"matrix": [5, 13], "x": 13, "y": 5}, + {"matrix": [5, 14], "x": 14, "y": 5}, + {"matrix": [5, 15], "x": 15, "y": 5} + ] } } } diff --git a/keyboards/kira75/kira75.h b/keyboards/kira75/kira75.h index 27fdab02db69..8001d69e4052 100644 --- a/keyboards/kira75/kira75.h +++ b/keyboards/kira75/kira75.h @@ -24,25 +24,3 @@ inline void caps_led_off(void) { DDRD &= ~(1<<7); PORTD &= ~(1<<7); } inline void num_led_on(void) { DDRD |= (1<<6); PORTD &= ~(1<<6); } inline void num_led_off(void) { DDRD &= ~(1<<6); PORTD &= ~(1<<6); } - -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - 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, k1F, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3F, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4D, k4E, k4F, \ - k50, k51, k53, k56, k5A, k5B, 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, XXX, k1F }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, k3F }, \ - { XXX, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, k4E, k4F }, \ - { k50, k51, XXX, k53, XXX, XXX, k56, XXX, XXX, XXX, k5A, k5B, XXX, k5D, k5E, k5F } \ -} diff --git a/keyboards/kiwikey/borderland/borderland.c b/keyboards/kiwikey/borderland/borderland.c deleted file mode 100644 index 371dc73098ac..000000000000 --- a/keyboards/kiwikey/borderland/borderland.c +++ /dev/null @@ -1,4 +0,0 @@ -// Copyright 2021 KiwiKey (@KiwiKey) -// SPDX-License-Identifier: GPL-2.0-or-later - -#include "borderland.h" diff --git a/keyboards/kiwikey/borderland/borderland.h b/keyboards/kiwikey/borderland/borderland.h deleted file mode 100644 index 85449a16b5f3..000000000000 --- a/keyboards/kiwikey/borderland/borderland.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2021 KiwiKey (@KiwiKey) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ - k40, k42, k44, k45, k47, k49, k4C, k4D, k4E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E }, \ - { k40, KC_NO, k42, KC_NO, k44, k45, KC_NO, k47, KC_NO, k49, KC_NO, KC_NO, k4C, k4D, k4E } \ -} diff --git a/keyboards/kiwikey/borderland/info.json b/keyboards/kiwikey/borderland/info.json index 30f8ccc04846..7ecd81e07b11 100644 --- a/keyboards/kiwikey/borderland/info.json +++ b/keyboards/kiwikey/borderland/info.json @@ -26,77 +26,87 @@ "layouts": { "LAYOUT": { "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":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":16, "y":0}, - {"x":17.3, "y":0}, + {"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}, - {"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":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}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1, "w":1.5}, - {"x":17.3, "y":1}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "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, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, - {"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":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}, - {"x":14.75, "y":2, "w":2.25}, - {"x":17.3, "y":2}, + {"matrix": [1, 14], "x": 17.3, "y": 0}, - {"x":0, "y":3, "w":2.25}, - {"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":9.25, "y":3}, - {"x":10.25, "y":3}, - {"x":11.25, "y":3}, - {"x":12.25, "y":3}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3, "w":1.75}, - {"x":16.3, "y":3.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, - {"x":0, "y":4, "w":1.5}, - {"x":3.25, "y":4, "w":1.5}, - {"x":4.75, "y":4, "w":2}, - {"x":6.75, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":2.75}, - {"x":11.5, "y":4, "w":1.5}, - {"x":15.3, "y":4.25}, - {"x":16.3, "y":4.25}, - {"x":17.3, "y":4.25} + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1}, + {"matrix": [1, 13], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 17.3, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.75, "y": 2}, + {"matrix": [2, 7], "x": 9.75, "y": 2}, + {"matrix": [2, 8], "x": 10.75, "y": 2}, + {"matrix": [2, 9], "x": 11.75, "y": 2}, + {"matrix": [2, 10], "x": 12.75, "y": 2}, + {"matrix": [2, 11], "x": 13.75, "y": 2}, + {"matrix": [2, 12], "x": 14.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 17.3, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 9.25, "y": 3}, + {"matrix": [3, 7], "x": 10.25, "y": 3}, + {"matrix": [3, 8], "x": 11.25, "y": 3}, + {"matrix": [3, 9], "x": 12.25, "y": 3}, + {"matrix": [3, 10], "x": 13.25, "y": 3}, + {"matrix": [3, 11], "x": 14.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.3, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 6.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 7], "x": 8.75, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.3, "y": 4.25}, + {"matrix": [4, 13], "x": 16.3, "y": 4.25}, + {"matrix": [4, 14], "x": 17.3, "y": 4.25} ] } } diff --git a/keyboards/kmini/info.json b/keyboards/kmini/info.json index 91f88c03949c..6af61bbbf1e8 100755 --- a/keyboards/kmini/info.json +++ b/keyboards/kmini/info.json @@ -12,7 +12,94 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":0, "y":0}, {"label":"F2", "x":1, "y":0}, {"label":"Esc", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.5}, {"label":"GUI", "x":3.75, "y":4}, {"label":"Alt", "x":4.75, "y":4, "w":1.5}, {"x":6.25, "y":4, "w":7}, {"label":"Fn", "x":13.25, "y":4, "w":1.5}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0, "w": 2}, + {"matrix": [0, 16], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + + {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1}, + {"matrix": [1, 14], "x": 14.75, "y": 1}, + {"matrix": [1, 15], "x": 15.75, "y": 1, "w": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + + {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, + {"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": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2, "w": 2.25}, + {"matrix": [2, 16], "x": 17.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 9.5, "y": 3}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3}, + {"matrix": [3, 11], "x": 12.5, "y": 3}, + {"matrix": [3, 12], "x": 13.5, "y": 3}, + {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.75}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + {"matrix": [3, 16], "x": 17.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 3.75, "y": 4}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.5}, + {"matrix": [4, 7], "x": 6.25, "y": 4, "w": 7}, + {"matrix": [4, 12], "x": 13.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [4, 16], "x": 17.25, "y": 4} + ] } } } diff --git a/keyboards/kmini/kmini.c b/keyboards/kmini/kmini.c index 1ffd30475b51..ec9a069e2dcc 100755 --- a/keyboards/kmini/kmini.c +++ b/keyboards/kmini/kmini.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "kmini.h" +#include "quantum.h" void led_init_ports(void) { DDRB |= (1<<1); // OUT diff --git a/keyboards/kmini/kmini.h b/keyboards/kmini/kmini.h deleted file mode 100755 index e32ad5a0f9f2..000000000000 --- a/keyboards/kmini/kmini.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2018 Evy Dekkers - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, 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, k2F, k2G, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, k3G, \ - k40, k41, k42, k43, k44, k47, k4C, k4E, k4F, k4G \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, 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, ___, k2F, k2G }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G }, \ - { k40, k41, k42, k43, k44, ___, ___, k47, ___, ___, ___, ___, k4C, ___, k4E, k4F, k4G } \ -} diff --git a/keyboards/kopibeng/typ65/info.json b/keyboards/kopibeng/typ65/info.json index 3ba4fe061396..f6ce5d4e67d7 100644 --- a/keyboards/kopibeng/typ65/info.json +++ b/keyboards/kopibeng/typ65/info.json @@ -24,83 +24,88 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K01", "x": 1.25, "y": 0 }, - { "label": "K02", "x": 2.25, "y": 0 }, - { "label": "K03", "x": 3.25, "y": 0 }, - { "label": "K04", "x": 4.25, "y": 0 }, - { "label": "K05", "x": 5.25, "y": 0 }, - { "label": "K06", "x": 6.25, "y": 0 }, - { "label": "K07", "x": 7.25, "y": 0 }, - { "label": "K08", "x": 8.25, "y": 0 }, - { "label": "K09", "x": 9.25, "y": 0 }, - { "label": "K0A", "x": 10.25, "y": 0 }, - { "label": "K0B", "x": 11.25, "y": 0 }, - { "label": "K0C", "x": 12.25, "y": 0 }, - { "label": "K0D", "x": 13.25, "y": 0 }, - { "label": "K1E", "x": 14.25, "y": 0 }, - { "label": "K0E", "x": 15.25, "y": 0 }, - { "label": "K0F", "x": 16.25, "y": 0 }, - - { "label": "K00", "x": 0, "y": 1 }, - { "label": "K11", "w": 1.5, "x": 1.25, "y": 1 }, - { "label": "K12", "x": 2.75, "y": 1 }, - { "label": "K13", "x": 3.75, "y": 1 }, - { "label": "K14", "x": 4.75, "y": 1 }, - { "label": "K15", "x": 5.75, "y": 1 }, - { "label": "K16", "x": 6.75, "y": 1 }, - { "label": "K17", "x": 7.75, "y": 1 }, - { "label": "K18", "x": 8.75, "y": 1 }, - { "label": "K19", "x": 9.75, "y": 1 }, - { "label": "K1A", "x": 10.75, "y": 1 }, - { "label": "K1B", "x": 11.75, "y": 1 }, - { "label": "K1C", "x": 12.75, "y": 1 }, - { "label": "K1D", "x": 13.75, "y": 1 }, - { "label": "K2E", "w": 1.5, "x": 14.75, "y": 1 }, - { "label": "K1F", "x": 16.25, "y": 1 }, - - { "label": "K10", "x": 0, "y": 2 }, - { "label": "K21", "w": 1.75, "x": 1.25, "y": 2 }, - { "label": "K22", "x": 3, "y": 2 }, - { "label": "K23", "x": 4, "y": 2 }, - { "label": "K24", "x": 5, "y": 2 }, - { "label": "K25", "x": 6, "y": 2 }, - { "label": "K26", "x": 7, "y": 2 }, - { "label": "K27", "x": 8, "y": 2 }, - { "label": "K28", "x": 9, "y": 2 }, - { "label": "K29", "x": 10, "y": 2 }, - { "label": "K2A", "x": 11, "y": 2 }, - { "label": "K2B", "x": 12, "y": 2 }, - { "label": "K2C", "x": 13, "y": 2 }, - { "label": "K2D", "w": 2.25, "x": 14, "y": 2 }, - { "label": "K2F", "x": 16.25, "y": 2 }, - - { "label": "K20", "x": 0, "y": 3 }, - { "label": "K31", "w": 1.25, "x": 1.25, "y": 3 }, - { "label": "K32", "x": 2.5, "y": 3 }, - { "label": "K33", "x": 3.5, "y": 3 }, - { "label": "K34", "x": 4.5, "y": 3 }, - { "label": "K35", "x": 5.5, "y": 3 }, - { "label": "K36", "x": 6.5, "y": 3 }, - { "label": "K37", "x": 7.5, "y": 3 }, - { "label": "K38", "x": 8.5, "y": 3 }, - { "label": "K39", "x": 9.5, "y": 3 }, - { "label": "K3A", "x": 10.5, "y": 3 }, - { "label": "K3B", "x": 11.5, "y": 3 }, - { "label": "K3C", "x": 12.5, "y": 3 }, - { "label": "K3D", "w": 1.75, "x": 13.5, "y": 3 }, - { "label": "K3E", "x": 15.25, "y": 3 }, - { "label": "K3F", "x": 16.25, "y": 3 }, - - { "label": "K30", "x": 0, "y": 4 }, - { "label": "K41", "w": 1.25, "x": 1.25, "y": 4 }, - { "label": "K42", "w": 1.25, "x": 2.5, "y": 4 }, - { "label": "K43", "w": 1.25, "x": 3.75, "y": 4 }, - { "label": "K47", "w": 6.25, "x": 5, "y": 4 }, - { "label": "K4B", "w": 1.25, "x": 11.25, "y": 4 }, - { "label": "K4C", "w": 1.25, "x": 12.5, "y": 4 }, - { "label": "K4D", "x": 14.25, "y": 4 }, - { "label": "K4E", "x": 15.25, "y": 4 }, - { "label": "K4F", "x": 16.25, "y": 4 } + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [1, 14], "x": 14.25, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.25, "y": 0}, + + {"matrix": [0, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1}, + {"matrix": [1, 13], "x": 13.75, "y": 1}, + {"matrix": [2, 14], "x": 14.75, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 16.25, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15.25, "y": 3}, + {"matrix": [3, 15], "x": 16.25, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5, "y": 4, "w": 6.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 14.25, "y": 4}, + {"matrix": [4, 14], "x": 15.25, "y": 4}, + {"matrix": [4, 15], "x": 16.25, "y": 4} ] } } diff --git a/keyboards/kopibeng/typ65/typ65.c b/keyboards/kopibeng/typ65/typ65.c index 2844f2ca835d..246a8c13af53 100644 --- a/keyboards/kopibeng/typ65/typ65.c +++ b/keyboards/kopibeng/typ65/typ65.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "typ65.h" +#include "quantum.h" void keyboard_pre_init_kb (void) { setPinOutput(INDICATOR_0); diff --git a/keyboards/kopibeng/typ65/typ65.h b/keyboards/kopibeng/typ65/typ65.h deleted file mode 100644 index a4bbf9ab9960..000000000000 --- a/keyboards/kopibeng/typ65/typ65.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2021 Samuel Lu - * - * 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 - -/* - * - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐ ┌───────┐ - * │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │1E │0E │0F │ │0E │ Full Backspace - * ┌───┐ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤ └─┬─────┤ - * │00 │ │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │2E │1F │ │2E │ - * 2.25u ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ ┌─┴─┐ │ ISO - * LShift │10 │ │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2F │ │2D │ │ - * ┌────────┐ ├───┤ ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ └───┴───┘ - * │31 │ │20 │ │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │3F │ - * └────────┘ ├───┤ ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │30 │ │41 │42 │43 │47 │4B │4C │ │4D │4E │4F │ - * └───┘ └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - * ┌─────┬───┬─────┬───────────────────────────┬─────┐ - * │41 │42 │43 │47 │4C │ 7u Tsangan - * └─────┴───┴─────┴───────────────────────────┴─────┘ - * - */ - -#define LAYOUT( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1E, K0E, K0F, \ - K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, K1F, \ - K10, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K20, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K30, K41, K42, K43, K47, K4B, K4C, K4D, K4E, K4F \ -) { \ - {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, K3D, K3E, K3F}, \ - {___, K41, K42, K43, ___, ___, ___, K47, ___, ___, ___, K4B, K4C, K4D, K4E, K4F} \ -} diff --git a/keyboards/kprepublic/bm43a/bm43a.h b/keyboards/kprepublic/bm43a/bm43a.h deleted file mode 100644 index 87ca05c4d1aa..000000000000 --- a/keyboards/kprepublic/bm43a/bm43a.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2019 mechmerlin - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, \ - K30, K31, K32, K33, K35, K37, K38, K39, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B }, \ - { K30, K31, K32, K33, KC_NO, K35, KC_NO, K37, K38, K39, KC_NO, K3B }, \ -} diff --git a/keyboards/kprepublic/bm43a/info.json b/keyboards/kprepublic/bm43a/info.json index 60d6373b300c..bee05ba03658 100644 --- a/keyboards/kprepublic/bm43a/info.json +++ b/keyboards/kprepublic/bm43a/info.json @@ -25,49 +25,52 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D1,B0)", "x":0, "y":0}, - {"label":"K01 (D1,F5)", "x":1, "y":0}, - {"label":"K02 (D1,F6)", "x":2, "y":0}, - {"label":"K03 (D1,F7)", "x":3, "y":0}, - {"label":"K04 (D1,C7)", "x":4, "y":0}, - {"label":"K05 (D1,C6)", "x":5, "y":0}, - {"label":"K06 (D1,B6)", "x":6, "y":0}, - {"label":"K07 (D1,B5)", "x":7, "y":0}, - {"label":"K08 (D1,B4)", "x":8, "y":0}, - {"label":"K09 (D1,D7)", "x":9, "y":0}, - {"label":"K0A (D1,D6)", "x":10, "y":0}, - {"label":"K0B (D1,D4)", "x":11, "y":0}, - {"label":"K10 (F4,B0)", "x":0, "y":1, "w":1.25}, - {"label":"K11 (F4,F5)", "x":1.25, "y":1}, - {"label":"K12 (F4,F6)", "x":2.25, "y":1}, - {"label":"K13 (F4,F7)", "x":3.25, "y":1}, - {"label":"K14 (F4,C7)", "x":4.25, "y":1}, - {"label":"K15 (F4,C6)", "x":5.25, "y":1}, - {"label":"K16 (F4,B6)", "x":6.25, "y":1}, - {"label":"K17 (F4,B5)", "x":7.25, "y":1}, - {"label":"K18 (F4,B4)", "x":8.25, "y":1}, - {"label":"K19 (F4,D7)", "x":9.25, "y":1}, - {"label":"K1B (F4,D4)", "x":10.25, "y":1, "w":1.75}, - {"label":"K20 (F1,B0)", "x":0, "y":2, "w":2}, - {"label":"K21 (F1,F5)", "x":2, "y":2}, - {"label":"K22 (F1,F6)", "x":3, "y":2}, - {"label":"K23 (F1,F7)", "x":4, "y":2}, - {"label":"K24 (F1,C7)", "x":5, "y":2}, - {"label":"K25 (F1,C6)", "x":6, "y":2}, - {"label":"K26 (F1,B6)", "x":7, "y":2}, - {"label":"K27 (F1,B5)", "x":8, "y":2}, - {"label":"K28 (F1,B4)", "x":9, "y":2}, - {"label":"K29 (F1,D7)", "x":10, "y":2}, - {"label":"K2B (F1,D4)", "x":11, "y":2}, - {"label":"K30 (F0,B0)", "x":0, "y":3}, - {"label":"K31 (F0,F5)", "x":1, "y":3}, - {"label":"K32 (F0,F6)", "x":2, "y":3}, - {"label":"K33 (F0,F7)", "x":3, "y":3, "w":2.75}, - {"label":"K35 (F0,C6)", "x":5.75, "y":3, "w":2.25}, - {"label":"K37 (F0,B5)", "x":8, "y":3}, - {"label":"K38 (F0,B4)", "x":9, "y":3}, - {"label":"K39 (F0,D7)", "x":10, "y":3}, - {"label":"K3B (F0,D4)", "x":11, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.75}, + {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h b/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h deleted file mode 100755 index 09d99b02d550..000000000000 --- a/keyboards/kprepublic/bm43hsrgb/bm43hsrgb.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 bitstarr - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1B, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2B, \ - K30, K31, K32, K33, K35, K37, K38, K39, K3B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, KC_NO, K1B }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, KC_NO, K2B }, \ - { K30, K31, K32, K33, KC_NO, K35, KC_NO, K37, K38, K39, KC_NO, K3B }, \ -} diff --git a/keyboards/kprepublic/bm43hsrgb/info.json b/keyboards/kprepublic/bm43hsrgb/info.json index 5e2fb50983af..70e418e8949c 100755 --- a/keyboards/kprepublic/bm43hsrgb/info.json +++ b/keyboards/kprepublic/bm43hsrgb/info.json @@ -21,49 +21,52 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (E6,C6)", "x":0, "y":0}, - {"label":"K01 (E6,D2)", "x":1, "y":0}, - {"label":"K02 (E6,D1)", "x":2, "y":0}, - {"label":"K03 (E6,D0)", "x":3, "y":0}, - {"label":"K04 (E6,D7)", "x":4, "y":0}, - {"label":"K05 (E6,D6)", "x":5, "y":0}, - {"label":"K06 (E6,D4)", "x":6, "y":0}, - {"label":"K07 (E6,D5)", "x":7, "y":0}, - {"label":"K08 (E6,D3)", "x":8, "y":0}, - {"label":"K09 (E6,B7)", "x":9, "y":0}, - {"label":"K0A (E6,B3)", "x":10, "y":0}, - {"label":"K0B (E6,B2)", "x":11, "y":0}, - {"label":"K10 (B6,C6)", "x":0, "y":1, "w":1.25}, - {"label":"K11 (B6,D2)", "x":1.25, "y":1}, - {"label":"K12 (B6,D1)", "x":2.25, "y":1}, - {"label":"K13 (B6,D0)", "x":3.25, "y":1}, - {"label":"K14 (B6,D7)", "x":4.25, "y":1}, - {"label":"K15 (B6,D6)", "x":5.25, "y":1}, - {"label":"K16 (B6,D4)", "x":6.25, "y":1}, - {"label":"K17 (B6,D5)", "x":7.25, "y":1}, - {"label":"K18 (B6,D3)", "x":8.25, "y":1}, - {"label":"K19 (B6,B7)", "x":9.25, "y":1}, - {"label":"K1B (B6,B2)", "x":10.25, "y":1, "w":1.75}, - {"label":"K20 (B4,C6)", "x":0, "y":2, "w":2}, - {"label":"K21 (B4,D2)", "x":2, "y":2}, - {"label":"K22 (B4,D1)", "x":3, "y":2}, - {"label":"K23 (B4,D0)", "x":4, "y":2}, - {"label":"K24 (B4,D7)", "x":5, "y":2}, - {"label":"K25 (B4,D6)", "x":6, "y":2}, - {"label":"K26 (B4,D4)", "x":7, "y":2}, - {"label":"K27 (B4,D5)", "x":8, "y":2}, - {"label":"K28 (B4,D3)", "x":9, "y":2}, - {"label":"K29 (B4,B7)", "x":10, "y":2}, - {"label":"K2B (B4,B2)", "x":11, "y":2}, - {"label":"K30 (B5,C6)", "x":0, "y":3}, - {"label":"K31 (B5,D2)", "x":1, "y":3}, - {"label":"K32 (B5,D1)", "x":2, "y":3}, - {"label":"K33 (B5,D0)", "x":3, "y":3, "w":2.75}, - {"label":"K35 (B5,D6)", "x":5.75, "y":3, "w":2.25}, - {"label":"K37 (B5,D5)", "x":8, "y":3}, - {"label":"K38 (B5,D3)", "x":9, "y":3}, - {"label":"K39 (B5,B7)", "x":10, "y":3}, - {"label":"K3B (B5,B2)", "x":11, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 2.75}, + {"matrix": [3, 5], "x": 5.75, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json index 5db6750d852d..3849e5a338f1 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/info.json @@ -29,76 +29,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0, D0)", "x":0, "y":0.5}, - {"label":"K01 (B0, D1)", "x":1, "y":0.5}, - {"label":"K02 (B0, D2)", "x":2, "y":0.5}, - {"label":"K03 (B0, D3)", "x":3, "y":0.5}, - {"label":"K04 (B0, D5)", "x":4, "y":0.5}, - {"label":"K05 (B0, D4)", "x":5, "y":0.5}, - {"label":"K06 (B0, D6)", "x":6, "y":0.5}, - {"label":"K07 (B0, D7)", "x":7, "y":0.5}, - {"label":"K08 (B0, B4)", "x":8, "y":0.5}, - {"label":"K09 (B0, B5)", "x":9, "y":0.5}, - {"label":"K0A (B0, B6)", "x":10, "y":0.5}, - {"label":"K0B (B0, C6)", "x":11, "y":0.5}, - {"label":"K0C (B0, C7)", "x":12, "y":0.5}, - {"label":"K0D (B0, F7)", "x":13, "y":0.5}, - {"label":"K21 (B2, D1)", "x":14, "y":0.5}, - {"label":"K43 (E6, D3)", "x":13.9, "y":0, "w":0.6, "h":0.5}, - {"label":"K44 (E6, D5)", "x":14.5, "y":0, "w":0.6, "h":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0.5}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, + {"matrix": [0, 7], "x": 7, "y": 0.5}, + {"matrix": [0, 8], "x": 8, "y": 0.5}, + {"matrix": [0, 9], "x": 9, "y": 0.5}, + {"matrix": [0, 10], "x": 10, "y": 0.5}, + {"matrix": [0, 11], "x": 11, "y": 0.5}, + {"matrix": [0, 12], "x": 12, "y": 0.5}, + {"matrix": [0, 13], "x": 13, "y": 0.5}, + {"matrix": [2, 1], "x": 14, "y": 0.5}, - {"label":"K10 (B1, D0)", "x":0, "y":1.5, "w":1.5}, - {"label":"K11 (B1, D1)", "x":1.5, "y":1.5}, - {"label":"K12 (B1, D2)", "x":2.5, "y":1.5}, - {"label":"K13 (B1, D3)", "x":3.5, "y":1.5}, - {"label":"K14 (B1, D5)", "x":4.5, "y":1.5}, - {"label":"K15 (B1, D4)", "x":5.5, "y":1.5}, - {"label":"K16 (B1, D6)", "x":6.5, "y":1.5}, - {"label":"K17 (B1, D7)", "x":7.5, "y":1.5}, - {"label":"K18 (B1, B4)", "x":8.5, "y":1.5}, - {"label":"K19 (B1, B5)", "x":9.5, "y":1.5}, - {"label":"K1A (B1, B6)", "x":10.5, "y":1.5}, - {"label":"K1B (B1, C6)", "x":11.5, "y":1.5}, - {"label":"K1C (B1, C7)", "x":12.5, "y":1.5}, - {"label":"K1D (B1, F7)", "x":13.5, "y":1.5, "w":1.5}, + {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5}, + {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5}, - {"label":"K20 (B2, D0)", "x":0, "y":2.5, "w":1.75}, - {"label":"K22 (B2, D2)", "x":1.75, "y":2.5}, - {"label":"K23 (B2, D3)", "x":2.75, "y":2.5}, - {"label":"K24 (B2, D5)", "x":3.75, "y":2.5}, - {"label":"K25 (B2, D4)", "x":4.75, "y":2.5}, - {"label":"K26 (B2, D6)", "x":5.75, "y":2.5}, - {"label":"K27 (B2, D7)", "x":6.75, "y":2.5}, - {"label":"K28 (B2, B4)", "x":7.75, "y":2.5}, - {"label":"K29 (B2, B5)", "x":8.75, "y":2.5}, - {"label":"K2A (B2, B6)", "x":9.75, "y":2.5}, - {"label":"K2B (B2, C6)", "x":10.75, "y":2.5}, - {"label":"K2C (B2, C7)", "x":11.75, "y":2.5}, - {"label":"K2D (B2, F7)", "x":12.75, "y":2.5, "w":2.25}, + {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5}, - {"label":"K31 (B3, D1)", "x":0, "y":3.5, "w":2.25}, - {"label":"K32 (B3, D2)", "x":2.25, "y":3.5}, - {"label":"K33 (B3, D3)", "x":3.25, "y":3.5}, - {"label":"K34 (B3, D5)", "x":4.25, "y":3.5}, - {"label":"K35 (B3, D4)", "x":5.25, "y":3.5}, - {"label":"K36 (B3, D6)", "x":6.25, "y":3.5}, - {"label":"K37 (B3, D7)", "x":7.25, "y":3.5}, - {"label":"K38 (B3, B4)", "x":8.25, "y":3.5}, - {"label":"K39 (B3, B5)", "x":9.25, "y":3.5}, - {"label":"K3A (B3, B6)", "x":10.25, "y":3.5}, - {"label":"K3B (B3, C6)", "x":11.25, "y":3.5, "w":1.75}, - {"label":"K3C (B3, C7)", "x":13, "y":3.5}, - {"label":"K3D (B3, F7)", "x":14, "y":3.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2.5}, + {"matrix": [2, 3], "x": 2.75, "y": 2.5}, + {"matrix": [2, 4], "x": 3.75, "y": 2.5}, + {"matrix": [2, 5], "x": 4.75, "y": 2.5}, + {"matrix": [2, 6], "x": 5.75, "y": 2.5}, + {"matrix": [2, 7], "x": 6.75, "y": 2.5}, + {"matrix": [2, 8], "x": 7.75, "y": 2.5}, + {"matrix": [2, 9], "x": 8.75, "y": 2.5}, + {"matrix": [2, 10], "x": 9.75, "y": 2.5}, + {"matrix": [2, 11], "x": 10.75, "y": 2.5}, + {"matrix": [2, 12], "x": 11.75, "y": 2.5}, + {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25}, - {"label":"K40 (E6, D0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (E6, D1)", "x":1.25, "y":4.5, "w":1.25}, - {"label":"K42 (E6, D2)", "x":2.5, "y":4.5, "w":1.25}, - {"label":"K46 (E6, D6)", "x":3.75, "y":4.5, "w":6.25}, - {"label":"K49 (E6, B5)", "x":10, "y":4.5}, - {"label":"K4A (E6, B6)", "x":11, "y":4.5}, - {"label":"K4B (E6, C6)", "x":12, "y":4.5}, - {"label":"K4C (E6, C7)", "x":13, "y":4.5}, - {"label":"K4D (E6, F7)", "x":14, "y":4.5} + {"matrix": [3, 1], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3.5}, + {"matrix": [3, 3], "x": 3.25, "y": 3.5}, + {"matrix": [3, 4], "x": 4.25, "y": 3.5}, + {"matrix": [3, 5], "x": 5.25, "y": 3.5}, + {"matrix": [3, 6], "x": 6.25, "y": 3.5}, + {"matrix": [3, 7], "x": 7.25, "y": 3.5}, + {"matrix": [3, 8], "x": 8.25, "y": 3.5}, + {"matrix": [3, 9], "x": 9.25, "y": 3.5}, + {"matrix": [3, 10], "x": 10.25, "y": 3.5}, + {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 12], "x": 13, "y": 3.5}, + {"matrix": [3, 13], "x": 14, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4.5, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4.5}, + {"matrix": [4, 10], "x": 11, "y": 4.5}, + {"matrix": [4, 11], "x": 12, "y": 4.5}, + {"matrix": [4, 12], "x": 13, "y": 4.5}, + {"matrix": [4, 13], "x": 14, "y": 4.5} ] } } diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c index 499edf6e5ff7..26afae87ae14 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" led_config_t g_led_config = { { { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 }, diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h deleted file mode 100644 index 8ace666aac39..000000000000 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev1/rev1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 bdtc123 - * Copyright 2021 peepeetee - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K21, K43, K44, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { KC_NO, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, K41, K42, K43, K44, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \ -} - diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json index dde62eea4c9d..2d2f4d6ef56d 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/info.json @@ -30,76 +30,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, - {"x":1, "y":0.5}, - {"x":2, "y":0.5}, - {"x":3, "y":0.5}, - {"x":4, "y":0.5}, - {"x":5, "y":0.5}, - {"x":6, "y":0.5}, - {"x":7, "y":0.5}, - {"x":8, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.5}, - {"x":11, "y":0.5}, - {"x":12, "y":0.5}, - {"x":13, "y":0.5}, - {"x":14, "y":0.5}, - {"x":13.9, "y":0, "w":0.6, "h":0.5}, - {"x":14.5, "y":0, "w":0.6, "h":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0.5}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, + {"matrix": [0, 7], "x": 7, "y": 0.5}, + {"matrix": [0, 8], "x": 8, "y": 0.5}, + {"matrix": [0, 9], "x": 9, "y": 0.5}, + {"matrix": [0, 10], "x": 10, "y": 0.5}, + {"matrix": [0, 11], "x": 11, "y": 0.5}, + {"matrix": [0, 12], "x": 12, "y": 0.5}, + {"matrix": [0, 13], "x": 13, "y": 0.5}, + {"matrix": [2, 12], "x": 14, "y": 0.5}, - {"x":0, "y":1.5, "w":1.5}, - {"x":1.5, "y":1.5}, - {"x":2.5, "y":1.5}, - {"x":3.5, "y":1.5}, - {"x":4.5, "y":1.5}, - {"x":5.5, "y":1.5}, - {"x":6.5, "y":1.5}, - {"x":7.5, "y":1.5}, - {"x":8.5, "y":1.5}, - {"x":9.5, "y":1.5}, - {"x":10.5, "y":1.5}, - {"x":11.5, "y":1.5}, - {"x":12.5, "y":1.5}, - {"x":13.5, "y":1.5, "w":1.5}, + {"matrix": [4, 3], "x": 13.9, "y": 0, "w": 0.6, "h": 0.5}, + {"matrix": [4, 4], "x": 14.5, "y": 0, "w": 0.6, "h": 0.5}, - {"x":0, "y":2.5, "w":1.75}, - {"x":1.75, "y":2.5}, - {"x":2.75, "y":2.5}, - {"x":3.75, "y":2.5}, - {"x":4.75, "y":2.5}, - {"x":5.75, "y":2.5}, - {"x":6.75, "y":2.5}, - {"x":7.75, "y":2.5}, - {"x":8.75, "y":2.5}, - {"x":9.75, "y":2.5}, - {"x":10.75, "y":2.5}, - {"x":11.75, "y":2.5}, - {"x":12.75, "y":2.5, "w":2.25}, + {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + {"matrix": [1, 13], "x": 13.5, "y": 1.5, "w": 1.5}, - {"x":0, "y":3.5, "w":2.25}, - {"x":2.25, "y":3.5}, - {"x":3.25, "y":3.5}, - {"x":4.25, "y":3.5}, - {"x":5.25, "y":3.5}, - {"x":6.25, "y":3.5}, - {"x":7.25, "y":3.5}, - {"x":8.25, "y":3.5}, - {"x":9.25, "y":3.5}, - {"x":10.25, "y":3.5}, - {"x":11.25, "y":3.5, "w":1.75}, - {"x":13, "y":3.5}, - {"x":14, "y":3.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2.5}, + {"matrix": [2, 2], "x": 2.75, "y": 2.5}, + {"matrix": [2, 3], "x": 3.75, "y": 2.5}, + {"matrix": [2, 4], "x": 4.75, "y": 2.5}, + {"matrix": [2, 5], "x": 5.75, "y": 2.5}, + {"matrix": [2, 6], "x": 6.75, "y": 2.5}, + {"matrix": [2, 7], "x": 7.75, "y": 2.5}, + {"matrix": [2, 8], "x": 8.75, "y": 2.5}, + {"matrix": [2, 9], "x": 9.75, "y": 2.5}, + {"matrix": [2, 10], "x": 10.75, "y": 2.5}, + {"matrix": [2, 11], "x": 11.75, "y": 2.5}, + {"matrix": [2, 13], "x": 12.75, "y": 2.5, "w": 2.25}, - {"x":0, "y":4.5, "w":1.25}, - {"x":1.25, "y":4.5, "w":1.25}, - {"x":2.5, "y":4.5, "w":1.25}, - {"x":3.75, "y":4.5, "w":6.25}, - {"x":10, "y":4.5}, - {"x":11, "y":4.5}, - {"x":12, "y":4.5}, - {"x":13, "y":4.5}, - {"x":14, "y":4.5} + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.25, "y": 3.5}, + {"matrix": [3, 3], "x": 4.25, "y": 3.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.5}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, + {"matrix": [3, 6], "x": 7.25, "y": 3.5}, + {"matrix": [3, 7], "x": 8.25, "y": 3.5}, + {"matrix": [3, 8], "x": 9.25, "y": 3.5}, + {"matrix": [3, 9], "x": 10.25, "y": 3.5}, + {"matrix": [3, 11], "x": 11.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 12], "x": 13, "y": 3.5}, + {"matrix": [3, 13], "x": 14, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4.5, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4.5}, + {"matrix": [4, 10], "x": 11, "y": 4.5}, + {"matrix": [4, 11], "x": 12, "y": 4.5}, + {"matrix": [4, 12], "x": 13, "y": 4.5}, + {"matrix": [4, 13], "x": 14, "y": 4.5} ] } } diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c index 001debe1281b..e738b47c4072 100644 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c +++ b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.c @@ -12,7 +12,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rev2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h b/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h deleted file mode 100644 index 47da353b6ce4..000000000000 --- a/keyboards/kprepublic/bm60hsrgb_ec/rev2/rev2.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 bdtc123 - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2C, K43, K44, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3B, K3C, K3D, \ - K40, K41, K42, K45, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, KC_NO, K3B, K3C, K3D }, \ - { K40, K41, K42, K43, K44, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \ -} - - - - diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json index 0148d1ef5344..800ff0de3115 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/info.json @@ -21,73 +21,80 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", + "layout_aliases": { + "LAYOUT": "LAYOUT_60_iso_arrow" + }, "layouts": { "LAYOUT_60_iso_arrow": { "layout": [ - {"label":"K00 (B0,D0)", "x":0, "y":0}, - {"label":"K01 (B0,D1)", "x":1, "y":0}, - {"label":"K02 (B0,D2)", "x":2, "y":0}, - {"label":"K03 (B0,D3)", "x":3, "y":0}, - {"label":"K04 (B0,D5)", "x":4, "y":0}, - {"label":"K05 (B0,D4)", "x":5, "y":0}, - {"label":"K06 (B0,D6)", "x":6, "y":0}, - {"label":"K07 (B0,D7)", "x":7, "y":0}, - {"label":"K08 (B0,B4)", "x":8, "y":0}, - {"label":"K09 (B0,B5)", "x":9, "y":0}, - {"label":"K0A (B0,B6)", "x":10, "y":0}, - {"label":"K0B (B0,C6)", "x":11, "y":0}, - {"label":"K0C (B0,C7)", "x":12, "y":0}, - {"label":"K0D (B0,F7)", "x":13, "y":0, "w":2}, - {"label":"K10 (B1,D0)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,D1)", "x":1.5, "y":1}, - {"label":"K12 (B1,D2)", "x":2.5, "y":1}, - {"label":"K13 (B1,D3)", "x":3.5, "y":1}, - {"label":"K14 (B1,D5)", "x":4.5, "y":1}, - {"label":"K15 (B1,D4)", "x":5.5, "y":1}, - {"label":"K16 (B1,D6)", "x":6.5, "y":1}, - {"label":"K17 (B1,D7)", "x":7.5, "y":1}, - {"label":"K18 (B1,B4)", "x":8.5, "y":1}, - {"label":"K19 (B1,B5)", "x":9.5, "y":1}, - {"label":"K1A (B1,B6)", "x":10.5, "y":1}, - {"label":"K1B (B1,C6)", "x":11.5, "y":1}, - {"label":"K1C (B1,C7)", "x":12.5, "y":1}, - {"label":"K20 (B2,D0)", "x":0, "y":2, "w":1.75}, - {"label":"K22 (B2,D2)", "x":1.75, "y":2}, - {"label":"K23 (B2,D3)", "x":2.75, "y":2}, - {"label":"K24 (B2,D5)", "x":3.75, "y":2}, - {"label":"K25 (B2,D4)", "x":4.75, "y":2}, - {"label":"K26 (B2,D6)", "x":5.75, "y":2}, - {"label":"K27 (B2,D7)", "x":6.75, "y":2}, - {"label":"K28 (B2,B4)", "x":7.75, "y":2}, - {"label":"K29 (B2,B5)", "x":8.75, "y":2}, - {"label":"K2A (B2,B6)", "x":9.75, "y":2}, - {"label":"K2B (B2,C6)", "x":10.75, "y":2}, - {"label":"K2C (B2,C7)", "x":11.75, "y":2}, - {"label":"K2D (B2,F7)", "x":12.75, "y":2}, - {"label":"K1D (B1,F7)", "x":13.75, "y":1, "w":1.25, "h":2}, - {"label":"K30 (B3,D0)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (B3,D1)", "x":1.25, "y":3}, - {"label":"K32 (B3,D2)", "x":2.25, "y":3}, - {"label":"K33 (B3,D3)", "x":3.25, "y":3}, - {"label":"K34 (B3,D5)", "x":4.25, "y":3}, - {"label":"K35 (B3,D4)", "x":5.25, "y":3}, - {"label":"K36 (B3,D6)", "x":6.25, "y":3}, - {"label":"K37 (B3,D7)", "x":7.25, "y":3}, - {"label":"K38 (B3,B4)", "x":8.25, "y":3}, - {"label":"K39 (B3,B5)", "x":9.25, "y":3}, - {"label":"K3A (B3,B6)", "x":10.25, "y":3}, - {"label":"K3B (B3,C6)", "x":11.25, "y":3, "w":1.75}, - {"label":"K3C (B3,C7)", "x":13, "y":3}, - {"label":"K3D (B3,F7)", "x":14, "y":3}, - {"label":"K40 (E6,D0)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (E6,D1)", "x":1.25, "y":4, "w":1.25}, - {"label":"K42 (E6,D2)", "x":2.5, "y":4, "w":1.25}, - {"label":"K46 (E6,D6)", "x":3.75, "y":4, "w":6.25}, - {"label":"K49 (E6,B5)", "x":10, "y":4}, - {"label":"K4A (E6,B6)", "x":11, "y":4}, - {"label":"K4B (E6,C6)", "x":12, "y":4}, - {"label":"K4C (E6,C7)", "x":13, "y":4}, - {"label":"K4D (E6,F7)", "x":14, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [1, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c index f708e74c27c9..80bc2e2283bd 100644 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c +++ b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" #if defined(RGB_MATRIX_ENABLE) led_config_t g_led_config = { { diff --git a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h b/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h deleted file mode 100644 index fce8925a7a65..000000000000 --- a/keyboards/kprepublic/bm60hsrgb_iso/rev1/rev1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 markva - * - * 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_60_iso_arrow( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K1D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, K4B, K4C, K4D }, \ -} - -#define LAYOUT LAYOUT_60_iso_arrow diff --git a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c index 4aad7af0f14e..12475ac36b17 100644 --- a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c +++ b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.c @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "bm980hsrgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h b/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h deleted file mode 100644 index 042f4ee4a541..000000000000 --- a/keyboards/kprepublic/bm980hsrgb/bm980hsrgb.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 bdtc123 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K6D, K6A, K66, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K6B, K69, K62, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K63, K64, K65, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K68, K67, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K58, K57, K55, \ - K50, K51, K52, K56, K59, K5A, K5B, K5C, K5D, K5E, K53, K54 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E }, \ - { KC_NO, KC_NO, K62, K63, K64, K65, K66, K67, K68, K69, K6A, K6B, KC_NO, K6D, KC_NO }, \ -} diff --git a/keyboards/kprepublic/bm980hsrgb/info.json b/keyboards/kprepublic/bm980hsrgb/info.json index 46ab7e42aa96..badd7d6458fc 100644 --- a/keyboards/kprepublic/bm980hsrgb/info.json +++ b/keyboards/kprepublic/bm980hsrgb/info.json @@ -30,104 +30,120 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D4,B1)", "x":0, "y":0}, - {"label":"K01 (D4,B2)", "x":2, "y":0}, - {"label":"K02 (D4,B3)", "x":3, "y":0}, - {"label":"K03 (D4,B7)", "x":4, "y":0}, - {"label":"K04 (D4,D0)", "x":5, "y":0}, - {"label":"K05 (D4,D1)", "x":6.5, "y":0}, - {"label":"K06 (D4,D2)", "x":7.5, "y":0}, - {"label":"K07 (D4,D3)", "x":8.5, "y":0}, - {"label":"K08 (D4,D5)", "x":9.5, "y":0}, - {"label":"K09 (D4,E6)", "x":11, "y":0}, - {"label":"K0A (D4,F0)", "x":12, "y":0}, - {"label":"K0B (D4,F1)", "x":13, "y":0}, - {"label":"K0C (D4,F4)", "x":14, "y":0}, - {"label":"K0E (D4,D6)", "x":15.5, "y":0}, - {"label":"K6D (D7,F5)", "x":16.5, "y":0}, - {"label":"K6A (D7,F0)", "x":17.5, "y":0}, - {"label":"K66 (D7,D2)", "x":18.5, "y":0}, - {"label":"K10 (B6,B1)", "x":0, "y":1.5}, - {"label":"K11 (B6,B2)", "x":1, "y":1.5}, - {"label":"K12 (B6,B3)", "x":2, "y":1.5}, - {"label":"K13 (B6,B7)", "x":3, "y":1.5}, - {"label":"K14 (B6,D0)", "x":4, "y":1.5}, - {"label":"K15 (B6,D1)", "x":5, "y":1.5}, - {"label":"K16 (B6,D2)", "x":6, "y":1.5}, - {"label":"K17 (B6,D3)", "x":7, "y":1.5}, - {"label":"K18 (B6,D5)", "x":8, "y":1.5}, - {"label":"K19 (B6,E6)", "x":9, "y":1.5}, - {"label":"K1A (B6,F0)", "x":10, "y":1.5}, - {"label":"K1B (B6,F1)", "x":11, "y":1.5}, - {"label":"K1C (B6,F4)", "x":12, "y":1.5}, - {"label":"K1D (B6,F5)", "x":13, "y":1.5, "w":2}, - {"label":"K1E (B6,D6)", "x":15.5, "y":1.5}, - {"label":"K6B (D7,F1)", "x":16.5, "y":1.5}, - {"label":"K69 (D7,E6)", "x":17.5, "y":1.5}, - {"label":"K62 (D7,B3)", "x":18.5, "y":1.5}, - {"label":"K20 (B5,B1)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B5,B2)", "x":1.5, "y":2.5}, - {"label":"K22 (B5,B3)", "x":2.5, "y":2.5}, - {"label":"K23 (B5,B7)", "x":3.5, "y":2.5}, - {"label":"K24 (B5,D0)", "x":4.5, "y":2.5}, - {"label":"K25 (B5,D1)", "x":5.5, "y":2.5}, - {"label":"K26 (B5,D2)", "x":6.5, "y":2.5}, - {"label":"K27 (B5,D3)", "x":7.5, "y":2.5}, - {"label":"K28 (B5,D5)", "x":8.5, "y":2.5}, - {"label":"K29 (B5,E6)", "x":9.5, "y":2.5}, - {"label":"K2A (B5,F0)", "x":10.5, "y":2.5}, - {"label":"K2B (B5,F1)", "x":11.5, "y":2.5}, - {"label":"K2C (B5,F4)", "x":12.5, "y":2.5}, - {"label":"K2D (B5,F5)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K2E (B5,D6)", "x":15.5, "y":2.5}, - {"label":"K63 (D7,B7)", "x":16.5, "y":2.5}, - {"label":"K64 (D7,D0)", "x":17.5, "y":2.5}, - {"label":"K65 (D7,D1)", "x":18.5, "y":2.5, "h":2}, - {"label":"K30 (B4,B1)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B4,B2)", "x":1.75, "y":3.5}, - {"label":"K32 (B4,B3)", "x":2.75, "y":3.5}, - {"label":"K33 (B4,B7)", "x":3.75, "y":3.5}, - {"label":"K34 (B4,D0)", "x":4.75, "y":3.5}, - {"label":"K35 (B4,D1)", "x":5.75, "y":3.5}, - {"label":"K36 (B4,D2)", "x":6.75, "y":3.5}, - {"label":"K37 (B4,D3)", "x":7.75, "y":3.5}, - {"label":"K38 (B4,D5)", "x":8.75, "y":3.5}, - {"label":"K39 (B4,E6)", "x":9.75, "y":3.5}, - {"label":"K3A (B4,F0)", "x":10.75, "y":3.5}, - {"label":"K3B (B4,F1)", "x":11.75, "y":3.5}, - {"label":"K3D (B4,F5)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K3E (B4,D6)", "x":15.5, "y":3.5}, - {"label":"K68 (D7,D5)", "x":16.5, "y":3.5}, - {"label":"K67 (D7,D3)", "x":17.5, "y":3.5}, - {"label":"K40 (F7,B1)", "x":0, "y":4.5, "w":2.25}, - {"label":"K42 (F7,B3)", "x":2.25, "y":4.5}, - {"label":"K43 (F7,B7)", "x":3.25, "y":4.5}, - {"label":"K44 (F7,D0)", "x":4.25, "y":4.5}, - {"label":"K45 (F7,D1)", "x":5.25, "y":4.5}, - {"label":"K46 (F7,D2)", "x":6.25, "y":4.5}, - {"label":"K47 (F7,D3)", "x":7.25, "y":4.5}, - {"label":"K48 (F7,D5)", "x":8.25, "y":4.5}, - {"label":"K49 (F7,E6)", "x":9.25, "y":4.5}, - {"label":"K4A (F7,F0)", "x":10.25, "y":4.5}, - {"label":"K4B (F7,F1)", "x":11.25, "y":4.5}, - {"label":"K4C (F7,F4)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K4D (F7,F5)", "x":14.25, "y":4.75}, - {"label":"K4E (F7,D6)", "x":15.5, "y":4.5}, - {"label":"K58 (F6,D5)", "x":16.5, "y":4.5}, - {"label":"K57 (F6,D3)", "x":17.5, "y":4.5}, - {"label":"K55 (F6,D1)", "x":18.5, "y":4.5, "h":2}, - {"label":"K50 (F6,B1)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (F6,B2)", "x":1.25, "y":5.5,"w":1.25}, - {"label":"K52 (F6,B3)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (F6,D2)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K59 (F6,E6)", "x":10, "y":5.5}, - {"label":"K5A (F6,F0)", "x":11, "y":5.5}, - {"label":"K5B (F6,F1)", "x":12, "y":5.5}, - {"label":"K5C (F6,F4)", "x":13.25, "y":5.75}, - {"label":"K5D (F6,F5)", "x":14.25, "y":5.75}, - {"label":"K5E (F6,D6)", "x":15.25, "y":5.75}, - {"label":"K53 (F6,B7)", "x":16.5, "y":5.5}, - {"label":"K54 (F6,D0)", "x":17.5, "y":5.5} + {"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.5, "y": 0}, + {"matrix": [6, 13], "x": 16.5, "y": 0}, + {"matrix": [6, 10], "x": 17.5, "y": 0}, + {"matrix": [6, 6], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.5, "y": 1.5}, + {"matrix": [6, 11], "x": 16.5, "y": 1.5}, + {"matrix": [6, 9], "x": 17.5, "y": 1.5}, + {"matrix": [6, 2], "x": 18.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 2.5}, + {"matrix": [6, 3], "x": 16.5, "y": 2.5}, + {"matrix": [6, 4], "x": 17.5, "y": 2.5}, + {"matrix": [6, 5], "x": 18.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 3.5}, + {"matrix": [6, 8], "x": 16.5, "y": 3.5}, + {"matrix": [6, 7], "x": 17.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.75}, + + {"matrix": [4, 14], "x": 15.5, "y": 4.5}, + {"matrix": [5, 8], "x": 16.5, "y": 4.5}, + {"matrix": [5, 7], "x": 17.5, "y": 4.5}, + {"matrix": [5, 5], "x": 18.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5}, + {"matrix": [5, 10], "x": 11, "y": 5.5}, + {"matrix": [5, 11], "x": 12, "y": 5.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.75}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + + {"matrix": [5, 3], "x": 16.5, "y": 5.5}, + {"matrix": [5, 4], "x": 17.5, "y": 5.5} ] } } diff --git a/keyboards/kudox/columner/columner.h b/keyboards/kudox/columner/columner.h deleted file mode 100644 index dcc745ddb799..000000000000 --- a/keyboards/kudox/columner/columner.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/kudox/columner/info.json b/keyboards/kudox/columner/info.json index 75d5c77bc8d9..7c106b14484b 100644 --- a/keyboards/kudox/columner/info.json +++ b/keyboards/kudox/columner/info.json @@ -24,72 +24,81 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.5, "w":1.25}, - {"label":"1", "x":1.25, "y":0.5}, - {"label":"2", "x":2.25, "y":0.25}, - {"label":"3", "x":3.25, "y":0}, - {"label":"4", "x":4.25, "y":0.25}, - {"label":"5", "x":5.25, "y":0.5}, - {"label":"{", "x":6.25, "y":1.25, "h":1.25}, - {"label":"}", "x":10, "y":1.25, "h":1.25}, - {"label":"6", "x":11, "y":0.5}, - {"label":"7", "x":12, "y":0.25}, - {"label":"8", "x":13, "y":0}, - {"label":"9", "x":14, "y":0.25}, - {"label":"0", "x":15, "y":0.5}, - {"label":"\u2190", "x":16, "y":0.5, "w":1.25}, - {"label":"Tab", "x":0, "y":1.5, "w":1.25}, - {"label":"Q", "x":1.25, "y":1.5}, - {"label":"W", "x":2.25, "y":1.25}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1.25}, - {"label":"T", "x":5.25, "y":1.5}, - {"label":"-", "x":6.25, "y":2.5, "h":1.25}, - {"label":"=", "x":10, "y":2.5, "h":1.25}, - {"label":"Y", "x":11, "y":1.5}, - {"label":"U", "x":12, "y":1.25}, - {"label":"I", "x":13, "y":1}, - {"label":"O", "x":14, "y":1.25}, - {"label":"P", "x":15, "y":1.5}, - {"label":"\\", "x":16, "y":1.5, "w":1.25}, - {"label":"Ctrl", "x":0, "y":2.5, "w":1.25}, - {"label":"A", "x":1.25, "y":2.5}, - {"label":"S", "x":2.25, "y":2.25}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2.25}, - {"label":"G", "x":5.25, "y":2.5}, - {"label":"H", "x":11, "y":2.5}, - {"label":"J", "x":12, "y":2.25}, - {"label":"K", "x":13, "y":2}, - {"label":"L", "x":14, "y":2.25}, - {"label":";", "x":15, "y":2.5}, - {"label":"Enter", "x":16, "y":2.5, "w":1.25}, - {"label":"Shift", "x":0, "y":3.5, "w":1.25}, - {"label":"Z", "x":1.25, "y":3.5}, - {"label":"X", "x":2.25, "y":3.25}, - {"label":"C", "x":3.25, "y":3}, - {"label":"V", "x":4.25, "y":3.25}, - {"label":"B", "x":5.25, "y":3.5}, - {"label":"N", "x":11, "y":3.5}, - {"label":"M", "x":12, "y":3.25}, - {"label":",", "x":13, "y":3}, - {"label":".", "x":14, "y":3.25}, - {"label":"/", "x":15, "y":3.5}, - {"label":"Shift", "x":16, "y":3.5, "w":1.25}, - {"label":"Alt", "x":0, "y":4.5, "w":1.25}, - {"label":"'", "x":1.25, "y":4.5}, - {"label":"~", "x":2.25, "y":4.25}, - {"label":"Del", "x":3.25, "y":4}, - {"label":"LANG2", "x":4.25, "y":4.5}, - {"label":"GUI", "x":5.25, "y":4.75}, - {"label":"Space", "x":6.25, "y":5}, - {"label":"Space", "x":10, "y":5}, - {"label":"GUI", "x":11, "y":4.75}, - {"label":"LANG1", "x":12, "y":4.5}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4.25}, - {"label":"\u2191", "x":15, "y":4.5}, - {"label":"\u2192", "x":16, "y":4.5, "w":1.25} + {"matrix": [0, 0], "x": 0, "y": 0.5, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0.5}, + {"matrix": [0, 2], "x": 2.25, "y": 0.25}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0.25}, + {"matrix": [0, 5], "x": 5.25, "y": 0.5}, + {"matrix": [0, 6], "x": 6.25, "y": 1.25, "h": 1.25}, + + {"matrix": [5, 6], "x": 10, "y": 1.25, "h": 1.25}, + {"matrix": [5, 5], "x": 11, "y": 0.5}, + {"matrix": [5, 4], "x": 12, "y": 0.25}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0.25}, + {"matrix": [5, 1], "x": 15, "y": 0.5}, + {"matrix": [5, 0], "x": 16, "y": 0.5, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1.5, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1.5}, + {"matrix": [1, 2], "x": 2.25, "y": 1.25}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1.25}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, + {"matrix": [1, 6], "x": 6.25, "y": 2.5, "h": 1.25}, + + {"matrix": [6, 6], "x": 10, "y": 2.5, "h": 1.25}, + {"matrix": [6, 5], "x": 11, "y": 1.5}, + {"matrix": [6, 4], "x": 12, "y": 1.25}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1.25}, + {"matrix": [6, 1], "x": 15, "y": 1.5}, + {"matrix": [6, 0], "x": 16, "y": 1.5, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.5}, + {"matrix": [2, 2], "x": 2.25, "y": 2.25}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25}, + {"matrix": [2, 5], "x": 5.25, "y": 2.5}, + + {"matrix": [7, 5], "x": 11, "y": 2.5}, + {"matrix": [7, 4], "x": 12, "y": 2.25}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2.25}, + {"matrix": [7, 1], "x": 15, "y": 2.5}, + {"matrix": [7, 0], "x": 16, "y": 2.5, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.5}, + {"matrix": [3, 2], "x": 2.25, "y": 3.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3.25}, + {"matrix": [3, 5], "x": 5.25, "y": 3.5}, + + {"matrix": [8, 5], "x": 11, "y": 3.5}, + {"matrix": [8, 4], "x": 12, "y": 3.25}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3.25}, + {"matrix": [8, 1], "x": 15, "y": 3.5}, + {"matrix": [8, 0], "x": 16, "y": 3.5, "w": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.75}, + {"matrix": [4, 6], "x": 6.25, "y": 5}, + + {"matrix": [9, 6], "x": 10, "y": 5}, + {"matrix": [9, 5], "x": 11, "y": 4.75}, + {"matrix": [9, 4], "x": 12, "y": 4.5}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4.25}, + {"matrix": [9, 1], "x": 15, "y": 4.5}, + {"matrix": [9, 0], "x": 16, "y": 4.5, "w": 1.25} ] } } diff --git a/keyboards/kudox/rev1/info.json b/keyboards/kudox/rev1/info.json index c5a942793370..efb55bb98959 100644 --- a/keyboards/kudox/rev1/info.json +++ b/keyboards/kudox/rev1/info.json @@ -24,70 +24,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":11, "y":0}, - {"label":"7", "x":12, "y":0}, - {"label":"8", "x":13, "y":0}, - {"label":"9", "x":14, "y":0}, - {"label":"0", "x":15, "y":0}, - {"label":"\u2190", "x":16, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"Q", "x":1.25, "y":1}, - {"label":"W", "x":2.25, "y":1}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1}, - {"label":"T", "x":5.25, "y":1}, - {"label":"LANG2", "x":6.25, "y":1}, - {"label":"Y", "x":9.75, "y":1}, - {"label":"U", "x":10.75, "y":1}, - {"label":"I", "x":11.75, "y":1}, - {"label":"O", "x":12.75, "y":1}, - {"label":"P", "x":13.75, "y":1}, - {"label":"/", "x":14.75, "y":1}, - {"label":"\\", "x":15.75, "y":1, "w":1.25}, - {"label":"Ctrl", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":10.25, "y":2}, - {"label":"J", "x":11.25, "y":2}, - {"label":"K", "x":12.25, "y":2}, - {"label":"L", "x":13.25, "y":2}, - {"label":";", "x":14.25, "y":2}, - {"label":"Enter", "x":15.25, "y":2, "w":1.75}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"LANG1", "x":9.75, "y":3}, - {"label":"N", "x":10.75, "y":3}, - {"label":"M", "x":11.75, "y":3}, - {"label":",", "x":12.75, "y":3}, - {"label":".", "x":13.75, "y":3}, - {"label":"Shift", "x":14.75, "y":3, "w":2.25}, - {"label":"Alt", "x":0, "y":4, "w":1.25}, - {"label":"'", "x":1.25, "y":4}, - {"label":"-", "x":2.25, "y":4}, - {"label":"=", "x":3.25, "y":4}, - {"label":"layer", "x":4.25, "y":4.33, "w":1.25}, - {"label":"GUI", "x":5.5, "y":4.67}, - {"label":"Space", "x":6.5, "y":5}, - {"label":"Enter", "x":9.5, "y":5}, - {"label":"Del", "x":10.5, "y":4.67}, - {"label":"layer", "x":11.5, "y":4.33, "w":1.25}, - {"label":"\u2190", "x":12.75, "y":4}, - {"label":"\u2193", "x":13.75, "y":4}, - {"label":"\u2191", "x":14.75, "y":4}, - {"label":"\u2192", "x":15.75, "y":4, "w":1.25} + {"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": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + + {"matrix": [6, 6], "x": 9.75, "y": 1}, + {"matrix": [6, 5], "x": 10.75, "y": 1}, + {"matrix": [6, 4], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 2], "x": 13.75, "y": 1}, + {"matrix": [6, 1], "x": 14.75, "y": 1}, + {"matrix": [6, 0], "x": 15.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 5], "x": 10.25, "y": 2}, + {"matrix": [7, 4], "x": 11.25, "y": 2}, + {"matrix": [7, 3], "x": 12.25, "y": 2}, + {"matrix": [7, 2], "x": 13.25, "y": 2}, + {"matrix": [7, 1], "x": 14.25, "y": 2}, + {"matrix": [7, 0], "x": 15.25, "y": 2, "w": 1.75}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 5], "x": 9.75, "y": 3}, + {"matrix": [8, 4], "x": 10.75, "y": 3}, + {"matrix": [8, 3], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 1], "x": 13.75, "y": 3}, + {"matrix": [8, 0], "x": 14.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4.33, "w": 1.25}, + {"matrix": [4, 5], "x": 5.5, "y": 4.67}, + {"matrix": [4, 6], "x": 6.5, "y": 5}, + + {"matrix": [9, 6], "x": 9.5, "y": 5}, + {"matrix": [9, 5], "x": 10.5, "y": 4.67}, + {"matrix": [9, 4], "x": 11.5, "y": 4.33, "w": 1.25}, + {"matrix": [9, 3], "x": 12.75, "y": 4}, + {"matrix": [9, 2], "x": 13.75, "y": 4}, + {"matrix": [9, 1], "x": 14.75, "y": 4}, + {"matrix": [9, 0], "x": 15.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/kudox/rev1/rev1.h b/keyboards/kudox/rev1/rev1.h deleted file mode 100644 index 82373daa6f04..000000000000 --- a/keyboards/kudox/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/kudox/rev2/info.json b/keyboards/kudox/rev2/info.json index 858f28988d30..9dab738c3889 100644 --- a/keyboards/kudox/rev2/info.json +++ b/keyboards/kudox/rev2/info.json @@ -24,72 +24,81 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"`", "x":6, "y":0}, - {"label":"6", "x":10, "y":0}, - {"label":"7", "x":11, "y":0}, - {"label":"8", "x":12, "y":0}, - {"label":"9", "x":13, "y":0}, - {"label":"0", "x":14, "y":0}, - {"label":"-", "x":15, "y":0}, - {"label":"\u2190", "x":16, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"Q", "x":1.25, "y":1}, - {"label":"W", "x":2.25, "y":1}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1}, - {"label":"T", "x":5.25, "y":1}, - {"label":"LANG2", "x":6.25, "y":1}, - {"label":"Y", "x":9.75, "y":1}, - {"label":"U", "x":10.75, "y":1}, - {"label":"I", "x":11.75, "y":1}, - {"label":"O", "x":12.75, "y":1}, - {"label":"P", "x":13.75, "y":1}, - {"label":"/", "x":14.75, "y":1}, - {"label":"\\", "x":15.75, "y":1, "w":1.25}, - {"label":"Ctrl", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":10.25, "y":2}, - {"label":"J", "x":11.25, "y":2}, - {"label":"K", "x":12.25, "y":2}, - {"label":"L", "x":13.25, "y":2}, - {"label":";", "x":14.25, "y":2}, - {"label":"Enter", "x":15.25, "y":2, "w":1.75}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"LANG1", "x":9.75, "y":3}, - {"label":"N", "x":10.75, "y":3}, - {"label":"M", "x":11.75, "y":3}, - {"label":",", "x":12.75, "y":3}, - {"label":".", "x":13.75, "y":3}, - {"label":"Shift", "x":14.75, "y":3, "w":2.25}, - {"label":"Alt", "x":0, "y":4, "w":1.25}, - {"label":"'", "x":1.25, "y":4}, - {"label":"-", "x":2.25, "y":4}, - {"label":"=", "x":3.25, "y":4}, - {"label":"layer", "x":4.25, "y":4.33, "w":1.25}, - {"label":"GUI", "x":5.5, "y":4.67}, - {"label":"Space", "x":6.5, "y":5}, - {"label":"Enter", "x":9.5, "y":5}, - {"label":"Del", "x":10.5, "y":4.67}, - {"label":"layer", "x":11.5, "y":4.33, "w":1.25}, - {"label":"\u2190", "x":12.75, "y":4}, - {"label":"\u2193", "x":13.75, "y":4}, - {"label":"\u2191", "x":14.75, "y":4}, - {"label":"\u2192", "x":15.75, "y":4, "w":1.25} + {"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": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + + {"matrix": [6, 6], "x": 9.75, "y": 1}, + {"matrix": [6, 5], "x": 10.75, "y": 1}, + {"matrix": [6, 4], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 2], "x": 13.75, "y": 1}, + {"matrix": [6, 1], "x": 14.75, "y": 1}, + {"matrix": [6, 0], "x": 15.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 5], "x": 10.25, "y": 2}, + {"matrix": [7, 4], "x": 11.25, "y": 2}, + {"matrix": [7, 3], "x": 12.25, "y": 2}, + {"matrix": [7, 2], "x": 13.25, "y": 2}, + {"matrix": [7, 1], "x": 14.25, "y": 2}, + {"matrix": [7, 0], "x": 15.25, "y": 2, "w": 1.75}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 5], "x": 9.75, "y": 3}, + {"matrix": [8, 4], "x": 10.75, "y": 3}, + {"matrix": [8, 3], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 1], "x": 13.75, "y": 3}, + {"matrix": [8, 0], "x": 14.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4.33, "w": 1.25}, + {"matrix": [4, 5], "x": 5.5, "y": 4.67}, + {"matrix": [4, 6], "x": 6.5, "y": 5}, + + {"matrix": [9, 6], "x": 9.5, "y": 5}, + {"matrix": [9, 5], "x": 10.5, "y": 4.67}, + {"matrix": [9, 4], "x": 11.5, "y": 4.33, "w": 1.25}, + {"matrix": [9, 3], "x": 12.75, "y": 4}, + {"matrix": [9, 2], "x": 13.75, "y": 4}, + {"matrix": [9, 1], "x": 14.75, "y": 4}, + {"matrix": [9, 0], "x": 15.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/kudox/rev2/rev2.h b/keyboards/kudox/rev2/rev2.h deleted file mode 100644 index dcc745ddb799..000000000000 --- a/keyboards/kudox/rev2/rev2.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/kudox/rev3/info.json b/keyboards/kudox/rev3/info.json index d3abd78b62a8..a7e73c84ae75 100644 --- a/keyboards/kudox/rev3/info.json +++ b/keyboards/kudox/rev3/info.json @@ -24,72 +24,81 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":10, "y":0}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"-", "x":14, "y":0}, - {"label":"=", "x":15, "y":0}, - {"label":"\u2190", "x":16, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"Q", "x":1.25, "y":1}, - {"label":"W", "x":2.25, "y":1}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1}, - {"label":"T", "x":5.25, "y":1}, - {"label":"Esc", "x":6.25, "y":1}, - {"label":"Y", "x":9.75, "y":1}, - {"label":"U", "x":10.75, "y":1}, - {"label":"I", "x":11.75, "y":1}, - {"label":"O", "x":12.75, "y":1}, - {"label":"P", "x":13.75, "y":1}, - {"label":"'", "x":14.75, "y":1}, - {"label":"\\", "x":15.75, "y":1, "w":1.25}, - {"label":"Ctrl", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":10.25, "y":2}, - {"label":"J", "x":11.25, "y":2}, - {"label":"K", "x":12.25, "y":2}, - {"label":"L", "x":13.25, "y":2}, - {"label":";", "x":14.25, "y":2}, - {"label":"Enter", "x":15.25, "y":2, "w":1.75}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":9.75, "y":3}, - {"label":"M", "x":10.75, "y":3}, - {"label":",", "x":11.75, "y":3}, - {"label":".", "x":12.75, "y":3}, - {"label":"/", "x":13.75, "y":3}, - {"label":"Shift", "x":14.75, "y":3, "w":2.25}, - {"label":"Alt", "x":0, "y":4, "w":1.25}, - {"label":"[", "x":1.25, "y":4}, - {"label":"]", "x":2.25, "y":4}, - {"label":"LANG2", "x":3.25, "y":4}, - {"label":"Enter", "x":4.25, "y":4.33, "w":1.25}, - {"label":"GUI", "x":5.5, "y":4.67}, - {"label":"Space", "x":6.5, "y":5}, - {"label":"Space", "x":9.5, "y":5}, - {"label":"GUI", "x":10.5, "y":4.67}, - {"label":"LANG1", "x":11.5, "y":4.33, "w":1.25}, - {"label":"\u2190", "x":12.75, "y":4}, - {"label":"\u2193", "x":13.75, "y":4}, - {"label":"\u2191", "x":14.75, "y":4}, - {"label":"\u2192", "x":15.75, "y":4, "w":1.25} + {"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": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + + {"matrix": [6, 6], "x": 9.75, "y": 1}, + {"matrix": [6, 5], "x": 10.75, "y": 1}, + {"matrix": [6, 4], "x": 11.75, "y": 1}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 2], "x": 13.75, "y": 1}, + {"matrix": [6, 1], "x": 14.75, "y": 1}, + {"matrix": [6, 0], "x": 15.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 5], "x": 10.25, "y": 2}, + {"matrix": [7, 4], "x": 11.25, "y": 2}, + {"matrix": [7, 3], "x": 12.25, "y": 2}, + {"matrix": [7, 2], "x": 13.25, "y": 2}, + {"matrix": [7, 1], "x": 14.25, "y": 2}, + {"matrix": [7, 0], "x": 15.25, "y": 2, "w": 1.75}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 5], "x": 9.75, "y": 3}, + {"matrix": [8, 4], "x": 10.75, "y": 3}, + {"matrix": [8, 3], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3}, + {"matrix": [8, 1], "x": 13.75, "y": 3}, + {"matrix": [8, 0], "x": 14.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4.33, "w": 1.25}, + {"matrix": [4, 5], "x": 5.5, "y": 4.67}, + {"matrix": [4, 6], "x": 6.5, "y": 5}, + + {"matrix": [9, 6], "x": 9.5, "y": 5}, + {"matrix": [9, 5], "x": 10.5, "y": 4.67}, + {"matrix": [9, 4], "x": 11.5, "y": 4.33, "w": 1.25}, + {"matrix": [9, 3], "x": 12.75, "y": 4}, + {"matrix": [9, 2], "x": 13.75, "y": 4}, + {"matrix": [9, 1], "x": 14.75, "y": 4}, + {"matrix": [9, 0], "x": 15.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/kudox/rev3/rev3.h b/keyboards/kudox/rev3/rev3.h deleted file mode 100644 index dcc745ddb799..000000000000 --- a/keyboards/kudox/rev3/rev3.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/kudox_full/rev1/info.json b/keyboards/kudox_full/rev1/info.json index 98e109e24c57..45958b56c999 100644 --- a/keyboards/kudox_full/rev1/info.json +++ b/keyboards/kudox_full/rev1/info.json @@ -24,78 +24,89 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"6", "x":9, "y":0}, - {"label":"7", "x":10, "y":0}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"-", "x":14, "y":0}, - {"label":"=", "x":15, "y":0}, - {"label":"\u2190", "x":16, "y":0}, - {"label":"Del", "x":17, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"`", "x":6.5, "y":1}, - {"label":"Y", "x":9.5, "y":1}, - {"label":"U", "x":10.5, "y":1}, - {"label":"I", "x":11.5, "y":1}, - {"label":"O", "x":12.5, "y":1}, - {"label":"P", "x":13.5, "y":1}, - {"label":"[", "x":14.5, "y":1}, - {"label":"]", "x":15.5, "y":1}, - {"label":"\\", "x":16.5, "y":1, "w":1.5}, - {"label":"Ctrl", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":9.75, "y":2}, - {"label":"J", "x":10.75, "y":2}, - {"label":"K", "x":11.75, "y":2}, - {"label":"L", "x":12.75, "y":2}, - {"label":";", "x":13.75, "y":2}, - {"label":"'", "x":14.75, "y":2}, - {"label":"Enter", "x":15.75, "y":2}, - {"label":"Enter", "x":17, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"\u2191", "x":9.25, "y":3}, - {"label":"N", "x":10.25, "y":3}, - {"label":"M", "x":11.25, "y":3}, - {"label":",", "x":12.25, "y":3}, - {"label":".", "x":13.25, "y":3}, - {"label":"/", "x":14.25, "y":3}, - {"label":"Shift", "x":15.25, "y":3}, - {"label":"Shift", "x":16.25, "y":3}, - {"label":"\u2191", "x":17.5, "y":3}, - {"label":"Alt", "x":0, "y":4, "w":1.25}, - {"label":"Layer3", "x":1.5, "y":4}, - {"label":"Layer2", "x":2.5, "y":4}, - {"label":"Alt", "x":3.5, "y":4, "w":1.25}, - {"label":"GUI", "x":5, "y":4, "w":1.25}, - {"label":" ", "x":6.25, "y":4}, - {"label":"\u2193", "x":9, "y":4}, - {"label":"GUI", "x":10, "y":4}, - {"label":"Alt", "x":11, "y":4, "w":1.25}, - {"label":"\u2190", "x":16, "y":4}, - {"label":"\u2193", "x":17, "y":4}, - {"label":"\u2192", "x":18, "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": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + {"matrix": [5, 7], "x": 16, "y": 0}, + {"matrix": [5, 8], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 9.5, "y": 1}, + {"matrix": [6, 1], "x": 10.5, "y": 1}, + {"matrix": [6, 2], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 4], "x": 13.5, "y": 1}, + {"matrix": [6, 5], "x": 14.5, "y": 1}, + {"matrix": [6, 6], "x": 15.5, "y": 1}, + {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9.75, "y": 2}, + {"matrix": [7, 1], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 4], "x": 13.75, "y": 2}, + {"matrix": [7, 5], "x": 14.75, "y": 2}, + {"matrix": [7, 6], "x": 15.75, "y": 2}, + {"matrix": [7, 7], "x": 17, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 9.25, "y": 3}, + {"matrix": [8, 1], "x": 10.25, "y": 3}, + {"matrix": [8, 2], "x": 11.25, "y": 3}, + {"matrix": [8, 3], "x": 12.25, "y": 3}, + {"matrix": [8, 4], "x": 13.25, "y": 3}, + {"matrix": [8, 5], "x": 14.25, "y": 3}, + {"matrix": [8, 6], "x": 15.25, "y": 3}, + {"matrix": [8, 7], "x": 16.25, "y": 3}, + + {"matrix": [8, 8], "x": 17.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + + {"matrix": [9, 0], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4}, + {"matrix": [9, 2], "x": 11, "y": 4, "w": 1.25}, + + {"matrix": [9, 6], "x": 16, "y": 4}, + {"matrix": [9, 7], "x": 17, "y": 4}, + {"matrix": [9, 8], "x": 18, "y": 4} ] } } diff --git a/keyboards/kudox_full/rev1/rev1.h b/keyboards/kudox_full/rev1/rev1.h deleted file mode 100644 index 686941117e07..000000000000 --- a/keyboards/kudox_full/rev1/rev1.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2021 Kumao Kobo (@kumaokobo) -// SPDX-License-Identifier: GPL-2.0+ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, R38, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R46, R47, R48 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, R41, R42, KC_NO, KC_NO, KC_NO, R46, R47, R48 } \ -} diff --git a/keyboards/kudox_game/info.json b/keyboards/kudox_game/info.json index e927bb943943..6968b5e427e6 100644 --- a/keyboards/kudox_game/info.json +++ b/keyboards/kudox_game/info.json @@ -8,37 +8,5 @@ "pid": "0x9696" }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1.5, "y":0}, - {"label":"2", "x":2.5, "y":0}, - {"label":"3", "x":3.5, "y":0}, - {"label":"4", "x":4.5, "y":0}, - {"label":"5", "x":5.5, "y":0}, - {"label":"Q", "x":1.75, "y":1}, - {"label":"W", "x":2.75, "y":1}, - {"label":"E", "x":3.75, "y":1}, - {"label":"R", "x":4.75, "y":1}, - {"label":"T", "x":5.75, "y":1}, - {"label":"Ctrl-C", "x":0, "y":2}, - {"label":"Ctrl-V", "x":1, "y":2}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5.25, "y":2}, - {"label":"G", "x":6.25, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":1.5}, - {"label":"Z", "x":1.5, "y":3}, - {"label":"X", "x":3.75, "y":3}, - {"label":"C", "x":4.75, "y":3}, - {"label":"V", "x":5.75, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Layer", "x":5.5, "y":4.25, "h":1.5}, - {"x":6.5, "y":4.75, "h":2} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/kudox_game/rev1/info.json b/keyboards/kudox_game/rev1/info.json index d9fdf0ae351b..7868308eadb9 100644 --- a/keyboards/kudox_game/rev1/info.json +++ b/keyboards/kudox_game/rev1/info.json @@ -9,5 +9,42 @@ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5}, + {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2} + ] + } + } } diff --git a/keyboards/kudox_game/rev1/rev1.h b/keyboards/kudox_game/rev1/rev1.h deleted file mode 100644 index 52b30cf61b32..000000000000 --- a/keyboards/kudox_game/rev1/rev1.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, \ - k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, k26, \ - k30, k31, k34, k35, k36, \ - k40, k45, k46 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO }, \ - { KC_NO, k11, k12, k13, k14, k15, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, KC_NO, KC_NO, k34, k35, k36 }, \ - { k40, KC_NO, KC_NO, KC_NO, KC_NO, k45, k46 } \ -} diff --git a/keyboards/kudox_game/rev2/info.json b/keyboards/kudox_game/rev2/info.json index 23e30a71c5a3..4a441b73855e 100644 --- a/keyboards/kudox_game/rev2/info.json +++ b/keyboards/kudox_game/rev2/info.json @@ -9,5 +9,42 @@ "cols": ["F5", "F6", "F7", "B1", "B3", "B2", "B6"], "rows": ["D4", "D7", "E6", "B4", "B5"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.5, "y": 4.25, "h": 1.5}, + {"matrix": [4, 6], "x": 6.5, "y": 4.75, "h": 2} + ] + } + } } diff --git a/keyboards/kudox_game/rev2/rev2.h b/keyboards/kudox_game/rev2/rev2.h deleted file mode 100644 index 52b30cf61b32..000000000000 --- a/keyboards/kudox_game/rev2/rev2.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, \ - k11, k12, k13, k14, k15, \ - k20, k21, k22, k23, k24, k25, k26, \ - k30, k31, k34, k35, k36, \ - k40, k45, k46 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO }, \ - { KC_NO, k11, k12, k13, k14, k15, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, KC_NO, KC_NO, k34, k35, k36 }, \ - { k40, KC_NO, KC_NO, KC_NO, KC_NO, k45, k46 } \ -} diff --git a/keyboards/ky01/info.json b/keyboards/ky01/info.json index 3d21e6eea940..3439c6d768aa 100644 --- a/keyboards/ky01/info.json +++ b/keyboards/ky01/info.json @@ -18,95 +18,104 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.25, "y":0}, + {"matrix": [0, 0], "x": 0, "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}, - {"x":14, "y":1.25}, - {"x":15.25, "y":1.25}, + {"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}, - {"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.25, "y":2.25}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, - {"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}, - {"x":13.75, "y":3.25, "w":1.25}, - {"x":15.25, "y":3.25}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, - {"x":0, "y":4.25, "w":1.25}, - {"x":1.25, "y":4.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}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, - {"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, 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}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + + {"matrix": [1, 15], "x": 15.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, 15], "x": 15.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}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [3, 15], "x": 15.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": 1.75}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.5}, + + {"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}, + {"matrix": [5, 10], "x": 11, "y": 5.25}, + {"matrix": [5, 11], "x": 12, "y": 5.25}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/ky01/ky01.h b/keyboards/ky01/ky01.h deleted file mode 100644 index e5280bd24469..000000000000 --- a/keyboards/ky01/ky01.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 KnoblesseOblige - * - * 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 XXX KC_NO - -#define LAYOUT( \ - k00, k02, k03, k04, k05, 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, k2f, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3f, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, \ - k50, k51, k52, k56, k59, k5a, k5b, k5c, k5d, k5e \ -) \ -{ \ - { k00, XXX, k02, k03, k04, k05, XXX, 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, XXX, k2f }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, k3f }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX, XXX }, \ - { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, k59, k5a, k5b, k5c, k5d, k5e, XXX } \ -} diff --git a/keyboards/labyrinth75/info.json b/keyboards/labyrinth75/info.json index eb5f59869fb9..3288c87ee563 100644 --- a/keyboards/labyrinth75/info.json +++ b/keyboards/labyrinth75/info.json @@ -23,7 +23,98 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":5.75, "y":0}, {"label":"F6", "x":6.75, "y":0}, {"label":"F7", "x":7.75, "y":0}, {"label":"F8", "x":8.75, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"PrtSc", "x":15, "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":"Delete", "x":15, "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":"Page Up", "x":15, "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":"Page Down", "x":15, "y":3.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":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}] + "layout": [ + {"matrix": [0, 2], "x": 0, "y": 0}, + + {"matrix": [1, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [1, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + + {"matrix": [1, 4], "x": 5.75, "y": 0}, + {"matrix": [0, 5], "x": 6.75, "y": 0}, + {"matrix": [1, 5], "x": 7.75, "y": 0}, + {"matrix": [0, 6], "x": 8.75, "y": 0}, + + {"matrix": [1, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [1, 7], "x": 12, "y": 0}, + {"matrix": [0, 8], "x": 13, "y": 0}, + + {"matrix": [1, 8], "x": 15, "y": 0}, + + {"matrix": [3, 1], "x": 0, "y": 1.25}, + {"matrix": [2, 2], "x": 1, "y": 1.25}, + {"matrix": [3, 2], "x": 2, "y": 1.25}, + {"matrix": [2, 3], "x": 3, "y": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 1.25}, + {"matrix": [2, 4], "x": 5, "y": 1.25}, + {"matrix": [3, 4], "x": 6, "y": 1.25}, + {"matrix": [2, 5], "x": 7, "y": 1.25}, + {"matrix": [3, 5], "x": 8, "y": 1.25}, + {"matrix": [2, 6], "x": 9, "y": 1.25}, + {"matrix": [3, 6], "x": 10, "y": 1.25}, + {"matrix": [2, 7], "x": 11, "y": 1.25}, + {"matrix": [3, 7], "x": 12, "y": 1.25}, + {"matrix": [2, 8], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [3, 8], "x": 15, "y": 1.25}, + + {"matrix": [5, 1], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 2.25}, + {"matrix": [5, 2], "x": 2.5, "y": 2.25}, + {"matrix": [4, 3], "x": 3.5, "y": 2.25}, + {"matrix": [5, 3], "x": 4.5, "y": 2.25}, + {"matrix": [4, 4], "x": 5.5, "y": 2.25}, + {"matrix": [5, 4], "x": 6.5, "y": 2.25}, + {"matrix": [4, 5], "x": 7.5, "y": 2.25}, + {"matrix": [5, 5], "x": 8.5, "y": 2.25}, + {"matrix": [4, 6], "x": 9.5, "y": 2.25}, + {"matrix": [5, 6], "x": 10.5, "y": 2.25}, + {"matrix": [4, 7], "x": 11.5, "y": 2.25}, + {"matrix": [5, 7], "x": 12.5, "y": 2.25}, + {"matrix": [4, 8], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [5, 8], "x": 15, "y": 2.25}, + + {"matrix": [6, 2], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 2], "x": 1.75, "y": 3.25}, + {"matrix": [6, 3], "x": 2.75, "y": 3.25}, + {"matrix": [7, 3], "x": 3.75, "y": 3.25}, + {"matrix": [6, 4], "x": 4.75, "y": 3.25}, + {"matrix": [7, 4], "x": 5.75, "y": 3.25}, + {"matrix": [6, 5], "x": 6.75, "y": 3.25}, + {"matrix": [7, 5], "x": 7.75, "y": 3.25}, + {"matrix": [6, 6], "x": 8.75, "y": 3.25}, + {"matrix": [7, 6], "x": 9.75, "y": 3.25}, + {"matrix": [6, 7], "x": 10.75, "y": 3.25}, + {"matrix": [7, 7], "x": 11.75, "y": 3.25}, + {"matrix": [6, 8], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [7, 8], "x": 15, "y": 3.25}, + + {"matrix": [0, 1], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [1, 1], "x": 2.25, "y": 4.25}, + {"matrix": [2, 1], "x": 3.25, "y": 4.25}, + {"matrix": [4, 1], "x": 4.25, "y": 4.25}, + {"matrix": [6, 1], "x": 5.25, "y": 4.25}, + {"matrix": [7, 1], "x": 6.25, "y": 4.25}, + {"matrix": [8, 1], "x": 7.25, "y": 4.25}, + {"matrix": [8, 2], "x": 8.25, "y": 4.25}, + {"matrix": [8, 3], "x": 9.25, "y": 4.25}, + {"matrix": [8, 4], "x": 10.25, "y": 4.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4.25}, + {"matrix": [8, 6], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [8, 7], "x": 14, "y": 4.25}, + {"matrix": [8, 8], "x": 15, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [3, 0], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [0, 0], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [1, 0], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [2, 0], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [4, 0], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [6, 0], "x": 13, "y": 5.25}, + {"matrix": [7, 0], "x": 14, "y": 5.25}, + {"matrix": [8, 0], "x": 15, "y": 5.25} + ] } } } diff --git a/keyboards/labyrinth75/labyrinth75.h b/keyboards/labyrinth75/labyrinth75.h deleted file mode 100644 index 8955a6a87a37..000000000000 --- a/keyboards/labyrinth75/labyrinth75.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 Livi - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k02,k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, k08, k18, \ - k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, k28, k38, \ - k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48, k58, \ - k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77, k68, k78, \ - k01, k11, k21, k41, k61, k71, k81, k82, k83, k84, k85, k86, k87, k88, \ - k50, k30, k00, k10, k20, k40, k60, k70, k80 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \ - { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \ - { k80, k81, k82, k83, k84, k85, k86, k87, k88 } \ -} diff --git a/keyboards/latincompass/latin64ble/info.json b/keyboards/latincompass/latin64ble/info.json index 06e1345ea235..d59a5fb02c59 100644 --- a/keyboards/latincompass/latin64ble/info.json +++ b/keyboards/latincompass/latin64ble/info.json @@ -21,74 +21,74 @@ "layouts": { "LAYOUT": { "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, "w":2}, + {"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, "w": 2}, - {"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}, + {"matrix": [1, 6], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 7], "x": 1.5, "y": 1}, + {"matrix": [2, 0], "x": 2.5, "y": 1}, + {"matrix": [2, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [2, 3], "x": 5.5, "y": 1}, + {"matrix": [2, 4], "x": 6.5, "y": 1}, + {"matrix": [2, 5], "x": 7.5, "y": 1}, + {"matrix": [2, 6], "x": 8.5, "y": 1}, + {"matrix": [2, 7], "x": 9.5, "y": 1}, + {"matrix": [3, 0], "x": 10.5, "y": 1}, + {"matrix": [3, 1], "x": 11.5, "y": 1}, + {"matrix": [3, 2], "x": 12.5, "y": 1}, + {"matrix": [3, 3], "x": 13.5, "y": 1, "w": 1.5}, - {"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, "w":2.25}, + {"matrix": [3, 4], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 5], "x": 1.75, "y": 2}, + {"matrix": [3, 6], "x": 2.75, "y": 2}, + {"matrix": [3, 7], "x": 3.75, "y": 2}, + {"matrix": [4, 0], "x": 4.75, "y": 2}, + {"matrix": [4, 1], "x": 5.75, "y": 2}, + {"matrix": [4, 2], "x": 6.75, "y": 2}, + {"matrix": [4, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [4, 5], "x": 9.75, "y": 2}, + {"matrix": [4, 6], "x": 10.75, "y": 2}, + {"matrix": [4, 7], "x": 11.75, "y": 2}, + {"matrix": [5, 0], "x": 12.75, "y": 2, "w": 2.25}, - {"x":0, "y":3, "w":2}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [5, 1], "x": 0, "y": 3, "w": 2}, + {"matrix": [5, 2], "x": 2, "y": 3}, + {"matrix": [5, 3], "x": 3, "y": 3}, + {"matrix": [5, 4], "x": 4, "y": 3}, + {"matrix": [5, 5], "x": 5, "y": 3}, + {"matrix": [5, 6], "x": 6, "y": 3}, + {"matrix": [5, 7], "x": 7, "y": 3}, + {"matrix": [6, 0], "x": 8, "y": 3}, + {"matrix": [6, 1], "x": 9, "y": 3}, + {"matrix": [6, 2], "x": 10, "y": 3}, + {"matrix": [6, 3], "x": 11, "y": 3}, + {"matrix": [6, 4], "x": 12, "y": 3}, + {"matrix": [6, 5], "x": 13, "y": 3}, + {"matrix": [6, 6], "x": 14, "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}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [6, 7], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [7, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [7, 2], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [7, 3], "x": 10, "y": 4}, + {"matrix": [7, 4], "x": 11, "y": 4}, + {"matrix": [7, 5], "x": 12, "y": 4}, + {"matrix": [7, 6], "x": 13, "y": 4}, + {"matrix": [7, 7], "x": 14, "y": 4} ] } } diff --git a/keyboards/latincompass/latin64ble/latin64ble.h b/keyboards/latincompass/latin64ble/latin64ble.h deleted file mode 100644 index 76814acdb3f8..000000000000 --- a/keyboards/latincompass/latin64ble/latin64ble.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 latincompass - * - * 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 XXX KC_NO -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13,\ - K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27,\ - K28, K29, K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, K54,\ - K55, K56, K57, K58, K59, K60, K61, K62, K63\ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07}, \ - { K08, K09, K10, K11, K12, K13, K14, K15}, \ - { K16, K17, K18, K19, K20, K21, K22, K23}, \ - { K24, K25, K26, K27, K28, K29, K30, K31}, \ - { K32, K33, K34, K35, K36, K37, K38, K39}, \ - { K40, K41, K42, K43, K44, K45, K46, K47}, \ - { K48, K49, K50, K51, K52, K53, K54, K55}, \ - { K56, K57, K58, K59, K60, K61, K62, K63} \ -} diff --git a/keyboards/lazydesigners/bolt/bolt.h b/keyboards/lazydesigners/bolt/bolt.h deleted file mode 100644 index 412ed7b09966..000000000000 --- a/keyboards/lazydesigners/bolt/bolt.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 LAZYDESIGNERS - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K311, \ - K300, K301, K303, K304, K306, K307, K308, K309, K310 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { K300, K301, KC_NO, K303, K304, KC_NO, K306, K307, K308, K309, K310, K311 } \ -} diff --git a/keyboards/lazydesigners/bolt/info.json b/keyboards/lazydesigners/bolt/info.json index 4a6755f5d58c..a12226cf51b4 100644 --- a/keyboards/lazydesigners/bolt/info.json +++ b/keyboards/lazydesigners/bolt/info.json @@ -21,52 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K000 (F0,F1)", "x":0, "y":0}, - {"label":"K001 (F0,F4)", "x":1, "y":0}, - {"label":"K002 (F0,F5)", "x":2, "y":0}, - {"label":"K003 (F0,F6)", "x":3, "y":0}, - {"label":"K004 (F0,F7)", "x":4, "y":0}, - {"label":"K005 (F0,C6)", "x":5, "y":0}, - {"label":"K006 (F0,B3)", "x":7.5, "y":0}, - {"label":"K007 (F0,B7)", "x":8.5, "y":0}, - {"label":"K008 (F0,D0)", "x":9.5, "y":0}, - {"label":"K009 (F0,D3)", "x":10.5, "y":0}, - {"label":"K010 (F0,D2)", "x":11.5, "y":0}, - {"label":"K011 (F0,D1)", "x":12.5, "y":0, "w":1.75}, - {"label":"K100 (C7,F1)", "x":0, "y":1, "w":1.25}, - {"label":"K101 (C7,F4)", "x":1.25, "y":1}, - {"label":"K102 (C7,F5)", "x":2.25, "y":1}, - {"label":"K103 (C7,F6)", "x":3.25, "y":1}, - {"label":"K104 (C7,F7)", "x":4.25, "y":1}, - {"label":"K105 (C7,C6)", "x":5.25, "y":1}, - {"label":"K106 (C7,B3)", "x":7.75, "y":1}, - {"label":"K107 (C7,B7)", "x":8.75, "y":1}, - {"label":"K108 (C7,D0)", "x":9.75, "y":1}, - {"label":"K109 (C7,D3)", "x":10.75, "y":1}, - {"label":"K110 (C7,D2)", "x":11.75, "y":1}, - {"label":"K111 (C7,D1)", "x":12.75, "y":1, "w":1.5}, - {"label":"K200 (B6,F1)", "x":0, "y":2, "w":1.75}, - {"label":"K201 (B6,F4)", "x":1.75, "y":2}, - {"label":"K202 (B6,F5)", "x":2.75, "y":2}, - {"label":"K203 (B6,F6)", "x":3.75, "y":2}, - {"label":"K204 (B6,F7)", "x":4.75, "y":2}, - {"label":"K205 (B6,C6)", "x":5.75, "y":2}, - {"label":"K206 (B6,B3)", "x":7.25, "y":2}, - {"label":"K207 (B6,B7)", "x":8.25, "y":2}, - {"label":"K208 (B6,D0)", "x":9.25, "y":2}, - {"label":"K209 (B6,D3)", "x":10.25, "y":2}, - {"label":"K210 (B6,D2)", "x":11.25, "y":2}, - {"label":"K211 (B6,D1)", "x":12.25, "y":2}, - {"label":"K311 (D5,D1)", "x":13.25, "y":2}, - {"label":"K300 (D5,F1)", "x":0, "y":3, "w":1.25}, - {"label":"K301 (D5,F4)", "x":1.25, "y":3, "w":1.25}, - {"label":"K303 (D5,F6)", "x":3.25, "y":3, "w":1.25}, - {"label":"K304 (D5,F7)", "x":4.5, "y":3, "w":2.25}, - {"label":"K306 (D5,B3)", "x":7.25, "y":3, "w":2.25}, - {"label":"K307 (D5,B7)", "x":9.5, "y":3}, - {"label":"K308 (D5,D0)", "x":11.25, "y":3}, - {"label":"K309 (D5,D3)", "x":12.25, "y":3}, - {"label":"K310 (D5,D2)", "x":13.25, "y":3} + {"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": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [3, 11], "x": 13.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3, "w": 2.25}, + {"matrix": [3, 6], "x": 7.25, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 11.25, "y": 3}, + {"matrix": [3, 9], "x": 12.25, "y": 3}, + {"matrix": [3, 10], "x": 13.25, "y": 3} ] } } diff --git a/keyboards/lazydesigners/the50/info.json b/keyboards/lazydesigners/the50/info.json index 3b8f808e4daf..a82f180e577a 100644 --- a/keyboards/lazydesigners/the50/info.json +++ b/keyboards/lazydesigners/the50/info.json @@ -25,60 +25,68 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Back
Space", "x":11, "y":0}, - {"label":"7", "x":12.25, "y":0}, - {"label":"8", "x":13.25, "y":0}, - {"label":"9", "x":14.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"Enter", "x":10.25, "y":1, "w":1.75}, - {"label":"4", "x":12.25, "y":1}, - {"label":"5", "x":13.25, "y":1}, - {"label":"6", "x":14.25, "y":1}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":"<", "x":8.75, "y":2}, - {"label":">", "x":9.75, "y":2}, - {"label":"Fn", "x":10.75, "y":2, "w":1.25}, - {"label":"1", "x":12.25, "y":2}, - {"label":"2", "x":13.25, "y":2}, - {"label":"3", "x":14.25, "y":2}, - {"label":"Hyper", "x":0, "y":3, "w":1.25}, - {"label":"Super", "x":1.25, "y":3}, - {"label":"Meta", "x":2.25, "y":3, "w":1.25}, - {"label":"Space", "x":3.5, "y":3, "w":2.25}, - {"label":"Space", "x":5.75, "y":3, "w":2.75}, - {"label":"Meta", "x":8.5, "y":3, "w":1.25}, - {"label":"Super", "x":9.75, "y":3}, - {"label":"Hyper", "x":10.75, "y":3, "w":1.25}, - {"label":"0", "x":12.25, "y":3}, - {"label":".", "x":13.25, "y":3}, - {"label":"Enter", "x":14.25, "y":3}] + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0}, + {"matrix": [0, 14], "x": 14.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [1, 12], "x": 12.25, "y": 1}, + {"matrix": [1, 13], "x": 13.25, "y": 1}, + {"matrix": [1, 14], "x": 14.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 12], "x": 12.25, "y": 2}, + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 14], "x": 14.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.5, "y": 3, "w": 2.25}, + {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 2.75}, + {"matrix": [3, 9], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}, + + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3}, + {"matrix": [3, 14], "x": 14.25, "y": 3} + ] } } } diff --git a/keyboards/lazydesigners/the50/the50.h b/keyboards/lazydesigners/the50/the50.h index 1cf613aada94..e796e9161c94 100644 --- a/keyboards/lazydesigners/the50/the50.h +++ b/keyboards/lazydesigners/the50/the50.h @@ -2,31 +2,5 @@ #include "quantum.h" -#define XXXX KC_NO - -/* - * ,-----------------------------------------------------------. ,--------------. - * | | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | | | | - * |-----------------------------------------------------------| |--------------| - * | | | | | | | | | | | | | - * `-----------------------------------------------------------' `--------------' - */ - -#define LAYOUT( \ -K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ -K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K111, K112, K113, K114, \ -K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ -K300, K301, K302, K304, K307, K309, K310, K311, K312, K313, K314 \ -) { \ -{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ -{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, XXXX, K111, K112, K113, K114 }, \ -{ K200, XXXX, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ -{ K300, K301, K302, XXXX, K304, XXXX, XXXX, K307, XXXX, K309, K310, K311, K312, K313, K314 } \ -} - void the50_led_on(void); void the50_led_off(void); diff --git a/keyboards/lfkeyboards/lfk78/lfk78.h b/keyboards/lfkeyboards/lfk78/lfk78.h index d5e1c7b3c7c3..e8dad4028cf6 100644 --- a/keyboards/lfkeyboards/lfk78/lfk78.h +++ b/keyboards/lfkeyboards/lfk78/lfk78.h @@ -3,7 +3,7 @@ #include "quantum.h" #if defined(KEYBOARD_lfkeyboards_lfk78_revb) -# include "revb.h" +# include QMK_KEYBOARD_H #elif defined(KEYBOARD_lfkeyboards_lfk78_revc) # include "revc.h" #elif defined(KEYBOARD_lfkeyboards_lfk78_revj) diff --git a/keyboards/lfkeyboards/lfk78/revb/info.json b/keyboards/lfkeyboards/lfk78/revb/info.json index cfc1baf28cba..92662bacc786 100644 --- a/keyboards/lfkeyboards/lfk78/revb/info.json +++ b/keyboards/lfkeyboards/lfk78/revb/info.json @@ -25,97 +25,88 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [5, 0], "x": 8.25, "y": 0}, + {"matrix": [5, 1], "x": 9.25, "y": 0}, + {"matrix": [5, 2], "x": 10.25, "y": 0}, + {"matrix": [5, 3], "x": 11.25, "y": 0}, + {"matrix": [5, 4], "x": 12.25, "y": 0}, + {"matrix": [5, 5], "x": 13.25, "y": 0}, + {"matrix": [5, 6], "x": 14.25, "y": 0}, + {"matrix": [5, 7], "x": 15.25, "y": 0, "w": 2}, + {"matrix": [9, 4], "x": 17.5, "y": 0}, + {"matrix": [9, 5], "x": 18.5, "y": 0}, - {"x":2.25, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.25, "y":0}, - {"x":6.25, "y":0}, - {"x":7.25, "y":0}, - {"x":8.25, "y":0}, - {"x":9.25, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0, "w":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [6, 0], "x": 8.75, "y": 1}, + {"matrix": [6, 1], "x": 9.75, "y": 1}, + {"matrix": [6, 2], "x": 10.75, "y": 1}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 4], "x": 12.75, "y": 1}, + {"matrix": [6, 5], "x": 13.75, "y": 1}, + {"matrix": [6, 6], "x": 14.75, "y": 1}, + {"matrix": [6, 7], "x": 15.75, "y": 1, "w": 1.5}, + {"matrix": [9, 6], "x": 17.5, "y": 1}, + {"matrix": [9, 7], "x": 18.5, "y": 1}, - {"x":17.5, "y":0}, - {"x":18.5, "y":0}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2, "w": 1.75}, + {"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": [7, 0], "x": 9, "y": 2}, + {"matrix": [7, 1], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 4], "x": 13, "y": 2}, + {"matrix": [7, 5], "x": 14, "y": 2}, + {"matrix": [7, 6], "x": 15, "y": 2, "w": 2.25}, - {"x":0, "y":1}, - {"x":1, "y":1}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + {"matrix": [3, 7], "x": 8.5, "y": 3}, + {"matrix": [8, 0], "x": 9.5, "y": 3}, + {"matrix": [8, 1], "x": 10.5, "y": 3}, + {"matrix": [8, 2], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 4], "x": 13.5, "y": 3}, + {"matrix": [8, 5], "x": 14.5, "y": 3, "w": 2.75}, + {"matrix": [8, 6], "x": 17.5, "y": 3}, - {"x":2.25, "y":1, "w":1.5}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":7.75, "y":1}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1}, - {"x":13.75, "y":1}, - {"x":14.75, "y":1}, - {"x":15.75, "y":1, "w":1.5}, - - {"x":17.5, "y":1}, - {"x":18.5, "y":1}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - - {"x":2.25, "y":2, "w":1.75}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2, "w":2.25}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - - {"x":2.25, "y":3, "w":2.25}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.5, "y":3}, - {"x":7.5, "y":3}, - {"x":8.5, "y":3}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3}, - {"x":14.5, "y":3, "w":2.75}, - - {"x":17.5, "y":3}, - - {"x":0, "y":4}, - {"x":1, "y":4}, - - {"x":2.25, "y":4, "w":1.25}, - {"x":3.5, "y":4, "w":1.25}, - {"x":4.75, "y":4, "w":1.25}, - {"x":6, "y":4, "w":6.25}, - {"x":12.25, "y":4, "w":1.25}, - {"x":13.5, "y":4, "w":1.25}, - {"x":14.75, "y":4, "w":1.25}, - - {"x":16.5, "y":4}, - {"x":17.5, "y":4}, - {"x":18.5, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 6.25}, + {"matrix": [4, 6], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 16.5, "y": 4}, + {"matrix": [9, 2], "x": 17.5, "y": 4}, + {"matrix": [9, 3], "x": 18.5, "y": 4} ] } } diff --git a/keyboards/lfkeyboards/lfk78/revb/revb.h b/keyboards/lfkeyboards/lfk78/revb/revb.h deleted file mode 100644 index d81a2363cdc8..000000000000 --- a/keyboards/lfkeyboards/lfk78/revb/revb.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -#include "lfk78.h" - -// readability -#define XXX KC_NO - -// This is a shortcut to help you visually see your layout. -/* - * ,---------. ,-----------------------------------------------------------------------. ,---------. - * | 0 | 1 | | 2 | 3 | 4 | 5 | 6 | 7 | 50 | 51 | 52 | 53 | 54 | 55 | 56 | 57 | | 94 | 95 | - * |---------| |-----------------------------------------------------------------------| |---------| - * | 10 | 11 | | 12 | 13 | 14 | 15 | 16 | 17 | 60 | 61 | 62 | 63 | 64 | 65 | 66 | 67 | | 96 | 97 | - * |---------| |-----------------------------------------------------------------------| `---------' - * | 20 | 21 | | 22 | 23 | 24 | 25 | 26 | 27 | 70 | 71 | 72 | 73 | 74 | 75 | 76 | - * |---------| |-----------------------------------------------------------------------| ,----. - * | 30 | 31 | | 32 | 33 | 34 | 35 | 36 | 37 | 80 | 81 | 82 | 83 | 84 | 85 | | 86 | - * |---------| |-------------------------------------------------------------------------------------. - * | 40 | 41 | | 42 | 43 | 44 | 45 | 46 | 47 | 90 | | 91 | 92 | 93 | - * `---------' `--------------------------------------------------------------------' `--------------' - */ -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k50, k51, k52, k53, k54, k55, k56, k57, k94, k95, \ - k10, k11, k12, k13, k14, k15, k16, k17, k60, k61, k62, k63, k64, k65, k66, k67, k96, k97, \ - k20, k21, k22, k23, k24, k25, k26, k27, k70, k71, k72, k73, k74, k75, k76, \ - k30, k31, k32, k33, k34, k35, k36, k37, k80, k81, k82, k83, k84, k85, k86, \ - k40, k41, k42, k43, k44, k45, k46, k47, k90, k91, k92, k93 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, 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, XXX }, \ - { k80, k81, k82, k83, k84, k85, k86, XXX }, \ - { k90, k91, k92, k93, k94, k95, k96, k97 } \ -} diff --git a/keyboards/lfkeyboards/mini1800/info.json b/keyboards/lfkeyboards/mini1800/info.json index 84fe6bd472ce..cf1cc7764bb7 100644 --- a/keyboards/lfkeyboards/mini1800/info.json +++ b/keyboards/lfkeyboards/mini1800/info.json @@ -23,92 +23,99 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Back Space", "x":13, "y":0, "w":2}, - {"label":"Num Lock", "x":15.5, "y":0}, - {"label":"/", "x":16.5, "y":0}, - {"label":"*", "x":17.5, "y":0}, - {"label":"-", "x":18.5, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[{", "x":11.5, "y":1}, - {"label":"]}", "x":12.5, "y":1}, - {"label":"\\|", "x":13.5, "y":1, "w":1.5}, - {"label":"7", "x":15.5, "y":1}, - {"label":"8", "x":16.5, "y":1}, - {"label":"9", "x":17.5, "y":1}, - {"label":"+", "x":18.5, "y":1}, + {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [0, 16], "x": 16.5, "y": 0}, + {"matrix": [0, 17], "x": 17.5, "y": 0}, + {"matrix": [0, 18], "x": 18.5, "y": 0}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";:", "x":10.75, "y":2}, - {"label":"'\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"4", "x":15.5, "y":2}, - {"label":"5", "x":16.5, "y":2}, - {"label":"6", "x":17.5, "y":2}, - {"label":"+", "x":18.5, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",<", "x":9.25, "y":3}, - {"label":".>", "x":10.25, "y":3}, - {"label":"/?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14.25, "y":3.25}, - {"label":"1", "x":15.5, "y":3}, - {"label":"2", "x":16.5, "y":3}, - {"label":"3", "x":17.5, "y":3}, - {"label":"Enter", "x":18.5, "y":3, "h":2}, + {"matrix": [1, 15], "x": 15.5, "y": 1}, + {"matrix": [1, 16], "x": 16.5, "y": 1}, + {"matrix": [1, 17], "x": 17.5, "y": 1}, + {"matrix": [1, 18], "x": 18.5, "y": 1}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Fn", "x":11, "y":4}, - {"label":"Ctrl", "x":12, "y":4}, - {"label":"\u2190", "x":13.25, "y":4.25}, - {"label":"\u2193", "x":14.25, "y":4.25}, - {"label":"\u2192", "x":15.25, "y":4.25}, - {"label":"0", "x":16.5, "y":4}, - {"label":".", "x":17.5, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [1, 14], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 15], "x": 15.5, "y": 2}, + {"matrix": [2, 16], "x": 16.5, "y": 2}, + {"matrix": [2, 17], "x": 17.5, "y": 2}, + {"matrix": [2, 18], "x": 18.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 14], "x": 14.25, "y": 3.25}, + + {"matrix": [3, 15], "x": 15.5, "y": 3}, + {"matrix": [3, 16], "x": 16.5, "y": 3}, + {"matrix": [3, 17], "x": 17.5, "y": 3}, + {"matrix": [3, 18], "x": 18.5, "y": 3, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + + {"matrix": [4, 14], "x": 13.25, "y": 4.25}, + {"matrix": [4, 15], "x": 14.25, "y": 4.25}, + {"matrix": [4, 16], "x": 15.25, "y": 4.25}, + + {"matrix": [4, 17], "x": 16.5, "y": 4}, + {"matrix": [4, 18], "x": 17.5, "y": 4} ] } } diff --git a/keyboards/lfkeyboards/mini1800/mini1800.h b/keyboards/lfkeyboards/mini1800/mini1800.h index 3586c75221ba..d26f33018462 100644 --- a/keyboards/lfkeyboards/mini1800/mini1800.h +++ b/keyboards/lfkeyboards/mini1800/mini1800.h @@ -1,6 +1,6 @@ #pragma once -#include "quantum.h" +#include QMK_KEYBOARD_H #include "matrix.h" #include @@ -25,21 +25,3 @@ extern const Layer_Info layer_info[]; void reset_keyboard_kb(void); void click(uint16_t freq, uint16_t duration); - -#define ___ KC_NO - -#ifndef LAYOUT -# define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0E, k0F, k0G, k0H, k0I, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1F, k1G, k1H, k1I, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k1E, k2F, k2G, k2H, k2I, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, k3G, k3H, k3I, \ - k40, k41, k42, k45, k4A, k4B, k4C, k4E, k4F, k4G, k4H, k4I \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, ___, k0E, k0F, k0G, k0H, k0I }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, ___, ___, ___, k2F, k2G, k2H, k2I }, \ - { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, ___, k3E, k3F, k3G, k3H, k3I }, \ - { k40, k41, k42, ___, ___, k45, ___, ___, ___, ___, k4A, k4B, k4C, ___, k4E, k4F, k4G, k4H, k4I } \ -} -#endif // !LAYOUT #endif diff --git a/keyboards/lime/rev1/info.json b/keyboards/lime/rev1/info.json index 8fb3cb2f28b1..215b47e10383 100644 --- a/keyboards/lime/rev1/info.json +++ b/keyboards/lime/rev1/info.json @@ -33,72 +33,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.5}, - {"label":"1!", "x":1, "y":0.38}, - {"label":"2@", "x":2, "y":0.13}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0.13}, - {"label":"5%", "x":5, "y":0.25}, - {"label":"6^", "x":9, "y":0.25}, - {"label":"7&", "x":10, "y":0.13}, - {"label":"8*", "x":11, "y":0}, - {"label":"9(", "x":12, "y":0.13}, - {"label":"0)", "x":13, "y":0.38}, - {"label":"Backspace", "x":14, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.38}, + {"matrix": [0, 2], "x": 2, "y": 0.13}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.13}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"label":"Tab", "x":0, "y":1.5}, - {"label":"Q", "x":1, "y":1.38}, - {"label":"W", "x":2, "y":1.13}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1.13}, - {"label":"T", "x":5, "y":1.25}, - {"label":"Y", "x":9, "y":1.25}, - {"label":"U", "x":10, "y":1.13}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1.13}, - {"label":"P", "x":13, "y":1.38}, - {"label":"`~", "x":14, "y":1.5}, + {"matrix": [6, 5], "x": 9, "y": 0.25}, + {"matrix": [6, 4], "x": 10, "y": 0.13}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0.13}, + {"matrix": [6, 1], "x": 13, "y": 0.38}, + {"matrix": [6, 0], "x": 14, "y": 0.5}, - {"label":"Caps Lock", "x":0, "y":2.5}, - {"label":"A", "x":1, "y":2.38}, - {"label":"S", "x":2, "y":2.13}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2.13}, - {"label":"G", "x":5, "y":2.25}, - {"label":"H", "x":9, "y":2.25}, - {"label":"J", "x":10, "y":2.13}, - {"label":"K", "x":11, "y":2}, - {"label":"L", "x":12, "y":2.13}, - {"label":";:", "x":13, "y":2.38}, - {"label":"'\"", "x":14, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.38}, + {"matrix": [1, 2], "x": 2, "y": 1.13}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.13}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"label":"Shift", "x":0, "y":3.5}, - {"label":"Z", "x":1, "y":3.38}, - {"label":"X", "x":2, "y":3.13}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3.13}, - {"label":"B", "x":5, "y":3.25}, - {"label":"Joystick", "x":6, "y":3.25}, - {"label":"Encoder", "x":8, "y":3.25}, - {"label":"N", "x":9, "y":3.25}, - {"label":"M", "x":10, "y":3.13}, - {"label":",<", "x":11, "y":3}, - {"label":".>", "x":12, "y":3.13}, - {"label":"/?", "x":13, "y":3.38}, - {"label":"\\|", "x":14, "y":3.5}, + {"matrix": [7, 5], "x": 9, "y": 1.25}, + {"matrix": [7, 4], "x": 10, "y": 1.13}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1.13}, + {"matrix": [7, 1], "x": 13, "y": 1.38}, + {"matrix": [7, 0], "x": 14, "y": 1.5}, - {"label":"Lower", "x":0.35, "y":4.5}, - {"label":"OS", "x":1.35, "y":4.38}, - {"label":"Alt", "x":2.35, "y":4.13}, - {"label":"Del", "x":3.35, "y":4.13}, - {"label":"Ctrl", "x":4.55, "y":4.5}, - {"label":"Enter", "x":5.75, "y":4.25, "h":1.25}, - {"label":"Space", "x":8.25, "y":4.25, "h":1.25}, - {"label":"Raise", "x":9.45, "y":4.5}, - {"label":"[{", "x":10.65, "y":4.13}, - {"label":"]}", "x":11.65, "y":4.13}, - {"label":"-_", "x":12.65, "y":4.38}, - {"label":"=+", "x":13.65, "y":4.5} + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.38}, + {"matrix": [2, 2], "x": 2, "y": 2.13}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.13}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [8, 5], "x": 9, "y": 2.25}, + {"matrix": [8, 4], "x": 10, "y": 2.13}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2.13}, + {"matrix": [8, 1], "x": 13, "y": 2.38}, + {"matrix": [8, 0], "x": 14, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.38}, + {"matrix": [3, 2], "x": 2, "y": 3.13}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.13}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + + {"matrix": [5, 0], "x": 6, "y": 3.25}, + + {"matrix": [11, 5], "x": 8, "y": 3.25}, + + {"matrix": [9, 5], "x": 9, "y": 3.25}, + {"matrix": [9, 4], "x": 10, "y": 3.13}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 2], "x": 12, "y": 3.13}, + {"matrix": [9, 1], "x": 13, "y": 3.38}, + {"matrix": [9, 0], "x": 14, "y": 3.5}, + + {"matrix": [4, 0], "x": 0.35, "y": 4.5}, + {"matrix": [4, 1], "x": 1.35, "y": 4.38}, + {"matrix": [4, 2], "x": 2.35, "y": 4.13}, + {"matrix": [4, 3], "x": 3.35, "y": 4.13}, + {"matrix": [4, 4], "x": 4.55, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.25, "h": 1.25}, + + {"matrix": [10, 5], "x": 8.25, "y": 4.25, "h": 1.25}, + {"matrix": [10, 4], "x": 9.45, "y": 4.5}, + {"matrix": [10, 3], "x": 10.65, "y": 4.13}, + {"matrix": [10, 2], "x": 11.65, "y": 4.13}, + {"matrix": [10, 1], "x": 12.65, "y": 4.38}, + {"matrix": [10, 0], "x": 13.65, "y": 4.5} ] } } diff --git a/keyboards/lime/rev1/rev1.c b/keyboards/lime/rev1/rev1.c index 50c2e6dff660..91d00e0d2f5c 100644 --- a/keyboards/lime/rev1/rev1.c +++ b/keyboards/lime/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" /* Encoders */ #ifdef ENCODER_ENABLE diff --git a/keyboards/lime/rev1/rev1.h b/keyboards/lime/rev1/rev1.h deleted file mode 100644 index 24a3f7212b7c..000000000000 --- a/keyboards/lime/rev1/rev1.h +++ /dev/null @@ -1,41 +0,0 @@ - /* Copyright 2021 HellSingCoder - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L50, R50, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L50, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R50 } \ - } - diff --git a/keyboards/majistic/info.json b/keyboards/majistic/info.json index 7c475660c7ed..632f34617ff9 100644 --- a/keyboards/majistic/info.json +++ b/keyboards/majistic/info.json @@ -27,72 +27,81 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0, "y":0, "w":1.5}, - {"label":"2", "x":1.5, "y":0}, - {"label":"3", "x":2.5, "y":0}, - {"label":"4", "x":3.5, "y":0}, - {"label":"5", "x":4.5, "y":0}, - {"label":"6", "x":5.5, "y":0}, - {"label":"7", "x":7.5, "y":0}, - {"label":"8", "x":8.5, "y":0}, - {"label":"9", "x":9.5, "y":0}, - {"label":"0", "x":10.5, "y":0}, - {"label":"-", "x":11.5, "y":0}, - {"label":"^", "x":12.5, "y":0}, - {"label":"\\", "x":13.5, "y":0}, - {"label":"BS", "x":14.5, "y":0}, - {"label":"Tab", "x":0, "y":1}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":7, "y":1}, - {"label":"U", "x":8, "y":1}, - {"label":"I", "x":9, "y":1}, - {"label":"O", "x":10, "y":1}, - {"label":"P", "x":11, "y":1}, - {"label":"@", "x":12, "y":1}, - {"label":"[", "x":13, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, - {"label":"A", "x":1.25, "y":2}, - {"label":"S", "x":2.25, "y":2}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2}, - {"label":"G", "x":5.25, "y":2}, - {"label":"H", "x":7.25, "y":2}, - {"label":"J", "x":8.25, "y":2}, - {"label":"K", "x":9.25, "y":2}, - {"label":"L", "x":10.25, "y":2}, - {"label":";", "x":11.25, "y":2}, - {"label":":", "x":12.25, "y":2}, - {"label":"]", "x":13.25, "y":2}, - {"label":"Enter", "x":14.25, "y":1, "w":1.25, "h":2}, - {"label":"Shift", "x":0, "y":3, "w":1.75}, - {"label":"Z", "x":1.75, "y":3}, - {"label":"X", "x":2.75, "y":3}, - {"label":"C", "x":3.75, "y":3}, - {"label":"V", "x":4.75, "y":3}, - {"label":"B", "x":5.75, "y":3}, - {"label":"N", "x":7.75, "y":3}, - {"label":"M", "x":8.75, "y":3}, - {"label":",", "x":9.75, "y":3}, - {"label":".", "x":10.75, "y":3}, - {"label":"/", "x":11.75, "y":3}, - {"label":"up", "x":12.75, "y":3}, - {"label":"Shift", "x":13.75, "y":3, "w":1.75}, - {"label":"Ctrl", "x":0, "y":4}, - {"label":"Alt", "x":1, "y":4}, - {"label":"command", "x":2, "y":4, "w":1.25}, - {"label":"EISU", "x":3.25, "y":4, "w":1.25}, - {"label":"", "x":4.5, "y":4, "w":1.75}, - {"label":"", "x":7.25, "y":4, "w":1.5}, - {"label":"KANA", "x":8.75, "y":4, "w":1.5}, - {"label":"command", "x":10.25, "y":4, "w":1.5}, - {"label":"left", "x":11.75, "y":4}, - {"label":"down", "x":12.75, "y":4}, - {"label":"right", "x":13.75, "y":4} - ] + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [5, 0], "x": 7.5, "y": 0}, + {"matrix": [5, 1], "x": 8.5, "y": 0}, + {"matrix": [5, 2], "x": 9.5, "y": 0}, + {"matrix": [5, 3], "x": 10.5, "y": 0}, + {"matrix": [5, 4], "x": 11.5, "y": 0}, + {"matrix": [5, 5], "x": 12.5, "y": 0}, + {"matrix": [5, 6], "x": 13.5, "y": 0}, + {"matrix": [5, 7], "x": 14.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [6, 6], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + + {"matrix": [7, 0], "x": 7.25, "y": 2}, + {"matrix": [7, 1], "x": 8.25, "y": 2}, + {"matrix": [7, 2], "x": 9.25, "y": 2}, + {"matrix": [7, 3], "x": 10.25, "y": 2}, + {"matrix": [7, 4], "x": 11.25, "y": 2}, + {"matrix": [7, 5], "x": 12.25, "y": 2}, + {"matrix": [7, 6], "x": 13.25, "y": 2}, + {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + + {"matrix": [8, 0], "x": 7.75, "y": 3}, + {"matrix": [8, 1], "x": 8.75, "y": 3}, + {"matrix": [8, 2], "x": 9.75, "y": 3}, + {"matrix": [8, 3], "x": 10.75, "y": 3}, + {"matrix": [8, 4], "x": 11.75, "y": 3}, + {"matrix": [8, 5], "x": 12.75, "y": 3}, + {"matrix": [8, 6], "x": 13.75, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.75}, + + {"matrix": [9, 0], "x": 7.25, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.5}, + {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4}, + {"matrix": [9, 4], "x": 12.75, "y": 4}, + {"matrix": [9, 5], "x": 13.75, "y": 4} + ] } } } diff --git a/keyboards/majistic/majistic.h b/keyboards/majistic/majistic.h deleted file mode 100644 index 77c4a4912146..000000000000 --- a/keyboards/majistic/majistic.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 yossiyossy - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT(\ - l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, \ - l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, \ - l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r17, \ - l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, \ - l40, l41, l42, l43, l44, r40, r41, r42, r43, r44, r45 \ -) {\ - { l00, l01, l02, l03, l04, l05, KC_NO, KC_NO }, \ - { l10, l11, l12, l13, l14, l15, KC_NO, KC_NO }, \ - { l20, l21, l22, l23, l24, l25, KC_NO, KC_NO}, \ - { l30, l31, l32, l33, l34, l35, KC_NO, KC_NO}, \ - { l40, l41, l42, l43, l44, KC_NO, KC_NO, KC_NO}, \ - { r00, r01, r02, r03, r04, r05, r06, r07 }, \ - { r10, r11, r12, r13, r14, r15, r16, r17 }, \ - { r20, r21, r22, r23, r24, r25, r26, KC_NO }, \ - { r30, r31, r32, r33, r34, r35, r36, KC_NO }, \ - { r40, r41, r42, r43, r44, r45, KC_NO, KC_NO } \ -} diff --git a/keyboards/malevolti/lyra/rev1/info.json b/keyboards/malevolti/lyra/rev1/info.json index 2cc916c7cfdf..2b7f8fbd7130 100644 --- a/keyboards/malevolti/lyra/rev1/info.json +++ b/keyboards/malevolti/lyra/rev1/info.json @@ -21,85 +21,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.3}, - {"x": 1, "y": 0.4}, - {"x": 2, "y": 0.3}, - {"x": 3, "y": 0.1}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0.1}, - {"x": 6, "y": 0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.3}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, - {"x": 8, "y": 0.25}, - {"x": 9, "y": 0.1}, - {"x": 10, "y": 0}, - {"x": 11, "y": 0.1}, - {"x": 12, "y": 0.3}, - {"x": 13, "y": 0.4}, - {"x": 14, "y": 0.3}, + {"matrix": [5, 6], "x": 8, "y": 0.25}, + {"matrix": [5, 5], "x": 9, "y": 0.1}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0.1}, + {"matrix": [5, 2], "x": 12, "y": 0.3}, + {"matrix": [5, 1], "x": 13, "y": 0.4}, + {"matrix": [5, 0], "x": 14, "y": 0.3}, - {"x": 0, "y": 1.3}, - {"x": 1, "y": 1.4}, - {"x": 2, "y": 1.3}, - {"x": 3, "y": 1.1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1.1}, - {"x": 6, "y": 1.25}, + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.3}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"x": 8, "y": 1.25}, - {"x": 9, "y": 1.1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1.1}, - {"x": 12, "y": 1.3}, - {"x": 13, "y": 1.4}, - {"x": 14, "y": 1.3}, + {"matrix": [6, 6], "x": 8, "y": 1.25}, + {"matrix": [6, 5], "x": 9, "y": 1.1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1.1}, + {"matrix": [6, 2], "x": 12, "y": 1.3}, + {"matrix": [6, 1], "x": 13, "y": 1.4}, + {"matrix": [6, 0], "x": 14, "y": 1.3}, - {"x": 0, "y": 2.3}, - {"x": 1, "y": 2.4}, - {"x": 2, "y": 2.3}, - {"x": 3, "y": 2.1}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2.1}, - {"x": 6, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.3}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, - {"x": 8, "y": 2.25}, - {"x": 9, "y": 2.1}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2.1}, - {"x": 12, "y": 2.3}, - {"x": 13, "y": 2.4}, - {"x": 14, "y": 2.3}, + {"matrix": [7, 6], "x": 8, "y": 2.25}, + {"matrix": [7, 5], "x": 9, "y": 2.1}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2.1}, + {"matrix": [7, 2], "x": 12, "y": 2.3}, + {"matrix": [7, 1], "x": 13, "y": 2.4}, + {"matrix": [7, 0], "x": 14, "y": 2.3}, - {"x": 0, "y": 3.3}, - {"x": 1, "y": 3.4}, - {"x": 2, "y": 3.3}, - {"x": 3, "y": 3.1}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3.1}, - {"x": 6, "y": 3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.3}, + {"matrix": [3, 1], "x": 1, "y": 3.4}, + {"matrix": [3, 2], "x": 2, "y": 3.3}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.25}, - {"x": 8, "y": 3.25}, - {"x": 9, "y": 3.1}, - {"x": 10, "y": 3}, - {"x": 11, "y": 3.1}, - {"x": 12, "y": 3.3}, - {"x": 13, "y": 3.4}, - {"x": 14, "y": 3.3}, + {"matrix": [8, 6], "x": 8, "y": 3.25}, + {"matrix": [8, 5], "x": 9, "y": 3.1}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3.1}, + {"matrix": [8, 2], "x": 12, "y": 3.3}, + {"matrix": [8, 1], "x": 13, "y": 3.4}, + {"matrix": [8, 0], "x": 14, "y": 3.3}, - {"x": 0, "y": 4.3}, - {"x": 1, "y": 4.4}, - {"x": 2, "y": 4.3}, - {"x": 3, "y": 4.1}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4.1}, - {"x": 6.25, "y": 4.5}, + {"matrix": [4, 0], "x": 0, "y": 4.3}, + {"matrix": [4, 1], "x": 1, "y": 4.4}, + {"matrix": [4, 2], "x": 2, "y": 4.3}, + {"matrix": [4, 3], "x": 3, "y": 4.1}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 9, "y": 4.1}, - {"x": 10, "y": 4}, - {"x": 11, "y": 4.1}, - {"x": 12, "y": 4.3}, - {"x": 13, "y": 4.4}, - {"x": 14, "y": 4.3} + {"matrix": [9, 6], "x": 7.75, "y": 4.5}, + {"matrix": [9, 5], "x": 9, "y": 4.1}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4.1}, + {"matrix": [9, 2], "x": 12, "y": 4.3}, + {"matrix": [9, 1], "x": 13, "y": 4.4}, + {"matrix": [9, 0], "x": 14, "y": 4.3} ] } } diff --git a/keyboards/malevolti/lyra/rev1/rev1.h b/keyboards/malevolti/lyra/rev1/rev1.h deleted file mode 100644 index 021350f1065c..000000000000 --- a/keyboards/malevolti/lyra/rev1/rev1.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 Domanic Calleja - * - * 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( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/malevolti/superlyra/rev1/info.json b/keyboards/malevolti/superlyra/rev1/info.json index 1c0e9c72bc00..59cd50af421a 100644 --- a/keyboards/malevolti/superlyra/rev1/info.json +++ b/keyboards/malevolti/superlyra/rev1/info.json @@ -18,111 +18,111 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0.3 }, - { "x": 1, "y": 0.4 }, - { "x": 2, "y": 0.3 }, - { "x": 3, "y": 0.1 }, - { "x": 4, "y": 0 }, - { "x": 5, "y": 0.1 }, - { "x": 6, "y": 0.25 }, + {"matrix": [0, 0], "x": 0, "y": 0.3}, + {"matrix": [0, 1], "x": 1, "y": 0.4}, + {"matrix": [0, 2], "x": 2, "y": 0.3}, + {"matrix": [0, 3], "x": 3, "y": 0.1}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.1}, + {"matrix": [0, 6], "x": 6, "y": 0.25}, - { "x": 8, "y": 0.25 }, - { "x": 9, "y": 0.25 }, - { "x": 10, "y": 0.25 }, - { "x": 11, "y": 0.25 }, + {"matrix": [0, 7], "x": 8, "y": 0.25}, + {"matrix": [0, 8], "x": 9, "y": 0.25}, + {"matrix": [0, 9], "x": 10, "y": 0.25}, + {"matrix": [0, 10], "x": 11, "y": 0.25}, - { "x": 13, "y": 0.25 }, - { "x": 14, "y": 0.1 }, - { "x": 15, "y": 0 }, - { "x": 16, "y": 0.1 }, - { "x": 17, "y": 0.3 }, - { "x": 18, "y": 0.4 }, - { "x": 19, "y": 0.3 }, + {"matrix": [0, 11], "x": 13, "y": 0.25}, + {"matrix": [0, 12], "x": 14, "y": 0.1}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0.1}, + {"matrix": [0, 15], "x": 17, "y": 0.3}, + {"matrix": [0, 16], "x": 18, "y": 0.4}, + {"matrix": [0, 17], "x": 19, "y": 0.3}, - { "x": 0, "y": 1.3 }, - { "x": 1, "y": 1.4 }, - { "x": 2, "y": 1.3 }, - { "x": 3, "y": 1.1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1.1 }, - { "x": 6, "y": 1.25 }, + {"matrix": [1, 0], "x": 0, "y": 1.3}, + {"matrix": [1, 1], "x": 1, "y": 1.4}, + {"matrix": [1, 2], "x": 2, "y": 1.3}, + {"matrix": [1, 3], "x": 3, "y": 1.1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.1}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, - { "x": 8, "y": 1.25 }, - { "x": 9, "y": 1.25 }, - { "x": 10, "y": 1.25 }, - { "x": 11, "y": 1.25 }, + {"matrix": [1, 7], "x": 8, "y": 1.25}, + {"matrix": [1, 8], "x": 9, "y": 1.25}, + {"matrix": [1, 9], "x": 10, "y": 1.25}, + {"matrix": [1, 10], "x": 11, "y": 1.25}, - { "x": 13, "y": 1.25 }, - { "x": 14, "y": 1.1 }, - { "x": 15, "y": 1 }, - { "x": 16, "y": 1.1 }, - { "x": 17, "y": 1.3 }, - { "x": 18, "y": 1.4 }, - { "x": 19, "y": 1.3 }, + {"matrix": [1, 11], "x": 13, "y": 1.25}, + {"matrix": [1, 12], "x": 14, "y": 1.1}, + {"matrix": [1, 13], "x": 15, "y": 1}, + {"matrix": [1, 14], "x": 16, "y": 1.1}, + {"matrix": [1, 15], "x": 17, "y": 1.3}, + {"matrix": [1, 16], "x": 18, "y": 1.4}, + {"matrix": [1, 17], "x": 19, "y": 1.3}, - { "x": 0, "y": 2.3 }, - { "x": 1, "y": 2.4 }, - { "x": 2, "y": 2.3 }, - { "x": 3, "y": 2.1 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2.1 }, - { "x": 6, "y": 2.25 }, + {"matrix": [2, 0], "x": 0, "y": 2.3}, + {"matrix": [2, 1], "x": 1, "y": 2.4}, + {"matrix": [2, 2], "x": 2, "y": 2.3}, + {"matrix": [2, 3], "x": 3, "y": 2.1}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.1}, + {"matrix": [2, 6], "x": 6, "y": 2.25}, - { "x": 8, "y": 2.25 }, - { "x": 9, "y": 2.25 }, - { "x": 10, "y": 2.25 }, - { "x": 11, "y": 2.25 }, + {"matrix": [2, 7], "x": 8, "y": 2.25}, + {"matrix": [2, 8], "x": 9, "y": 2.25}, + {"matrix": [2, 9], "x": 10, "y": 2.25}, + {"matrix": [2, 10], "x": 11, "y": 2.25}, - { "x": 13, "y": 2.25 }, - { "x": 14, "y": 2.1 }, - { "x": 15, "y": 2 }, - { "x": 16, "y": 2.1 }, - { "x": 17, "y": 2.3 }, - { "x": 18, "y": 2.4 }, - { "x": 19, "y": 2.3 }, + {"matrix": [2, 11], "x": 13, "y": 2.25}, + {"matrix": [2, 12], "x": 14, "y": 2.1}, + {"matrix": [2, 13], "x": 15, "y": 2}, + {"matrix": [2, 14], "x": 16, "y": 2.1}, + {"matrix": [2, 15], "x": 17, "y": 2.3}, + {"matrix": [2, 16], "x": 18, "y": 2.4}, + {"matrix": [2, 17], "x": 19, "y": 2.3}, - { "x": 0, "y": 3.3 }, - { "x": 1, "y": 3.4 }, - { "x": 2, "y": 3.3 }, - { "x": 3, "y": 3.1 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3.1 }, - { "x": 6, "y": 3.25 }, + {"matrix": [3, 0], "x": 0, "y": 3.3}, + {"matrix": [3, 1], "x": 1, "y": 3.4}, + {"matrix": [3, 2], "x": 2, "y": 3.3}, + {"matrix": [3, 3], "x": 3, "y": 3.1}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.1}, + {"matrix": [3, 6], "x": 6, "y": 3.25}, - { "x": 8, "y": 3.25 }, - { "x": 9, "y": 3.25 }, - { "x": 10, "y": 3.25 }, - { "x": 11, "y": 3.25 }, + {"matrix": [3, 7], "x": 8, "y": 3.25}, + {"matrix": [3, 8], "x": 9, "y": 3.25}, + {"matrix": [3, 9], "x": 10, "y": 3.25}, + {"matrix": [3, 10], "x": 11, "y": 3.25}, - { "x": 13, "y": 3.25 }, - { "x": 14, "y": 3.1 }, - { "x": 15, "y": 3 }, - { "x": 16, "y": 3.1 }, - { "x": 17, "y": 3.3 }, - { "x": 18, "y": 3.4 }, - { "x": 19, "y": 3.3 }, + {"matrix": [3, 11], "x": 13, "y": 3.25}, + {"matrix": [3, 12], "x": 14, "y": 3.1}, + {"matrix": [3, 13], "x": 15, "y": 3}, + {"matrix": [3, 14], "x": 16, "y": 3.1}, + {"matrix": [3, 15], "x": 17, "y": 3.3}, + {"matrix": [3, 16], "x": 18, "y": 3.4}, + {"matrix": [3, 17], "x": 19, "y": 3.3}, - { "x": 0, "y": 4.3 }, - { "x": 1, "y": 4.4 }, - { "x": 2, "y": 4.3 }, - { "x": 3, "y": 4.1 }, - { "x": 4, "y": 4 }, - { "x": 5, "y": 4.1 }, - { "x": 6.25, "y": 4.5, "w": 1.5 }, + {"matrix": [4, 0], "x": 0, "y": 4.3}, + {"matrix": [4, 1], "x": 1, "y": 4.4}, + {"matrix": [4, 2], "x": 2, "y": 4.3}, + {"matrix": [4, 3], "x": 3, "y": 4.1}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.1}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5, "w": 1.5}, - { "x": 8, "y": 4.25 }, - { "x": 9, "y": 4.25 }, - { "x": 10, "y": 4.25 }, - { "x": 11, "y": 4.25 }, - - { "x": 12.25, "y": 4.5, "w": 1.5 }, - { "x": 14, "y": 4.1 }, - { "x": 15, "y": 4 }, - { "x": 16, "y": 4.1 }, - { "x": 17, "y": 4.3 }, - { "x": 18, "y": 4.4 }, - { "x": 19, "y": 4.3 } + {"matrix": [4, 7], "x": 8, "y": 4.25}, + {"matrix": [4, 8], "x": 9, "y": 4.25}, + {"matrix": [4, 9], "x": 10, "y": 4.25}, + {"matrix": [4, 10], "x": 11, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.5}, + + {"matrix": [4, 12], "x": 14, "y": 4.1}, + {"matrix": [4, 13], "x": 15, "y": 4}, + {"matrix": [4, 14], "x": 16, "y": 4.1}, + {"matrix": [4, 15], "x": 17, "y": 4.3}, + {"matrix": [4, 16], "x": 18, "y": 4.4}, + {"matrix": [4, 17], "x": 19, "y": 4.3} ] } } diff --git a/keyboards/malevolti/superlyra/rev1/rev1.h b/keyboards/malevolti/superlyra/rev1/rev1.h deleted file mode 100644 index fd3c819e11f1..000000000000 --- a/keyboards/malevolti/superlyra/rev1/rev1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 Domanic Calleja - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17, \ - K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \ - K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53, \ - K54, K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71, \ - K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 \ - ) \ - { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35 }, \ - { K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K51, K52, K53 }, \ - { K54, K55, K56, K57, K58, K59, K60, K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71 }, \ - { K72, K73, K74, K75, K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87, K88, K89 } \ - } diff --git a/keyboards/manta60/info.json b/keyboards/manta60/info.json index 2802f7582122..ba48f72ad233 100644 --- a/keyboards/manta60/info.json +++ b/keyboards/manta60/info.json @@ -24,85 +24,83 @@ "layouts": { "LAYOUT": { "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}, + {"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}, - {"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": 16, "y": 0}, + {"matrix": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1}, + {"matrix": [6, 6], "x": 10, "y": 1}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, + {"matrix": [7, 6], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, - {"x": 11, "y": 3}, - {"x": 12, "y": 3}, - {"x": 13, "y": 3}, - {"x": 14, "y": 3}, - {"x": 15, "y": 3}, - {"x": 16, "y": 3}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4}, + {"matrix": [4, 3], "x": 5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 3.5, "h": 2}, + {"matrix": [4, 5], "x": 7, "y": 3.5}, + {"matrix": [4, 6], "x": 7, "y": 4.5}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4.25}, - {"x": 6, "y": 3.5, "h": 2}, - {"x": 7, "y": 3.5}, - {"x": 7, "y": 4.5}, - - {"x": 9, "y": 4.5}, - {"x": 9, "y": 3.5}, - {"x": 10, "y": 3.5, "h": 2}, - {"x": 11, "y": 4.25}, - {"x": 12, "y": 4}, - - {"x": 15, "y": 4}, - {"x": 16, "y": 4} + {"matrix": [9, 6], "x": 9, "y": 4.5}, + {"matrix": [9, 5], "x": 9, "y": 3.5}, + {"matrix": [9, 4], "x": 10, "y": 3.5, "h": 2}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} ] } } diff --git a/keyboards/manta60/manta60.h b/keyboards/manta60/manta60.h deleted file mode 100644 index 163ed0153892..000000000000 --- a/keyboards/manta60/manta60.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 kamonanban - * - * 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 XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, XXX }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30, XXX }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ -} diff --git a/keyboards/marksard/treadstone32/lite/info.json b/keyboards/marksard/treadstone32/lite/info.json index 0ab62d9cded3..878b4db2ac27 100644 --- a/keyboards/marksard/treadstone32/lite/info.json +++ b/keyboards/marksard/treadstone32/lite/info.json @@ -12,5 +12,50 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [4, 4], "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 2], "x": 7.5, "y": 0}, + {"matrix": [0, 1], "x": 8.5, "y": 0}, + {"matrix": [0, 0], "x": 9.5, "y": 0}, + + {"matrix": [5, 4], "x": 0.25, "y": 1}, + {"matrix": [5, 3], "x": 1.25, "y": 1}, + {"matrix": [5, 2], "x": 2.25, "y": 1}, + {"matrix": [5, 1], "x": 3.25, "y": 1}, + + {"matrix": [5, 0], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1}, + {"matrix": [1, 3], "x": 6.25, "y": 1}, + {"matrix": [1, 2], "x": 7.25, "y": 1}, + {"matrix": [1, 1], "x": 8.25, "y": 1}, + {"matrix": [1, 0], "x": 9.25, "y": 1}, + + {"matrix": [6, 4], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [6, 0], "x": 4, "y": 2}, + + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 3], "x": 6.5, "y": 2}, + {"matrix": [2, 2], "x": 7.5, "y": 2}, + {"matrix": [2, 1], "x": 8.5, "y": 2}, + {"matrix": [2, 0], "x": 9.5, "y": 2}, + + {"matrix": [7, 0], "x": 3.25, "y": 3, "w": 2}, + + {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 2} + ] + } + } } diff --git a/keyboards/marksard/treadstone32/lite/lite.h b/keyboards/marksard/treadstone32/lite/lite.h deleted file mode 100644 index 90181124c098..000000000000 --- a/keyboards/marksard/treadstone32/lite/lite.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 marksard. - * - * 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 K_N KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L09, L08, L07, L06, L05, L04, L03, L02, L01, L00, \ - L19, L18, L17, L16, L15, L14, L13, L12, L11, L10, \ - L29, L28, L27, L26, L25, L24, L23, L22, L21, L20, \ - L35, L34 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { K_N, K_N, K_N, K_N, L34 }, \ - { L05, L06, L07, L08, L09 }, \ - { L15, L16, L17, L18, L19 }, \ - { L25, L26, L27, L28, L29 }, \ - { L35, K_N, K_N, K_N, K_N } \ - } diff --git a/keyboards/marksard/treadstone32/rev1/info.json b/keyboards/marksard/treadstone32/rev1/info.json index 6e75600e8e18..00538f7e8abc 100644 --- a/keyboards/marksard/treadstone32/rev1/info.json +++ b/keyboards/marksard/treadstone32/rev1/info.json @@ -12,5 +12,50 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [4, 4], "x": 0, "y": 0}, + {"matrix": [4, 3], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 1], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [0, 2], "x": 7.5, "y": 0}, + {"matrix": [0, 1], "x": 8.5, "y": 0}, + {"matrix": [0, 0], "x": 9.5, "y": 0}, + + {"matrix": [5, 4], "x": 0.25, "y": 1}, + {"matrix": [5, 3], "x": 1.25, "y": 1}, + {"matrix": [5, 2], "x": 2.25, "y": 1}, + {"matrix": [5, 1], "x": 3.25, "y": 1}, + {"matrix": [5, 0], "x": 4.25, "y": 1}, + + {"matrix": [1, 4], "x": 5.25, "y": 1}, + {"matrix": [1, 3], "x": 6.25, "y": 1}, + {"matrix": [1, 2], "x": 7.25, "y": 1}, + {"matrix": [1, 1], "x": 8.25, "y": 1}, + {"matrix": [1, 0], "x": 9.25, "y": 1}, + + {"matrix": [6, 4], "x": 0, "y": 2}, + {"matrix": [6, 3], "x": 1, "y": 2}, + {"matrix": [6, 2], "x": 2, "y": 2}, + {"matrix": [6, 1], "x": 3, "y": 2}, + {"matrix": [6, 0], "x": 4, "y": 2}, + + {"matrix": [2, 4], "x": 5.5, "y": 2}, + {"matrix": [2, 3], "x": 6.5, "y": 2}, + {"matrix": [2, 2], "x": 7.5, "y": 2}, + {"matrix": [2, 1], "x": 8.5, "y": 2}, + {"matrix": [2, 0], "x": 9.5, "y": 2}, + + {"matrix": [7, 0], "x": 3.25, "y": 3, "w": 2}, + + {"matrix": [3, 4], "x": 5.25, "y": 3, "w": 2} + ] + } + } } diff --git a/keyboards/marksard/treadstone32/rev1/rev1.h b/keyboards/marksard/treadstone32/rev1/rev1.h deleted file mode 100644 index 90181124c098..000000000000 --- a/keyboards/marksard/treadstone32/rev1/rev1.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Copyright 2019 marksard. - * - * 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 K_N KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L09, L08, L07, L06, L05, L04, L03, L02, L01, L00, \ - L19, L18, L17, L16, L15, L14, L13, L12, L11, L10, \ - L29, L28, L27, L26, L25, L24, L23, L22, L21, L20, \ - L35, L34 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { K_N, K_N, K_N, K_N, L34 }, \ - { L05, L06, L07, L08, L09 }, \ - { L15, L16, L17, L18, L19 }, \ - { L25, L26, L27, L28, L29 }, \ - { L35, K_N, K_N, K_N, K_N } \ - } diff --git a/keyboards/massdrop/ctrl/ctrl.h b/keyboards/massdrop/ctrl/ctrl.h index a3d66ba77551..9fc6eac15eda 100644 --- a/keyboards/massdrop/ctrl/ctrl.h +++ b/keyboards/massdrop/ctrl/ctrl.h @@ -9,28 +9,6 @@ #include "usb/udi_cdc.h" #include "usb/usb_hub.h" -#define LAYOUT( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, K12, K13, K14, K15, \ - K16, K17, K18, K19, K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, \ - K46, K47, K48, K49, K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, \ - K61, K62, K63, K64, K65, K66, K67, K68, K69, K70, K71, K72, K73, K74, K75, \ - K76, K77, K78, K79, K80, K81, K82, K83, K84, K85, K86, K87 \ - \ -) { \ - { K01, K02, K03, K04, K05, K06, K07, K08 }, \ - { K17, K18, K19, K20, K21, K22, K23, K24 }, \ - { K34, K35, K36, K37, K38, K39, K40, K41 }, \ - { K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K64, K65, K66, K67, K68, K69, K70, K71 }, \ - { K77, K78, K79, K80, K81, K82, K83, K84 }, \ - { K09, K10, K11, K12, K13, K14, K15, K16 }, \ - { K25, K26, K27, K28, K29, K30, K31, K32 }, \ - { K42, K43, K44, K45, K46, K47, K48, K49 }, \ - { K59, K60, K61, K62, K63, K76, K50, K33 }, \ - { K72, K73, K74, K75, K85, K86, K87, }, \ -} - #define TOGGLE_FLAG_AND_PRINT(var, name) { \ if (var) { \ dprintf(name " disabled\r\n"); \ diff --git a/keyboards/massdrop/ctrl/info.json b/keyboards/massdrop/ctrl/info.json index c9124ac7820e..e030881ca82f 100644 --- a/keyboards/massdrop/ctrl/info.json +++ b/keyboards/massdrop/ctrl/info.json @@ -19,93 +19,106 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESCAPE", "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":"PRINT SCREEN", "x":15.5, "y":0}, - {"label":"SCROLL LOCK", "x":16.5, "y":0}, - {"label":"PAUSE BREAK", "x":17.5, "y":0}, - {"label":"BACKTICK", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"MINUS", "x":11, "y":1.5}, - {"label":"EQUALS", "x":12, "y":1.5}, - {"label":"BACKSPACE", "x":13, "y":1.5, "w":2}, - {"label":"INSERT", "x":15.5, "y":1.5}, - {"label":"HOME", "x":16.5, "y":1.5}, - {"label":"PAGE UP", "x":17.5, "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":"LEFT BRACKET", "x":11.5, "y":2.5}, - {"label":"RIGHT BRACKET", "x":12.5, "y":2.5}, - {"label":"BACK SLASH", "x":13.5, "y":2.5, "w":1.5}, - {"label":"DELETE", "x":15.5, "y":2.5}, - {"label":"END", "x":16.5, "y":2.5}, - {"label":"PAGE DOWN", "x":17.5, "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":"SEMICOLON", "x":10.75, "y":3.5}, - {"label":"SINGLE TICK", "x":11.75, "y":3.5}, - {"label":"ENTER", "x":12.75, "y":3.5, "w":2.25}, - {"label":"LEFT SHIFT", "x":0, "y":4.5, "w":2.25}, - {"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":"COMMA", "x":9.25, "y":4.5}, - {"label":"PERIOD", "x":10.25, "y":4.5}, - {"label":"FORWARD SLASH", "x":11.25, "y":4.5}, - {"label":"RIGHT SHIFT", "x":12.25, "y":4.5, "w":2.75}, - {"label":"UP ARROW", "x":16.5, "y":4.5}, - {"label":"LEFT CTRL", "x":0.005, "y":5.5, "w":1.25}, - {"label":"LEFT WIN", "x":1.255, "y":5.5, "w":1.25}, - {"label":"LEFT ALT", "x":2.505, "y":5.5, "w":1.25}, - {"label":"SPACEBAR", "x":3.75, "y":5.5, "w":6.25}, - {"label":"RIGHT ALT", "x":10, "y":5.5, "w":1.25}, - {"label":"FN", "x":11.25, "y":5.5, "w":1.25}, - {"label":"MENU", "x":12.5, "y":5.5, "w":1.25}, - {"label":"RIGHT CTRL", "x":13.75, "y":5.5, "w":1.25}, - {"label":"LEFT ARROW", "x":15.5, "y":5.5}, - {"label":"DOWN ARROW", "x":16.5, "y":5.5}, - {"label":"RIGHT ARROW", "x":17.5, "y":5.5} + {"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": [6, 0], "x": 9.5, "y": 0}, + + {"matrix": [6, 1], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0}, + {"matrix": [6, 3], "x": 13, "y": 0}, + {"matrix": [6, 4], "x": 14, "y": 0}, + + {"matrix": [6, 5], "x": 15.5, "y": 0}, + {"matrix": [6, 6], "x": 16.5, "y": 0}, + {"matrix": [6, 7], "x": 17.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [7, 0], "x": 8, "y": 1.5}, + {"matrix": [7, 1], "x": 9, "y": 1.5}, + {"matrix": [7, 2], "x": 10, "y": 1.5}, + {"matrix": [7, 3], "x": 11, "y": 1.5}, + {"matrix": [7, 4], "x": 12, "y": 1.5}, + {"matrix": [7, 5], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [7, 6], "x": 15.5, "y": 1.5}, + {"matrix": [7, 7], "x": 16.5, "y": 1.5}, + {"matrix": [9, 7], "x": 17.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [8, 0], "x": 8.5, "y": 2.5}, + {"matrix": [8, 1], "x": 9.5, "y": 2.5}, + {"matrix": [8, 2], "x": 10.5, "y": 2.5}, + {"matrix": [8, 3], "x": 11.5, "y": 2.5}, + {"matrix": [8, 4], "x": 12.5, "y": 2.5}, + {"matrix": [8, 5], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + {"matrix": [8, 7], "x": 16.5, "y": 2.5}, + {"matrix": [9, 6], "x": 17.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [9, 0], "x": 8.75, "y": 3.5}, + {"matrix": [9, 1], "x": 9.75, "y": 3.5}, + {"matrix": [9, 2], "x": 10.75, "y": 3.5}, + {"matrix": [9, 3], "x": 11.75, "y": 3.5}, + {"matrix": [9, 4], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [10, 0], "x": 9.25, "y": 4.5}, + {"matrix": [10, 1], "x": 10.25, "y": 4.5}, + {"matrix": [10, 2], "x": 11.25, "y": 4.5}, + {"matrix": [10, 3], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [9, 5], "x": 16.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0.005, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.255, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.505, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 4], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 4], "x": 15.5, "y": 5.5}, + {"matrix": [10, 5], "x": 16.5, "y": 5.5}, + {"matrix": [10, 6], "x": 17.5, "y": 5.5} ] } } diff --git a/keyboards/matthewdias/minim/info.json b/keyboards/matthewdias/minim/info.json index f0aa07e6e93d..c431ae5f106d 100644 --- a/keyboards/matthewdias/minim/info.json +++ b/keyboards/matthewdias/minim/info.json @@ -18,52 +18,55 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Tab", "x": 0, "y": 0, "w": 1.25 }, - { "label": "Q", "x": 1.25, "y": 0 }, - { "label": "W", "x": 2.25, "y": 0 }, - { "label": "E", "x": 3.25, "y": 0 }, - { "label": "R", "x": 4.25, "y": 0 }, - { "label": "T", "x": 5.25, "y": 0 }, - { "label": "Y", "x": 6.25, "y": 0 }, - { "label": "U", "x": 7.25, "y": 0 }, - { "label": "I", "x": 8.25, "y": 0 }, - { "label": "O", "x": 9.25, "y": 0 }, - { "label": "P", "x": 10.25, "y": 0 }, - { "label": "{", "x": 11.25, "y": 0 }, - { "label": "}", "x": 12.25, "y": 0 }, - { "label": "Back", "x": 13.25, "y": 0, "w": 1.25 }, - { "label": "Ctrl", "x": 0, "y": 1, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 1 }, - { "label": "S", "x": 2.75, "y": 1 }, - { "label": "D", "x": 3.75, "y": 1 }, - { "label": "F", "x": 4.75, "y": 1 }, - { "label": "G", "x": 5.75, "y": 1 }, - { "label": "H", "x": 6.75, "y": 1 }, - { "label": "J", "x": 7.75, "y": 1 }, - { "label": "K", "x": 8.75, "y": 1 }, - { "label": "L", "x": 9.75, "y": 1 }, - { "label": ":", "x": 10.75, "y": 1 }, - { "label": "\"", "x": 11.75, "y": 1 }, - { "label": "Enter", "x": 12.75, "y": 1, "w": 1.75 }, - { "label": "Shift", "x": 0, "y": 2, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 2 }, - { "label": "X", "x": 3.25, "y": 2 }, - { "label": "C", "x": 4.25, "y": 2 }, - { "label": "V", "x": 5.25, "y": 2 }, - { "label": "B", "x": 6.25, "y": 2 }, - { "label": "N", "x": 7.25, "y": 2 }, - { "label": "M", "x": 8.25, "y": 2 }, - { "label": "<", "x": 9.25, "y": 2 }, - { "label": ">", "x": 10.25, "y": 2 }, - { "label": "?", "x": 11.25, "y": 2 }, - { "label": "Shift", "x": 12.25, "y": 2, "w": 2.25 }, - { "label": "Opt", "x": 1.5, "y": 3 }, - { "label": "Cmd", "x": 2.5, "y": 3, "w": 1.25 }, - { "label": "", "x": 3.75, "y": 3, "w": 2 }, - { "label": "", "x": 5.75, "y": 3, "w": 3 }, - { "label": "", "x": 8.75, "y": 3, "w": 2 }, - { "label": "Cmd", "x": 10.75, "y": 3, "w": 1.25 }, - { "label": "Opt", "x": 12, "y": 3 } + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.25}, + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + {"matrix": [0, 13], "x": 13.25, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 8], "x": 7.75, "y": 1}, + {"matrix": [1, 9], "x": 8.75, "y": 1}, + {"matrix": [1, 10], "x": 9.75, "y": 1}, + {"matrix": [1, 11], "x": 10.75, "y": 1}, + {"matrix": [1, 12], "x": 11.75, "y": 1}, + {"matrix": [1, 13], "x": 12.75, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 2.25}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 13], "x": 12.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 5.75, "y": 3, "w": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 2}, + {"matrix": [3, 11], "x": 10.75, "y": 3, "w": 1.25}, + {"matrix": [3, 12], "x": 12, "y": 3} ] } } diff --git a/keyboards/matthewdias/minim/minim.h b/keyboards/matthewdias/minim/minim.h deleted file mode 100644 index 7a732a8ab97f..000000000000 --- a/keyboards/matthewdias/minim/minim.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 Matthew Dias - -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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K31, K32, K34, K37, K39, K3B, K3C \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, KC_NO, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, KC_NO, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ - { KC_NO, K31, K32, KC_NO, K34, KC_NO, KC_NO, K37, KC_NO, K39, KC_NO, K3B, K3C, KC_NO } \ -} diff --git a/keyboards/mechanickeys/miniashen40/info.json b/keyboards/mechanickeys/miniashen40/info.json index 73d6b3aa1a68..78f1156d3213 100644 --- a/keyboards/mechanickeys/miniashen40/info.json +++ b/keyboards/mechanickeys/miniashen40/info.json @@ -18,57 +18,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Del", "x":11, "y":0}, - {"label":"M1", "x":12.25, "y":0}, - {"label":"M2", "x":13.25, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [2, 12], "x": 11, "y": 0}, - {"label":"Ctrl", "x":0, "y":1, "w":1.25}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":6.25, "y":1}, - {"label":"J", "x":7.25, "y":1}, - {"label":"K", "x":8.25, "y":1}, - {"label":"L", "x":9.25, "y":1}, - {"label":"Enter", "x":10.25, "y":1, "w":1.75}, - {"label":"M3", "x":12.25, "y":1}, - {"label":"M4", "x":13.25, "y":1}, + {"matrix": [0, 11], "x": 12.25, "y": 0}, + {"matrix": [0, 12], "x": 13.25, "y": 0}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":6.75, "y":2}, - {"label":"M", "x":7.75, "y":2}, - {"label":",", "x":8.75, "y":2}, - {"label":".", "x":9.75, "y":2}, - {"label":"Fn", "x":10.75, "y":2, "w":1.25}, - {"label":"Up", "x":12.25, "y":2.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.75}, - {"label":"Alt", "x":1, "y":3}, - {"label":"OS", "x":2, "y":3, "w":1.5}, - {"label":"", "x":3.5, "y":3, "w":2.75}, - {"label":"", "x":6.25, "y":3, "w":2.25}, - {"label":"Os", "x":8.5, "y":3, "w":1.5}, - {"label":"Alt", "x":10, "y":3}, - {"label":"Left", "x":11.25, "y":3.25}, - {"label":"Down", "x":12.25, "y":3.25}, - {"label":"Right", "x":13.25, "y":3.25} + {"matrix": [1, 11], "x": 12.25, "y": 1}, + {"matrix": [1, 12], "x": 13.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 11], "x": 12.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 1, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 8.5, "y": 3, "w": 1.5}, + {"matrix": [3, 9], "x": 10, "y": 3}, + + {"matrix": [3, 10], "x": 11.25, "y": 3.25}, + {"matrix": [3, 11], "x": 12.25, "y": 3.25}, + {"matrix": [3, 12], "x": 13.25, "y": 3.25} ] } } diff --git a/keyboards/mechanickeys/miniashen40/miniashen40.h b/keyboards/mechanickeys/miniashen40/miniashen40.h deleted file mode 100644 index 5d6e639b205d..000000000000 --- a/keyboards/mechanickeys/miniashen40/miniashen40.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2021 jfescobar18 - * - * 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 XXX KC_NO - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │2C ││0B │0C │ - * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤├───┼───┤ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A ││1B │1C │ - * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤└───┴───┘ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │┌───┐ - * └───┬──┴┬──┴──┬┴───┴───┴─┬─┴───┴──┬┴───┴┬──┴┬───┘│2B │ - * │30 │31 │33 │36 │38 │39 │┌───┼───┼───┐ - * └───┴─────┴──────────┴────────┴─────┴───┘│3A │3B │3C │ - * └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K2C, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \ - K30, K31, K33, K36, K38, K39, K3A, K3B, K3C \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, XXX, K33, XXX, XXX, K36, XXX, K38, K39, K3A, K3B, K3C } \ -} diff --git a/keyboards/mechanickeys/undead60m/info.json b/keyboards/mechanickeys/undead60m/info.json index 1821fbdbaf5d..5fd2c835142d 100644 --- a/keyboards/mechanickeys/undead60m/info.json +++ b/keyboards/mechanickeys/undead60m/info.json @@ -26,81 +26,86 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"F1", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"Esc", "x":2.5, "y":0}, - {"label":"1!", "x":3.5, "y":0}, - {"label":"2@", "x":4.5, "y":0}, - {"label":"3#", "x":5.5, "y":0}, - {"label":"4$", "x":6.5, "y":0}, - {"label":"5%", "x":7.5, "y":0}, - {"label":"6^", "x":8.5, "y":0}, - {"label":"7&", "x":9.5, "y":0}, - {"label":"8*", "x":10.5, "y":0}, - {"label":"9(", "x":11.5, "y":0}, - {"label":"0)", "x":12.5, "y":0}, - {"label":"-_", "x":13.5, "y":0}, - {"label":"=+", "x":14.5, "y":0}, - {"label":"Backspace", "x":15.5, "y":0, "w":2}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, - {"label":"F2", "x":0, "y":1}, - {"label":"F3", "x":1, "y":1}, - {"label":"Tab", "x":2.5, "y":1, "w":1.5}, - {"label":"Q", "x":4, "y":1}, - {"label":"W", "x":5, "y":1}, - {"label":"E", "x":6, "y":1}, - {"label":"R", "x":7, "y":1}, - {"label":"T", "x":8, "y":1}, - {"label":"Y", "x":9, "y":1}, - {"label":"U", "x":10, "y":1}, - {"label":"I", "x":11, "y":1}, - {"label":"O", "x":12, "y":1}, - {"label":"P", "x":13, "y":1}, - {"label":"[{", "x":14, "y":1}, - {"label":"]}", "x":15, "y":1}, - {"label":"\\|", "x":16, "y":1, "w":1.5}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 14.5, "y": 0}, + {"matrix": [0, 15], "x": 15.5, "y": 0, "w": 2}, - {"label":"F4", "x":0, "y":2}, - {"label":"F5", "x":1, "y":2}, - {"label":"Caps", "x":2.5, "y":2, "w":1.75}, - {"label":"A", "x":4.25, "y":2}, - {"label":"S", "x":5.25, "y":2}, - {"label":"D", "x":6.25, "y":2}, - {"label":"F", "x":7.25, "y":2}, - {"label":"G", "x":8.25, "y":2}, - {"label":"H", "x":9.25, "y":2}, - {"label":"J", "x":10.25, "y":2}, - {"label":"K", "x":11.25, "y":2}, - {"label":"L", "x":12.25, "y":2}, - {"label":";:", "x":13.25, "y":2}, - {"label":"'\"", "x":14.25, "y":2}, - {"label":"Enter", "x":15.25, "y":2, "w":2.25}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, - {"label":"F6", "x":0, "y":3}, - {"label":"F7", "x":1, "y":3}, - {"label":"Shift", "x":2.5, "y":3, "w":2.25}, - {"label":"Z", "x":4.75, "y":3}, - {"label":"X", "x":5.75, "y":3}, - {"label":"C", "x":6.75, "y":3}, - {"label":"V", "x":7.75, "y":3}, - {"label":"B", "x":8.75, "y":3}, - {"label":"N", "x":9.75, "y":3}, - {"label":"M", "x":10.75, "y":3}, - {"label":",<", "x":11.75, "y":3}, - {"label":".>", "x":12.75, "y":3}, - {"label":"/?", "x":13.75, "y":3}, - {"label":"Shift", "x":14.75, "y":3, "w":2.75}, + {"matrix": [1, 2], "x": 2.5, "y": 1, "w": 1.5}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, - {"label":"F1", "x":0, "y":4}, - {"label":"F2", "x":1, "y":4}, - {"label":"Ctrl", "x":2.5, "y":4, "w":1.25}, - {"label":"OS", "x":3.75, "y":4, "w":1.25}, - {"label":"Alt", "x":5, "y":4, "w":1.25}, - {"label":"Space", "x":6.25, "y":4, "w":6.25}, - {"label":"Alt", "x":12.5, "y":4, "w":1.25}, - {"label":"OS", "x":13.75, "y":4, "w":1.25}, - {"label":"Ctrl", "x":15, "y":4, "w":1.25}, - {"label":"Fn", "x":16.25, "y":4, "w":1.25} + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + + {"matrix": [2, 2], "x": 2.5, "y": 2, "w": 1.75}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 2.25}, + {"matrix": [3, 3], "x": 4.75, "y": 3}, + {"matrix": [3, 4], "x": 5.75, "y": 3}, + {"matrix": [3, 5], "x": 6.75, "y": 3}, + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3}, + {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 6.25, "y": 4, "w": 6.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 15, "y": 4, "w": 1.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/mechanickeys/undead60m/undead60m.c b/keyboards/mechanickeys/undead60m/undead60m.c index 1bda4b1bd83c..995b56e54496 100644 --- a/keyboards/mechanickeys/undead60m/undead60m.c +++ b/keyboards/mechanickeys/undead60m/undead60m.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "undead60m.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } if (index == 0) { diff --git a/keyboards/mechanickeys/undead60m/undead60m.h b/keyboards/mechanickeys/undead60m/undead60m.h deleted file mode 100644 index 4bc665ffd87e..000000000000 --- a/keyboards/mechanickeys/undead60m/undead60m.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 jfescobar18 - * - * 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( \ - 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, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K43, K44, K48, K4C, K4D, K4E, K4F \ -) \ -{ \ - { 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, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, KC_NO }, \ - { K40, K41, K42, K43, K44, KC_NO, KC_NO, KC_NO, K48, KC_NO, KC_NO, KC_NO, K4C, K4D, K4E, K4F } \ -} diff --git a/keyboards/mechkeys/mk60/info.json b/keyboards/mechkeys/mk60/info.json index 0e79cae73e3a..ef7658a1e13d 100644 --- a/keyboards/mechkeys/mk60/info.json +++ b/keyboards/mechkeys/mk60/info.json @@ -30,74 +30,78 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K0A", "x":10, "y":0}, - {"label":"K0B", "x":11, "y":0}, - {"label":"K0C", "x":12, "y":0}, - {"label":"K0D", "x":13, "y":0}, - {"label":"K0E", "x":14, "y":0}, - {"label":"K10", "x":0, "y":1, "w":1.5}, - {"label":"K12", "x":1.5, "y":1}, - {"label":"K13", "x":2.5, "y":1}, - {"label":"K14", "x":3.5, "y":1}, - {"label":"K15", "x":4.5, "y":1}, - {"label":"K16", "x":5.5, "y":1}, - {"label":"K17", "x":6.5, "y":1}, - {"label":"K18", "x":7.5, "y":1}, - {"label":"K19", "x":8.5, "y":1}, - {"label":"K1A", "x":9.5, "y":1}, - {"label":"K1B", "x":10.5, "y":1}, - {"label":"K1C", "x":11.5, "y":1}, - {"label":"K1D", "x":12.5, "y":1}, - {"label":"K1E", "x":13.5, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K22", "x":1.75, "y":2}, - {"label":"K23", "x":2.75, "y":2}, - {"label":"K24", "x":3.75, "y":2}, - {"label":"K25", "x":4.75, "y":2}, - {"label":"K26", "x":5.75, "y":2}, - {"label":"K27", "x":6.75, "y":2}, - {"label":"K28", "x":7.75, "y":2}, - {"label":"K29", "x":8.75, "y":2}, - {"label":"K2A", "x":9.75, "y":2}, - {"label":"K2B", "x":10.75, "y":2}, - {"label":"K2C", "x":11.75, "y":2}, - {"label":"K2D", "x":12.75, "y":2, "w":2.25}, - {"label":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K33", "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":"K38", "x":8, "y":3}, - {"label":"K39", "x":9, "y":3}, - {"label":"K3A", "x":10, "y":3}, - {"label":"K3B", "x":11, "y":3}, - {"label":"K3C", "x":12, "y":3}, - {"label":"K3D", "x":13, "y":3}, - {"label":"K3E", "x":14, "y":3}, - {"label":"K40", "x":0, "y":4, "w":1.75}, - {"label":"K42", "x":1.75, "y":4, "w":1.25}, - {"label":"K43", "x":3, "y":4, "w":1.25}, - {"label":"K44", "x":4.25, "y":4, "w":1.25}, - {"label":"K47", "x":5.5, "y":4, "w":3}, - {"label":"K49", "x":8.5, "y":4, "w":1.5}, - {"label":"K4A", "x":10, "y":4}, - {"label":"K4B", "x":11, "y":4}, - {"label":"K4C", "x":12, "y":4}, - {"label":"K4D", "x":13, "y":4}, - {"label":"K4E", "x":14, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 3}, + {"matrix": [4, 9], "x": 8.5, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} ] } } diff --git a/keyboards/mechkeys/mk60/mk60.h b/keyboards/mechkeys/mk60/mk60.h deleted file mode 100644 index 66eb416a6fae..000000000000 --- a/keyboards/mechkeys/mk60/mk60.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 MechMerlin - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ - k40, k42, k43, k44, k47, k49, k4A, k4B, k4C, k4D, k4E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \ - { k10, KC_NO, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \ - { k20, KC_NO, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, KC_NO}, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E}, \ - { k40, KC_NO, k42, k43, k44, KC_NO, KC_NO, k47, KC_NO, k49, k4A, k4B, k4C, k4D, k4E}, \ -} diff --git a/keyboards/mechllama/g35/g35.h b/keyboards/mechllama/g35/g35.h deleted file mode 100644 index 2275272452e6..000000000000 --- a/keyboards/mechllama/g35/g35.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2019 Kaylyn Bogle - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, \ - K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, K26, \ - K30, K31, K32, K33, K34, K35, K36, \ - K40, K41, K42, K43, K44, K45, K46 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, }, \ - { K10, K11, K12, K13, K14, K15, K16, }, \ - { K20, K21, K22, K23, K24, K25, K26, }, \ - { K30, K31, K32, K33, K34, K35, K36, }, \ - { K40, K41, K42, K43, K44, K45, K46 } \ -} diff --git a/keyboards/mechllama/g35/info.json b/keyboards/mechllama/g35/info.json index 310cf6367f7d..739957342a7c 100644 --- a/keyboards/mechllama/g35/info.json +++ b/keyboards/mechllama/g35/info.json @@ -14,7 +14,47 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"F1", "x":0, "y":0.5}, {"label":"Esc", "x":1, "y":0.5}, {"label":"1", "x":2, "y":0}, {"label":"2", "x":3, "y":0.15}, {"label":"3", "x":4, "y":0}, {"label":"4", "x":5, "y":0}, {"label":"5", "x":6, "y":0}, {"label":"F2", "x":0, "y":1.5}, {"label":"Tab", "x":1, "y":1.5}, {"label":"Q", "x":2, "y":1}, {"label":"W", "x":3, "y":1.15}, {"label":"E", "x":4, "y":1}, {"label":"R", "x":5, "y":1}, {"label":"T", "x":6, "y":1}, {"label":"F3", "x":0, "y":2.5}, {"label":"Shift", "x":1, "y":2.5}, {"label":"A", "x":2, "y":2}, {"label":"S", "x":3, "y":2.15}, {"label":"D", "x":4, "y":2}, {"label":"F", "x":5, "y":2}, {"label":"G", "x":6, "y":2}, {"label":"F4", "x":0, "y":3.5}, {"label":"Ctrl", "x":1, "y":3.5}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3.15}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"F5", "x":0, "y":4.5}, {"label":"Super", "x":1, "y":4.5}, {"label":"Alt", "x":2, "y":4, "h":1.5}, {"label":"Bksp", "x":3, "y":4.25, "h":1.25}, {"label":"Enter", "x":4, "y":4, "h":1.5}, {"label":"Space", "x":5, "y":4, "h":1.75}, {"label":"Fn", "x":6, "y":4, "h":1.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.15}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.15}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.15}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.15}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2, "y": 4, "h": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 4.25, "h": 1.25}, + {"matrix": [4, 4], "x": 4, "y": 4, "h": 1.5}, + {"matrix": [4, 5], "x": 5, "y": 4, "h": 1.75}, + {"matrix": [4, 6], "x": 6, "y": 4, "h": 1.75} + ] } } } diff --git a/keyboards/mechlovin/th1800/info.json b/keyboards/mechlovin/th1800/info.json index d42f6dbef6fd..001c73f68399 100644 --- a/keyboards/mechlovin/th1800/info.json +++ b/keyboards/mechlovin/th1800/info.json @@ -21,114 +21,131 @@ }, "processor": "atmega32a", "bootloader": "usbasploader", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0,B7)", "x":0, "y":0}, - {"label":"K01 (B0,C0)", "x":1.25, "y":0}, - {"label":"K02 (B0,C1)", "x":2.25, "y":0}, - {"label":"K03 (B0,C2)", "x":3.25, "y":0}, - {"label":"K04 (B0,C3)", "x":4.25, "y":0}, - {"label":"K05 (B0,C4)", "x":5.5, "y":0}, - {"label":"K06 (B0,C5)", "x":6.5, "y":0}, - {"label":"K07 (B0,C6)", "x":7.5, "y":0}, - {"label":"K08 (B0,C7)", "x":8.5, "y":0}, - {"label":"K09 (B0,D0)", "x":9.75, "y":0}, - {"label":"K0A (B0,D1)", "x":10.75, "y":0}, - {"label":"K0B (B0,D2)", "x":11.75, "y":0}, - {"label":"K0C (B0,D3)", "x":12.75, "y":0}, - {"label":"K0E (B0,D5)", "x":15.5, "y":0}, - {"label":"K0F (B0,D6)", "x":16.5, "y":0}, - {"label":"K0G (B0,D7)", "x":17.5, "y":0}, - {"label":"K0H (B0,E0)", "x":18.5, "y":0}, - {"label":"K5E (B5,D5)", "x":15.5, "y":1}, - {"label":"K5F (B5,D6)", "x":16.5, "y":1}, - {"label":"K5G (B5,D7)", "x":17.5, "y":1}, - {"label":"K5H (B5,E0)", "x":18.5, "y":1}, - {"label":"K10 (B1,B7)", "x":0, "y":2}, - {"label":"K11 (B1,C0)", "x":1, "y":2}, - {"label":"K12 (B1,C1)", "x":2, "y":2}, - {"label":"K13 (B1,C2)", "x":3, "y":2}, - {"label":"K14 (B1,C3)", "x":4, "y":2}, - {"label":"K15 (B1,C4)", "x":5, "y":2}, - {"label":"K16 (B1,C5)", "x":6, "y":2}, - {"label":"K17 (B1,C6)", "x":7, "y":2}, - {"label":"K18 (B1,C7)", "x":8, "y":2}, - {"label":"K19 (B1,D0)", "x":9, "y":2}, - {"label":"K1A (B1,D1)", "x":10, "y":2}, - {"label":"K1B (B1,D2)", "x":11, "y":2}, - {"label":"K1C (B1,D3)", "x":12, "y":2}, - {"label":"K1D (B1,D4)", "x":13, "y":2}, - {"label":"K0D (B0,D4)", "x":14, "y":2}, - {"label":"K1E (B1,D5)", "x":15.5, "y":2}, - {"label":"K1F (B1,D6)", "x":16.5, "y":2}, - {"label":"K1G (B1,D7)", "x":17.5, "y":2}, - {"label":"K1H (B1,E0)", "x":18.5, "y":2}, - {"label":"K20 (B2,B7)", "x":0, "y":3, "w":1.5}, - {"label":"K21 (B2,C0)", "x":1.5, "y":3}, - {"label":"K22 (B2,C1)", "x":2.5, "y":3}, - {"label":"K23 (B2,C2)", "x":3.5, "y":3}, - {"label":"K24 (B2,C3)", "x":4.5, "y":3}, - {"label":"K25 (B2,C4)", "x":5.5, "y":3}, - {"label":"K26 (B2,C5)", "x":6.5, "y":3}, - {"label":"K27 (B2,C6)", "x":7.5, "y":3}, - {"label":"K28 (B2,C7)", "x":8.5, "y":3}, - {"label":"K29 (B2,D0)", "x":9.5, "y":3}, - {"label":"K2A (B2,D1)", "x":10.5, "y":3}, - {"label":"K2B (B2,D2)", "x":11.5, "y":3}, - {"label":"K2C (B2,D3)", "x":12.5, "y":3}, - {"label":"K2D (B2,D4)", "x":13.5, "y":3, "w":1.5}, - {"label":"K2E (B2,D5)", "x":15.5, "y":3}, - {"label":"K2F (B2,D6)", "x":16.5, "y":3}, - {"label":"K2G (B2,D7)", "x":17.5, "y":3}, - {"label":"K2H (B2,E0)", "x":18.5, "y":3}, - {"label":"K30 (B3,B7)", "x":0, "y":4, "w":1.75}, - {"label":"K31 (B3,C0)", "x":1.75, "y":4}, - {"label":"K32 (B3,C1)", "x":2.75, "y":4}, - {"label":"K33 (B3,C2)", "x":3.75, "y":4}, - {"label":"K34 (B3,C3)", "x":4.75, "y":4}, - {"label":"K35 (B3,C4)", "x":5.75, "y":4}, - {"label":"K36 (B3,C5)", "x":6.75, "y":4}, - {"label":"K37 (B3,C6)", "x":7.75, "y":4}, - {"label":"K38 (B3,C7)", "x":8.75, "y":4}, - {"label":"K39 (B3,D0)", "x":9.75, "y":4}, - {"label":"K3A (B3,D1)", "x":10.75, "y":4}, - {"label":"K3B (B3,D2)", "x":11.75, "y":4}, - {"label":"K3C (B3,D3)", "x":12.75, "y":4}, - {"label":"K3D (B3,D4)", "x":13.75, "y":4, "w":1.25}, - {"label":"K3E (B3,D5)", "x":15.5, "y":4}, - {"label":"K3F (B3,D6)", "x":16.5, "y":4}, - {"label":"K3G (B3,D7)", "x":17.5, "y":4}, - {"label":"K3H (B3,E0)", "x":18.5, "y":4}, - {"label":"K40 (B4,B7)", "x":0, "y":5, "w":1.25}, - {"label":"K41 (B4,C0)", "x":1.25, "y":5}, - {"label":"K42 (B4,C1)", "x":2.25, "y":5}, - {"label":"K43 (B4,C2)", "x":3.25, "y":5}, - {"label":"K44 (B4,C3)", "x":4.25, "y":5}, - {"label":"K45 (B4,C4)", "x":5.25, "y":5}, - {"label":"K46 (B4,C5)", "x":6.25, "y":5}, - {"label":"K47 (B4,C6)", "x":7.25, "y":5}, - {"label":"K48 (B4,C7)", "x":8.25, "y":5}, - {"label":"K49 (B4,D0)", "x":9.25, "y":5}, - {"label":"K4A (B4,D1)", "x":10.25, "y":5}, - {"label":"K4B (B4,D2)", "x":11.25, "y":5}, - {"label":"K4C (B4,D3)", "x":12.25, "y":5, "w":1.75}, - {"label":"K4D (B4,D4)", "x":14.25, "y":5.25}, - {"label":"K4E (B4,D5)", "x":15.5, "y":5}, - {"label":"K4F (B4,D6)", "x":16.5, "y":5}, - {"label":"K4G (B4,D7)", "x":17.5, "y":5}, - {"label":"K4H (B4,E0)", "x":18.5, "y":5, "h":2}, - {"label":"K50 (B5,B7)", "x":0, "y":6, "w":1.5}, - {"label":"K51 (B5,C0)", "x":1.5, "y":6}, - {"label":"K52 (B5,C1)", "x":2.5, "y":6, "w":1.5}, - {"label":"K55 (B5,C4)", "x":4, "y":6, "w":6.25}, - {"label":"K57 (B5,C6)", "x":10.25, "y":6, "w":1.25}, - {"label":"K58 (B5,C7)", "x":11.5, "y":6, "w":1.5}, - {"label":"K59 (B5,D0)", "x":13.25, "y":6.25}, - {"label":"K5A (B5,D1)", "x":14.25, "y":6.25}, - {"label":"K5B (B5,D2)", "x":15.25, "y":6.25}, - {"label":"K5C (B5,D3)", "x":16.5, "y":6}, - {"label":"K5D (B5,D4)", "x":17.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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + + {"matrix": [5, 14], "x": 15.5, "y": 1}, + {"matrix": [5, 15], "x": 16.5, "y": 1}, + {"matrix": [5, 16], "x": 17.5, "y": 1}, + {"matrix": [5, 17], "x": 18.5, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "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, 8], "x": 8, "y": 2}, + {"matrix": [1, 9], "x": 9, "y": 2}, + {"matrix": [1, 10], "x": 10, "y": 2}, + {"matrix": [1, 11], "x": 11, "y": 2}, + {"matrix": [1, 12], "x": 12, "y": 2}, + {"matrix": [1, 13], "x": 13, "y": 2}, + {"matrix": [0, 13], "x": 14, "y": 2}, + + {"matrix": [1, 14], "x": 15.5, "y": 2}, + {"matrix": [1, 15], "x": 16.5, "y": 2}, + {"matrix": [1, 16], "x": 17.5, "y": 2}, + {"matrix": [1, 17], "x": 18.5, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 3}, + {"matrix": [2, 2], "x": 2.5, "y": 3}, + {"matrix": [2, 3], "x": 3.5, "y": 3}, + {"matrix": [2, 4], "x": 4.5, "y": 3}, + {"matrix": [2, 5], "x": 5.5, "y": 3}, + {"matrix": [2, 6], "x": 6.5, "y": 3}, + {"matrix": [2, 7], "x": 7.5, "y": 3}, + {"matrix": [2, 8], "x": 8.5, "y": 3}, + {"matrix": [2, 9], "x": 9.5, "y": 3}, + {"matrix": [2, 10], "x": 10.5, "y": 3}, + {"matrix": [2, 11], "x": 11.5, "y": 3}, + {"matrix": [2, 12], "x": 12.5, "y": 3}, + {"matrix": [2, 13], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 3}, + {"matrix": [2, 15], "x": 16.5, "y": 3}, + {"matrix": [2, 16], "x": 17.5, "y": 3}, + {"matrix": [2, 17], "x": 18.5, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 4}, + {"matrix": [3, 2], "x": 2.75, "y": 4}, + {"matrix": [3, 3], "x": 3.75, "y": 4}, + {"matrix": [3, 4], "x": 4.75, "y": 4}, + {"matrix": [3, 5], "x": 5.75, "y": 4}, + {"matrix": [3, 6], "x": 6.75, "y": 4}, + {"matrix": [3, 7], "x": 7.75, "y": 4}, + {"matrix": [3, 8], "x": 8.75, "y": 4}, + {"matrix": [3, 9], "x": 9.75, "y": 4}, + {"matrix": [3, 10], "x": 10.75, "y": 4}, + {"matrix": [3, 11], "x": 11.75, "y": 4}, + {"matrix": [3, 12], "x": 12.75, "y": 4}, + {"matrix": [3, 13], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 4}, + {"matrix": [3, 15], "x": 16.5, "y": 4}, + {"matrix": [3, 16], "x": 17.5, "y": 4}, + {"matrix": [3, 17], "x": 18.5, "y": 4}, + + {"matrix": [4, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 5}, + {"matrix": [4, 2], "x": 2.25, "y": 5}, + {"matrix": [4, 3], "x": 3.25, "y": 5}, + {"matrix": [4, 4], "x": 4.25, "y": 5}, + {"matrix": [4, 5], "x": 5.25, "y": 5}, + {"matrix": [4, 6], "x": 6.25, "y": 5}, + {"matrix": [4, 7], "x": 7.25, "y": 5}, + {"matrix": [4, 8], "x": 8.25, "y": 5}, + {"matrix": [4, 9], "x": 9.25, "y": 5}, + {"matrix": [4, 10], "x": 10.25, "y": 5}, + {"matrix": [4, 11], "x": 11.25, "y": 5}, + {"matrix": [4, 12], "x": 12.25, "y": 5, "w": 1.75}, + + {"matrix": [4, 13], "x": 14.25, "y": 5.25}, + + {"matrix": [4, 14], "x": 15.5, "y": 5}, + {"matrix": [4, 15], "x": 16.5, "y": 5}, + {"matrix": [4, 16], "x": 17.5, "y": 5}, + {"matrix": [4, 17], "x": 18.5, "y": 5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 6}, + {"matrix": [5, 2], "x": 2.5, "y": 6, "w": 1.5}, + {"matrix": [5, 5], "x": 4, "y": 6, "w": 6.25}, + {"matrix": [5, 7], "x": 10.25, "y": 6, "w": 1.25}, + {"matrix": [5, 8], "x": 11.5, "y": 6, "w": 1.5}, + + {"matrix": [5, 9], "x": 13.25, "y": 6.25}, + {"matrix": [5, 10], "x": 14.25, "y": 6.25}, + {"matrix": [5, 11], "x": 15.25, "y": 6.25}, + + {"matrix": [5, 12], "x": 16.5, "y": 6}, + {"matrix": [5, 13], "x": 17.5, "y": 6} ] } } diff --git a/keyboards/mechlovin/th1800/th1800.h b/keyboards/mechlovin/th1800/th1800.h deleted file mode 100644 index edd950b76d2c..000000000000 --- a/keyboards/mechlovin/th1800/th1800.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 Team Mechlovin - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, K0G, K0H, \ - K5E, K5F, K5G, K5H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K0D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, \ - K50, K51, K52, K55, K57, K58, K59, K5A, K5B, K5C, K5D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \ - { K50, K51, K52, KC_NO, KC_NO, K55, KC_NO, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H }, \ -} diff --git a/keyboards/mechlovin/tmkl/info.json b/keyboards/mechlovin/tmkl/info.json index d6be668d13b3..f5ff5420b4ca 100644 --- a/keyboards/mechlovin/tmkl/info.json +++ b/keyboards/mechlovin/tmkl/info.json @@ -25,82 +25,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0,B6)", "x":0, "y":0}, - {"label":"K01 (B0,B7)", "x":1.25, "y":0}, - {"label":"K02 (B0,C0)", "x":2.25, "y":0}, - {"label":"K03 (B0,C1)", "x":3.25, "y":0}, - {"label":"K04 (B0,C2)", "x":4.25, "y":0}, - {"label":"K05 (B0,C3)", "x":5.5, "y":0}, - {"label":"K06 (B0,C4)", "x":6.5, "y":0}, - {"label":"K07 (B0,C5)", "x":7.5, "y":0}, - {"label":"K08 (B0,C6)", "x":8.5, "y":0}, - {"label":"K09 (B0,C7)", "x":9.75, "y":0}, - {"label":"K0A (B0,D0)", "x":10.75, "y":0}, - {"label":"K0B (B0,D1)", "x":11.75, "y":0}, - {"label":"K0C (B0,D2)", "x":12.75, "y":0}, - {"label":"K0D (B0,B0)", "x":14, "y":0}, - {"label":"K10 (B1,B6)", "x":0, "y":1}, - {"label":"K11 (B1,B7)", "x":1, "y":1}, - {"label":"K12 (B1,C0)", "x":2, "y":1}, - {"label":"K13 (B1,C1)", "x":3, "y":1}, - {"label":"K14 (B1,C2)", "x":4, "y":1}, - {"label":"K15 (B1,C3)", "x":5, "y":1}, - {"label":"K16 (B1,C4)", "x":6, "y":1}, - {"label":"K17 (B1,C5)", "x":7, "y":1}, - {"label":"K18 (B1,C6)", "x":8, "y":1}, - {"label":"K19 (B1,C7)", "x":9, "y":1}, - {"label":"K1A (B1,D0)", "x":10, "y":1}, - {"label":"K1B (B1,D1)", "x":11, "y":1}, - {"label":"K1C (B1,D2)", "x":12, "y":1}, - {"label":"K1D (B1,B0)", "x":13, "y":1}, - {"label":"K2D (B2,B0)", "x":14, "y":1}, - {"label":"K20 (B2,B6)", "x":0, "y":2, "w":1.5}, - {"label":"K21 (B2,B7)", "x":1.5, "y":2}, - {"label":"K22 (B2,C0)", "x":2.5, "y":2}, - {"label":"K23 (B2,C1)", "x":3.5, "y":2}, - {"label":"K24 (B2,C2)", "x":4.5, "y":2}, - {"label":"K25 (B2,C3)", "x":5.5, "y":2}, - {"label":"K26 (B2,C4)", "x":6.5, "y":2}, - {"label":"K27 (B2,C5)", "x":7.5, "y":2}, - {"label":"K28 (B2,C6)", "x":8.5, "y":2}, - {"label":"K29 (B2,C7)", "x":9.5, "y":2}, - {"label":"K2A (B2,D0)", "x":10.5, "y":2}, - {"label":"K2B (B2,D1)", "x":11.5, "y":2}, - {"label":"K2C (B2,D2)", "x":12.5, "y":2}, - {"label":"K3C (B3,D2)", "x":13.5, "y":2, "w":1.5}, - {"label":"K30 (B3,B6)", "x":0, "y":3, "w":1.75}, - {"label":"K31 (B3,B7)", "x":1.75, "y":3}, - {"label":"K32 (B3,C0)", "x":2.75, "y":3}, - {"label":"K33 (B3,C1)", "x":3.75, "y":3}, - {"label":"K34 (B3,C2)", "x":4.75, "y":3}, - {"label":"K35 (B3,C3)", "x":5.75, "y":3}, - {"label":"K36 (B3,C4)", "x":6.75, "y":3}, - {"label":"K37 (B3,C5)", "x":7.75, "y":3}, - {"label":"K38 (B3,C6)", "x":8.75, "y":3}, - {"label":"K39 (B3,C7)", "x":9.75, "y":3}, - {"label":"K3A (B3,D0)", "x":10.75, "y":3}, - {"label":"K3B (B3,D1)", "x":11.75, "y":3}, - {"label":"K3D (B3,B0)", "x":12.75, "y":3, "w":2.25}, - {"label":"K40 (B4,B6)", "x":0, "y":4, "w":2.25}, - {"label":"K41 (B4,B7)", "x":2.25, "y":4}, - {"label":"K42 (B4,C0)", "x":3.25, "y":4}, - {"label":"K43 (B4,C1)", "x":4.25, "y":4}, - {"label":"K44 (B4,C2)", "x":5.25, "y":4}, - {"label":"K45 (B4,C3)", "x":6.25, "y":4}, - {"label":"K46 (B4,C4)", "x":7.25, "y":4}, - {"label":"K47 (B4,C5)", "x":8.25, "y":4}, - {"label":"K48 (B4,C6)", "x":9.25, "y":4}, - {"label":"K49 (B4,C7)", "x":10.25, "y":4}, - {"label":"K4A (B4,D0)", "x":11.25, "y":4}, - {"label":"K4B (B4,D1)", "x":12.25, "y":4, "w":1.75}, - {"label":"K4C (B4,D2)", "x":14, "y":4}, - {"label":"K50 (B5,B6)", "x":0, "y":5, "w":1.5}, - {"label":"K51 (B5,B7)", "x":1.5, "y":5}, - {"label":"K52 (B5,C0)", "x":2.5, "y":5, "w":1.5}, - {"label":"K56 (B5,C4)", "x":4, "y":5, "w":7}, - {"label":"K5A (B5,D0)", "x":11, "y":5, "w":1.5}, - {"label":"K5B (B5,D1)", "x":12.5, "y":5}, - {"label":"K5C (B5,D2)", "x":13.5, "y":5, "w":1.5} + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [2, 13], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [3, 12], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 8], "x": 8.25, "y": 4}, + {"matrix": [4, 9], "x": 9.25, "y": 4}, + {"matrix": [4, 10], "x": 10.25, "y": 4}, + {"matrix": [4, 11], "x": 11.25, "y": 4}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5}, + {"matrix": [5, 2], "x": 2.5, "y": 5, "w": 1.5}, + {"matrix": [5, 6], "x": 4, "y": 5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5}, + {"matrix": [5, 13], "x": 13.5, "y": 5, "w": 1.5} ] } } diff --git a/keyboards/mechlovin/tmkl/tmkl.h b/keyboards/mechlovin/tmkl/tmkl.h deleted file mode 100644 index 3d30e61d8953..000000000000 --- a/keyboards/mechlovin/tmkl/tmkl.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 Team Mechlovin' - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2D,\ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, \ - K50, K51, K52, K56, K5B, K5C, K5D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, KC_NO, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D }, \ - { K50, K51, K52, KC_NO, KC_NO, KC_NO, K56, KC_NO, KC_NO, KC_NO, KC_NO, K5B, K5C, K5D }, \ -} diff --git a/keyboards/mechstudio/dawn/dawn.h b/keyboards/mechstudio/dawn/dawn.h deleted file mode 100644 index d59f10c56213..000000000000 --- a/keyboards/mechstudio/dawn/dawn.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 David "NecromanX" Dejaeghere - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, ___, K0A, K0B, K0C, K0D, K0E}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E}, \ - { K50, K51, K52, ___, ___, ___, K56, ___, ___, ___, K5A, K5B, K5C, K5D, K5E} \ -} diff --git a/keyboards/mechstudio/dawn/info.json b/keyboards/mechstudio/dawn/info.json index e8bbcbb1aeb4..1ac84c732a08 100644 --- a/keyboards/mechstudio/dawn/info.json +++ b/keyboards/mechstudio/dawn/info.json @@ -22,94 +22,100 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.5, "y":0}, - {"label":"F2", "x":2.5, "y":0}, - {"label":"F3", "x":3.5, "y":0}, - {"label":"F4", "x":4.5, "y":0}, - {"label":"F5", "x":6, "y":0}, - {"label":"F6", "x":7, "y":0}, - {"label":"F7", "x":8, "y":0}, - {"label":"F8", "x":9, "y":0}, - {"label":"F9", "x":10.5, "y":0}, - {"label":"F10", "x":11.5, "y":0}, - {"label":"F11", "x":12.5, "y":0}, - {"label":"F12", "x":13.5, "y":0}, - {"label":"Home", "x":15, "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":"Page Up", "x":15, "y":1.25}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.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":"Page Down", "x":15, "y":2.25}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "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":"#", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, - {"label":"End", "x":15, "y":3.25}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, - {"label":"Left Shift", "x":0, "y":4.25, "w":1.25}, - {"label":"\\", "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":"Right Shift", "x":12.25, "y":4.25, "w":1.75}, - {"label":"Up", "x":14, "y":4.25}, - {"label":"Del", "x":15, "y":4.25}, - - {"label":"Left Ctrl", "x":0, "y":5.25, "w":1.5}, - {"label":"Win", "x":1.5, "y":5.25}, - {"label":"Left Alt", "x":2.5, "y":5.25, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.25, "w":6.25}, - {"label":"Right Alt", "x":10, "y":5.25, "w":1.25}, - {"label":"Right Ctrl", "x":11.25, "y":5.25, "w":1.25}, - {"label":"Left", "x":13, "y":5.25}, - {"label":"Down", "x":14, "y":5.25}, - {"label":"Right", "x":15, "y":5.25}] + {"matrix": [0, 14], "x": 15, "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, "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, "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}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + {"matrix": [3, 14], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.25}, + {"matrix": [4, 14], "x": 15, "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.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25} + ] } } } diff --git a/keyboards/mechwild/bbs/bbs.c b/keyboards/mechwild/bbs/bbs.c index 9a7253e5dac7..341103c1ab0a 100644 --- a/keyboards/mechwild/bbs/bbs.c +++ b/keyboards/mechwild/bbs/bbs.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@kylemccreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "bbs.h" +#include "quantum.h" #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/mechwild/bbs/bbs.h b/keyboards/mechwild/bbs/bbs.h deleted file mode 100644 index 2088b6864602..000000000000 --- a/keyboards/mechwild/bbs/bbs.h +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B,\ - k23, k24, k25, k26, k27, k28 \ -) { \ - { k00, k01, k02, k03, k04, k05 }, \ - { k06, k07, k08, k09, k0A, k0B }, \ - { k10, k11, k12, k13, k14, k15 }, \ - { k16, k17, k18, k19, k1A, k1B }, \ - { k26, k27, k28, k23, k24, k25 } \ -} diff --git a/keyboards/mechwild/bbs/info.json b/keyboards/mechwild/bbs/info.json index bdc29e68aced..beafbac22257 100644 --- a/keyboards/mechwild/bbs/info.json +++ b/keyboards/mechwild/bbs/info.json @@ -23,38 +23,41 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.375}, - {"x":1, "y":0.375}, - {"x":2, "y":0.125}, - {"x":3, "y":0}, - {"x":4, "y":0.125}, - {"x":5, "y":0.125}, - {"x":6.75, "y":0.125}, - {"x":7.75, "y":0.125}, - {"x":8.75, "y":0}, - {"x":9.75, "y":0.125}, - {"x":10.75, "y":0.375}, - {"x":11.75, "y":0.375}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.125}, - {"x":0, "y":1.375}, - {"x":1, "y":1.375}, - {"x":2, "y":1.125}, - {"x":3, "y":1}, - {"x":4, "y":1.125}, - {"x":5, "y":1.125}, - {"x":6.75, "y":1.125}, - {"x":7.75, "y":1.125}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1.125}, - {"x":10.75, "y":1.375}, - {"x":11.75, "y":1.375}, + {"matrix": [1, 0], "x": 6.75, "y": 0.125}, + {"matrix": [1, 1], "x": 7.75, "y": 0.125}, + {"matrix": [1, 2], "x": 8.75, "y": 0}, + {"matrix": [1, 3], "x": 9.75, "y": 0.125}, + {"matrix": [1, 4], "x": 10.75, "y": 0.375}, + {"matrix": [1, 5], "x": 11.75, "y": 0.375}, - {"x":2.75, "y":3.125, "h":1.5}, - {"x":3.75, "y":3.125, "h":1.5}, - {"x":4.75, "y":2.875, "h":1.5}, - {"x":7, "y":2.875, "h":1.5}, - {"x":8, "y":3.125, "h":1.5}, - {"x":9, "y":3.125, "h":1.5} + {"matrix": [2, 0], "x": 0, "y": 1.375}, + {"matrix": [2, 1], "x": 1, "y": 1.375}, + {"matrix": [2, 2], "x": 2, "y": 1.125}, + {"matrix": [2, 3], "x": 3, "y": 1}, + {"matrix": [2, 4], "x": 4, "y": 1.125}, + {"matrix": [2, 5], "x": 5, "y": 1.125}, + + {"matrix": [3, 0], "x": 6.75, "y": 1.125}, + {"matrix": [3, 1], "x": 7.75, "y": 1.125}, + {"matrix": [3, 2], "x": 8.75, "y": 1}, + {"matrix": [3, 3], "x": 9.75, "y": 1.125}, + {"matrix": [3, 4], "x": 10.75, "y": 1.375}, + {"matrix": [3, 5], "x": 11.75, "y": 1.375}, + + {"matrix": [4, 3], "x": 2.75, "y": 3.125, "h": 1.5}, + {"matrix": [4, 4], "x": 3.75, "y": 3.125, "h": 1.5}, + {"matrix": [4, 5], "x": 4.75, "y": 2.875, "h": 1.5}, + + {"matrix": [4, 0], "x": 7, "y": 2.875, "h": 1.5}, + {"matrix": [4, 1], "x": 8, "y": 3.125, "h": 1.5}, + {"matrix": [4, 2], "x": 9, "y": 3.125, "h": 1.5} ] } } diff --git a/keyboards/mechwild/mokulua/mirrored/info.json b/keyboards/mechwild/mokulua/mirrored/info.json index 2ef17fd3aaee..5401c8898f23 100644 --- a/keyboards/mechwild/mokulua/mirrored/info.json +++ b/keyboards/mechwild/mokulua/mirrored/info.json @@ -26,85 +26,93 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT_mirrored": "LAYOUT" + }, "layouts": { - "LAYOUT_mirrored": { + "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.62, "y":0}, - {"label":"1!", "x":1.62, "y":0}, - {"label":"2@", "x":2.62, "y":0}, - {"label":"3#", "x":3.62, "y":0}, - {"label":"4$", "x":4.62, "y":0}, - {"label":"5%", "x":5.62, "y":0}, - {"label":"6^", "x":6.62, "y":0}, - {"label":"7&", "x":10.12, "y":0}, - {"label":"8*", "x":11.12, "y":0}, - {"label":"9(", "x":12.12, "y":0}, - {"label":"0)", "x":13.12, "y":0}, - {"label":"-_", "x":14.12, "y":0}, - {"label":"Backspace", "x":15.12, "y":0}, - {"label":"Backspace", "x":16.12, "y":0}, + {"matrix": [0, 0], "x": 0.62, "y": 0}, + {"matrix": [0, 1], "x": 1.62, "y": 0}, + {"matrix": [0, 2], "x": 2.62, "y": 0}, + {"matrix": [0, 3], "x": 3.62, "y": 0}, + {"matrix": [0, 4], "x": 4.62, "y": 0}, + {"matrix": [0, 5], "x": 5.62, "y": 0}, + {"matrix": [5, 5], "x": 6.62, "y": 0}, + + {"matrix": [11, 5], "x": 10.12, "y": 0}, + {"matrix": [6, 5], "x": 11.12, "y": 0}, + {"matrix": [6, 4], "x": 12.12, "y": 0}, + {"matrix": [6, 3], "x": 13.12, "y": 0}, + {"matrix": [6, 2], "x": 14.12, "y": 0}, + {"matrix": [6, 1], "x": 15.12, "y": 0}, + {"matrix": [6, 0], "x": 16.12, "y": 0}, + + {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.87, "y": 1}, + {"matrix": [1, 2], "x": 2.87, "y": 1}, + {"matrix": [1, 3], "x": 3.87, "y": 1}, + {"matrix": [1, 4], "x": 4.87, "y": 1}, + {"matrix": [1, 5], "x": 5.87, "y": 1}, + {"matrix": [5, 4], "x": 6.87, "y": 1}, + + {"matrix": [11, 4], "x": 9.87, "y": 1}, + {"matrix": [7, 5], "x": 10.87, "y": 1}, + {"matrix": [7, 4], "x": 11.87, "y": 1}, + {"matrix": [7, 3], "x": 12.87, "y": 1}, + {"matrix": [7, 2], "x": 13.87, "y": 1}, + {"matrix": [7, 1], "x": 14.87, "y": 1}, + {"matrix": [7, 0], "x": 15.87, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"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": [5, 3], "x": 7, "y": 2}, + + {"matrix": [11, 3], "x": 9.75, "y": 2}, + {"matrix": [8, 5], "x": 10.75, "y": 2}, + {"matrix": [8, 4], "x": 11.75, "y": 2}, + {"matrix": [8, 3], "x": 12.75, "y": 2}, + {"matrix": [8, 2], "x": 13.75, "y": 2}, + {"matrix": [8, 1], "x": 14.75, "y": 2}, + {"matrix": [8, 0], "x": 15.75, "y": 2, "w": 1.75}, - {"label":"Tab", "x":0.37, "y":1, "w":1.5}, - {"label":"Q", "x":1.87, "y":1}, - {"label":"W", "x":2.87, "y":1}, - {"label":"E", "x":3.87, "y":1}, - {"label":"R", "x":4.87, "y":1}, - {"label":"T", "x":5.87, "y":1}, - {"label":"Y", "x":6.87, "y":1}, - {"label":"Y", "x":9.87, "y":1}, - {"label":"U", "x":10.87, "y":1}, - {"label":"I", "x":11.87, "y":1}, - {"label":"O", "x":12.87, "y":1}, - {"label":"P", "x":13.87, "y":1}, - {"label":"]}", "x":14.87, "y":1}, - {"label":"\\|", "x":15.87, "y":1, "w":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [5, 1], "x": 6.25, "y": 3}, + {"matrix": [5, 2], "x": 7.37, "y": 3}, - {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5, "y":2}, - {"label":"G", "x":6, "y":2}, - {"label":"H", "x":7, "y":2}, - {"label":";:", "x":9.75, "y":2}, - {"label":"H", "x":10.75, "y":2}, - {"label":"J", "x":11.75, "y":2}, - {"label":"K", "x":12.75, "y":2}, - {"label":"L", "x":13.75, "y":2}, - {"label":"'\"", "x":14.75, "y":2}, - {"label":"Enter", "x":15.75, "y":2, "w":1.75}, + {"matrix": [11, 2], "x": 9.37, "y": 3}, + {"matrix": [11, 1], "x": 10.5, "y": 3}, + {"matrix": [9, 5], "x": 11.5, "y": 3}, + {"matrix": [9, 4], "x": 12.5, "y": 3}, + {"matrix": [9, 3], "x": 13.5, "y": 3}, + {"matrix": [9, 2], "x": 14.5, "y": 3}, + {"matrix": [9, 1], "x": 15.5, "y": 3}, + {"matrix": [9, 0], "x": 16.5, "y": 3, "w": 1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"Mute", "x":7.37, "y":3}, - {"label":"Mute", "x":9.37, "y":3}, - {"label":"B", "x":10.5, "y":3}, - {"label":"N", "x":11.5, "y":3}, - {"label":"M", "x":12.5, "y":3}, - {"label":",<", "x":13.5, "y":3}, - {"label":".>", "x":14.5, "y":3}, - {"label":"\u2191", "x":15.5, "y":3}, - {"label":"Shift", "x":16.5, "y":3, "w":1.25}, + {"matrix": [4, 0], "x": 0.25, "y": 4}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5}, + {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5}, + {"matrix": [5, 0], "x": 7.13, "y": 4}, - {"label":"Ctrl", "x":0.25, "y":4}, - {"label":"GUI", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4}, - {"label":"Fn2", "x":3.5, "y":4, "w":1.25}, - {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5}, - {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5}, - {"label":"RGB Mode -", "x":7.13, "y":4}, - {"label":"RGB Mode +", "x":9.62, "y":4}, - {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5}, - {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5}, - {"label":"Fn2", "x":13, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.5, "y":4}, - {"label":"\u2193", "x":15.5, "y":4}, - {"label":"\u2192", "x":16.5, "y":4} + {"matrix": [11, 0], "x": 9.62, "y": 4}, + {"matrix": [10, 5], "x": 10.81, "y": 4, "h": 1.5}, + {"matrix": [10, 4], "x": 11.81, "y": 4, "h": 1.5}, + {"matrix": [10, 3], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [10, 2], "x": 14.5, "y": 4}, + {"matrix": [10, 1], "x": 15.5, "y": 4}, + {"matrix": [10, 0], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.c b/keyboards/mechwild/mokulua/mirrored/mirrored.c index 6b5410642a8f..434b71560cb2 100644 --- a/keyboards/mechwild/mokulua/mirrored/mirrored.c +++ b/keyboards/mechwild/mokulua/mirrored/mirrored.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@Kyle McCreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "mirrored.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/mokulua/mirrored/mirrored.h b/keyboards/mechwild/mokulua/mirrored/mirrored.h deleted file mode 100644 index 66df5cdd6be6..000000000000 --- a/keyboards/mechwild/mokulua/mirrored/mirrored.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_mirrored( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R06, R05, R04, R03, R02, R01 }, \ - { R16, R15, R14, R13, R12, R11 }, \ - { R26, R25, R24, R23, R22, R21 }, \ - { R37, R36, R35, R34, R33, R32 }, \ - { R46, R45, R44, R43, R42, R41 }, \ - { R40, R31, R30, R20, R10, R00 } \ -} - -#define LAYOUT LAYOUT_mirrored \ No newline at end of file diff --git a/keyboards/mechwild/mokulua/standard/info.json b/keyboards/mechwild/mokulua/standard/info.json index 18594c39eda0..4ab38d9d370f 100644 --- a/keyboards/mechwild/mokulua/standard/info.json +++ b/keyboards/mechwild/mokulua/standard/info.json @@ -26,84 +26,92 @@ }, "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT_standard": "LAYOUT" + }, "layouts": { - "LAYOUT_standard": { + "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.62, "y":0}, - {"label":"1!", "x":1.62, "y":0}, - {"label":"2@", "x":2.62, "y":0}, - {"label":"3#", "x":3.62, "y":0}, - {"label":"4$", "x":4.62, "y":0}, - {"label":"5%", "x":5.62, "y":0}, - {"label":"6^", "x":6.62, "y":0}, - {"label":"7&", "x":9.62, "y":0}, - {"label":"8*", "x":10.62, "y":0}, - {"label":"9(", "x":11.62, "y":0}, - {"label":"0)", "x":12.62, "y":0}, - {"label":"-_", "x":13.62, "y":0}, - {"label":"Backspace", "x":14.62, "y":0}, - {"label":"Backspace", "x":15.62, "y":0}, + {"matrix": [0, 0], "x": 0.62, "y": 0}, + {"matrix": [0, 1], "x": 1.62, "y": 0}, + {"matrix": [0, 2], "x": 2.62, "y": 0}, + {"matrix": [0, 3], "x": 3.62, "y": 0}, + {"matrix": [0, 4], "x": 4.62, "y": 0}, + {"matrix": [0, 5], "x": 5.62, "y": 0}, + {"matrix": [5, 5], "x": 6.62, "y": 0}, + + {"matrix": [11, 0], "x": 9.62, "y": 0}, + {"matrix": [6, 0], "x": 10.62, "y": 0}, + {"matrix": [6, 1], "x": 11.62, "y": 0}, + {"matrix": [6, 2], "x": 12.62, "y": 0}, + {"matrix": [6, 3], "x": 13.62, "y": 0}, + {"matrix": [6, 4], "x": 14.62, "y": 0}, + {"matrix": [6, 5], "x": 15.62, "y": 0}, + + {"matrix": [1, 0], "x": 0.37, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.87, "y": 1}, + {"matrix": [1, 2], "x": 2.87, "y": 1}, + {"matrix": [1, 3], "x": 3.87, "y": 1}, + {"matrix": [1, 4], "x": 4.87, "y": 1}, + {"matrix": [1, 5], "x": 5.87, "y": 1}, + {"matrix": [5, 4], "x": 6.87, "y": 1}, + + {"matrix": [7, 0], "x": 10.37, "y": 1}, + {"matrix": [7, 1], "x": 11.37, "y": 1}, + {"matrix": [7, 2], "x": 12.37, "y": 1}, + {"matrix": [7, 3], "x": 13.37, "y": 1}, + {"matrix": [7, 4], "x": 14.37, "y": 1}, + {"matrix": [7, 5], "x": 15.37, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"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": [5, 3], "x": 7, "y": 2}, + + {"matrix": [11, 1], "x": 9.75, "y": 2}, + {"matrix": [8, 0], "x": 10.75, "y": 2}, + {"matrix": [8, 1], "x": 11.75, "y": 2}, + {"matrix": [8, 2], "x": 12.75, "y": 2}, + {"matrix": [8, 3], "x": 13.75, "y": 2}, + {"matrix": [8, 4], "x": 14.75, "y": 2}, + {"matrix": [8, 5], "x": 15.75, "y": 2, "w": 1.75}, - {"label":"Tab", "x":0.37, "y":1, "w":1.5}, - {"label":"Q", "x":1.87, "y":1}, - {"label":"W", "x":2.87, "y":1}, - {"label":"E", "x":3.87, "y":1}, - {"label":"R", "x":4.87, "y":1}, - {"label":"T", "x":5.87, "y":1}, - {"label":"Y", "x":6.87, "y":1}, - {"label":"U", "x":10.37, "y":1}, - {"label":"I", "x":11.37, "y":1}, - {"label":"O", "x":12.37, "y":1}, - {"label":"P", "x":13.37, "y":1}, - {"label":"]}", "x":14.37, "y":1}, - {"label":"\\|", "x":15.37, "y":1, "w":1.5}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [5, 1], "x": 6.25, "y": 3}, + {"matrix": [5, 2], "x": 7.37, "y": 3}, - {"label":"Caps Lock", "x":0.25, "y":2, "w":1.75}, - {"label":"A", "x":2, "y":2}, - {"label":"S", "x":3, "y":2}, - {"label":"D", "x":4, "y":2}, - {"label":"F", "x":5, "y":2}, - {"label":"G", "x":6, "y":2}, - {"label":"H", "x":7, "y":2}, - {"label":";:", "x":9.75, "y":2}, - {"label":"H", "x":10.75, "y":2}, - {"label":"J", "x":11.75, "y":2}, - {"label":"K", "x":12.75, "y":2}, - {"label":"L", "x":13.75, "y":2}, - {"label":"'\"", "x":14.75, "y":2}, - {"label":"Enter", "x":15.75, "y":2, "w":1.75}, + {"matrix": [11, 3], "x": 9.37, "y": 3}, + {"matrix": [11, 2], "x": 10.5, "y": 3}, + {"matrix": [9, 0], "x": 11.5, "y": 3}, + {"matrix": [9, 1], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 3], "x": 14.5, "y": 3}, + {"matrix": [9, 4], "x": 15.5, "y": 3}, + {"matrix": [9, 5], "x": 16.5, "y": 3, "w": 1.25}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"\\|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"Mute", "x":7.37, "y":3}, - {"label":"Mute", "x":9.37, "y":3}, - {"label":"B", "x":10.5, "y":3}, - {"label":"N", "x":11.5, "y":3}, - {"label":"M", "x":12.5, "y":3}, - {"label":",<", "x":13.5, "y":3}, - {"label":".>", "x":14.5, "y":3}, - {"label":"\u2191", "x":15.5, "y":3}, - {"label":"Shift", "x":16.5, "y":3, "w":1.25}, + {"matrix": [4, 0], "x": 0.25, "y": 4}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.94, "y": 4, "h": 1.5}, + {"matrix": [4, 5], "x": 5.94, "y": 4, "h": 1.5}, + {"matrix": [5, 0], "x": 7.13, "y": 4}, - {"label":"Ctrl", "x":0.25, "y":4}, - {"label":"GUI", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4}, - {"label":"Fn2", "x":3.5, "y":4, "w":1.25}, - {"label":"Fn1/Space", "x":4.94, "y":4, "h":1.5}, - {"label":"Fn2/Space", "x":5.94, "y":4, "h":1.5}, - {"label":"RGB Mode -", "x":7.13, "y":4}, - {"label":"RGB Mode +", "x":9.62, "y":4}, - {"label":"Fn2/Space", "x":10.81, "y":4, "h":1.5}, - {"label":"Fn1/Space", "x":11.81, "y":4, "h":1.5}, - {"label":"Fn2", "x":13, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.5, "y":4}, - {"label":"\u2193", "x":15.5, "y":4}, - {"label":"\u2192", "x":16.5, "y":4} + {"matrix": [11, 4], "x": 9.62, "y": 4}, + {"matrix": [10, 0], "x": 10.81, "y": 4, "h": 1.5}, + {"matrix": [10, 1], "x": 11.81, "y": 4, "h": 1.5}, + {"matrix": [10, 2], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [10, 3], "x": 14.5, "y": 4}, + {"matrix": [10, 4], "x": 15.5, "y": 4}, + {"matrix": [10, 5], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/mechwild/mokulua/standard/standard.c b/keyboards/mechwild/mokulua/standard/standard.c index 4bccb70e3f3f..434b71560cb2 100644 --- a/keyboards/mechwild/mokulua/standard/standard.c +++ b/keyboards/mechwild/mokulua/standard/standard.c @@ -1,7 +1,7 @@ // Copyright 2022 Kyle McCreery (@Kyle McCreery) // SPDX-License-Identifier: GPL-2.0-or-later -#include "standard.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/mechwild/mokulua/standard/standard.h b/keyboards/mechwild/mokulua/standard/standard.h deleted file mode 100644 index 0484340e8de0..000000000000 --- a/keyboards/mechwild/mokulua/standard/standard.h +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2022 Kyle McCreery (@kylemccreery) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT_standard( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L46, L36, L37, L26, L16, L06 }, \ - { R01, R02, R03, R04, R05, R06 }, \ - { R11, R12, R13, R14, R15, R16 }, \ - { R21, R22, R23, R24, R25, R26 }, \ - { R32, R33, R34, R35, R36, R37 }, \ - { R41, R42, R43, R44, R45, R46 }, \ - { R00, R20, R31, R30, R40, ___ } \ -} - -#define LAYOUT LAYOUT_standard diff --git a/keyboards/mechwild/obe/info.json b/keyboards/mechwild/obe/info.json index 853d7ebcc350..f529efd1e6a6 100644 --- a/keyboards/mechwild/obe/info.json +++ b/keyboards/mechwild/obe/info.json @@ -31,80 +31,88 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.2, "y": 0}, - {"x": 1.62, "y": 0}, - {"x": 2.62, "y": 0}, - {"x": 3.9, "y": 0}, - {"x": 4.9, "y": 0}, - {"x": 5.9, "y": 0}, - {"x": 6.9, "y": 0}, - {"x": 7.9, "y": 0}, - {"x": 10.65, "y": 0}, - {"x": 11.65, "y": 0}, - {"x": 12.65, "y": 0}, - {"x": 13.65, "y": 0}, - {"x": 14.9, "y": 0}, - {"x": 15.9, "y": 0}, - {"x": 16.9, "y": 0}, - {"x": 17.9, "y": 0}, + {"matrix": [5, 5], "x": 0.2, "y": 0}, - {"x": 0.1, "y": 1}, - {"x": 1.37, "y": 1, "w": 1.5}, - {"x": 2.87, "y": 1}, - {"x": 4.4, "y": 1}, - {"x": 5.4, "y": 1}, - {"x": 6.4, "y": 1}, - {"x": 7.4, "y": 1}, - {"x": 10.15, "y": 1}, - {"x": 11.15, "y": 1}, - {"x": 12.15, "y": 1}, - {"x": 13.15, "y": 1}, - {"x": 14.65, "y": 1}, - {"x": 15.65, "y": 1}, - {"x": 16.65, "y": 1}, - {"x": 17.65, "y": 1, "w": 1.5}, + {"matrix": [5, 4], "x": 1.62, "y": 0}, + {"matrix": [5, 3], "x": 2.62, "y": 0}, + {"matrix": [5, 2], "x": 3.9, "y": 0}, + {"matrix": [5, 1], "x": 4.9, "y": 0}, + {"matrix": [5, 0], "x": 5.9, "y": 0}, + {"matrix": [0, 0], "x": 6.9, "y": 0}, + {"matrix": [0, 1], "x": 7.9, "y": 0}, - {"x": 0, "y": 2}, - {"x": 1.3, "y": 2, "w": 1.75}, - {"x": 3.02, "y": 2}, - {"x": 4.65, "y": 2}, - {"x": 5.65, "y": 2}, - {"x": 6.65, "y": 2}, - {"x": 7.65, "y": 2}, - {"x": 10.4, "y": 2}, - {"x": 11.4, "y": 2}, - {"x": 12.4, "y": 2}, - {"x": 13.4, "y": 2}, - {"x": 15, "y": 2}, - {"x": 16, "y": 2}, - {"x": 17, "y": 2, "w": 2.25}, + {"matrix": [0, 2], "x": 10.65, "y": 0}, + {"matrix": [0, 3], "x": 11.65, "y": 0}, + {"matrix": [0, 4], "x": 12.65, "y": 0}, + {"matrix": [0, 5], "x": 13.65, "y": 0}, + {"matrix": [0, 6], "x": 14.9, "y": 0}, + {"matrix": [0, 7], "x": 15.9, "y": 0}, + {"matrix": [0, 8], "x": 16.9, "y": 0}, + {"matrix": [0, 9], "x": 17.9, "y": 0}, - {"x": 1.12, "y": 3, "w": 2.25}, - {"x": 3.37, "y": 3}, - {"x": 5.15, "y": 3}, - {"x": 6.15, "y": 3}, - {"x": 7.15, "y": 3}, - {"x": 8.15, "y": 3}, - {"x": 9.9, "y": 3}, - {"x": 10.9, "y": 3}, - {"x": 11.9, "y": 3}, - {"x": 12.9, "y": 3}, - {"x": 14.65, "y": 3}, - {"x": 15.65, "y": 3}, - {"x": 16.65, "y": 3}, - {"x": 17.65, "y": 3, "w": 1.75}, + {"matrix": [6, 5], "x": 0.1, "y": 1}, - {"x": 1.15, "y": 4, "w": 1.25}, - {"x": 2.62, "y": 4, "w": 1.25}, - {"x": 5.15, "y": 4, "w": 1.25}, - {"x": 6.4, "y": 4, "w": 2.25}, - {"x": 8.65, "y": 4}, - {"x": 9.9, "y": 4, "w": 2.75}, - {"x": 12.65, "y": 4}, - {"x": 14.65, "y": 4}, - {"x": 15.65, "y": 4}, - {"x": 16.65, "y": 4}, - {"x": 17.65, "y": 4} + {"matrix": [5, 9], "x": 1.37, "y": 1, "w": 1.5}, + {"matrix": [5, 8], "x": 2.87, "y": 1}, + {"matrix": [5, 7], "x": 4.4, "y": 1}, + {"matrix": [5, 6], "x": 5.4, "y": 1}, + {"matrix": [1, 0], "x": 6.4, "y": 1}, + {"matrix": [1, 1], "x": 7.4, "y": 1}, + + {"matrix": [1, 2], "x": 10.15, "y": 1}, + {"matrix": [1, 3], "x": 11.15, "y": 1}, + {"matrix": [1, 4], "x": 12.15, "y": 1}, + {"matrix": [1, 5], "x": 13.15, "y": 1}, + {"matrix": [1, 6], "x": 14.65, "y": 1}, + {"matrix": [1, 7], "x": 15.65, "y": 1}, + {"matrix": [1, 8], "x": 16.65, "y": 1}, + {"matrix": [1, 9], "x": 17.65, "y": 1, "w": 1.5}, + + {"matrix": [6, 4], "x": 0, "y": 2}, + + {"matrix": [6, 9], "x": 1.3, "y": 2, "w": 1.75}, + {"matrix": [6, 8], "x": 3.02, "y": 2}, + {"matrix": [6, 3], "x": 4.65, "y": 2}, + {"matrix": [2, 0], "x": 5.65, "y": 2}, + {"matrix": [2, 1], "x": 6.65, "y": 2}, + {"matrix": [2, 2], "x": 7.65, "y": 2}, + + {"matrix": [2, 3], "x": 10.4, "y": 2}, + {"matrix": [2, 4], "x": 11.4, "y": 2}, + {"matrix": [2, 5], "x": 12.4, "y": 2}, + {"matrix": [2, 6], "x": 13.4, "y": 2}, + {"matrix": [2, 7], "x": 15, "y": 2}, + {"matrix": [2, 8], "x": 16, "y": 2}, + {"matrix": [2, 9], "x": 17, "y": 2, "w": 2.25}, + + {"matrix": [6, 2], "x": 1.12, "y": 3, "w": 2.25}, + {"matrix": [6, 0], "x": 3.37, "y": 3}, + {"matrix": [6, 7], "x": 5.15, "y": 3}, + {"matrix": [6, 6], "x": 6.15, "y": 3}, + {"matrix": [3, 0], "x": 7.15, "y": 3}, + {"matrix": [3, 1], "x": 8.15, "y": 3}, + + {"matrix": [3, 2], "x": 9.9, "y": 3}, + {"matrix": [3, 3], "x": 10.9, "y": 3}, + {"matrix": [3, 4], "x": 11.9, "y": 3}, + {"matrix": [3, 5], "x": 12.9, "y": 3}, + {"matrix": [3, 6], "x": 14.65, "y": 3}, + {"matrix": [3, 7], "x": 15.65, "y": 3}, + {"matrix": [3, 8], "x": 16.65, "y": 3}, + {"matrix": [3, 9], "x": 17.65, "y": 3, "w": 1.75}, + + {"matrix": [6, 1], "x": 1.15, "y": 4, "w": 1.25}, + {"matrix": [4, 0], "x": 2.62, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 5.15, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 6.4, "y": 4, "w": 2.25}, + {"matrix": [4, 3], "x": 8.65, "y": 4}, + + {"matrix": [4, 4], "x": 9.9, "y": 4, "w": 2.75}, + {"matrix": [4, 5], "x": 12.65, "y": 4}, + {"matrix": [4, 6], "x": 14.65, "y": 4}, + {"matrix": [4, 7], "x": 15.65, "y": 4}, + {"matrix": [4, 8], "x": 16.65, "y": 4}, + {"matrix": [4, 9], "x": 17.65, "y": 4} ] } } diff --git a/keyboards/mechwild/obe/obe.c b/keyboards/mechwild/obe/obe.c deleted file mode 100644 index 548f95582583..000000000000 --- a/keyboards/mechwild/obe/obe.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 . - */ - -#include "obe.h" diff --git a/keyboards/mechwild/obe/obe.h b/keyboards/mechwild/obe/obe.h deleted file mode 100644 index 8c57aa283b89..000000000000 --- a/keyboards/mechwild/obe/obe.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k55, k54, k53, k52, k51, k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k65, k59, k58, k57, k56, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k64, k69, k68, k63, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k62, k60, k67, k66, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, \ - k61, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 } \ -} diff --git a/keyboards/mechwild/waka60/info.json b/keyboards/mechwild/waka60/info.json index 1f41cf461774..1014411ba02e 100644 --- a/keyboards/mechwild/waka60/info.json +++ b/keyboards/mechwild/waka60/info.json @@ -24,68 +24,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0}, - {"label": "k02", "x": 2, "y": 0}, - {"label": "k03", "x": 3, "y": 0}, - {"label": "k04", "x": 4, "y": 0}, - {"label": "k05", "x": 5, "y": 0}, - {"label": "k50", "x": 7, "y": 0}, - {"label": "k51", "x": 8, "y": 0}, - {"label": "k52", "x": 9, "y": 0}, - {"label": "k53", "x": 10, "y": 0}, - {"label": "k54", "x": 11, "y": 0}, - {"label": "k55", "x": 12, "y": 0}, - {"label": "k10", "x": 0, "y": 1}, - {"label": "k11", "x": 1, "y": 1}, - {"label": "k12", "x": 2, "y": 1}, - {"label": "k13", "x": 3, "y": 1}, - {"label": "k14", "x": 4, "y": 1}, - {"label": "k15", "x": 5, "y": 1}, - {"label": "k60", "x": 7, "y": 1}, - {"label": "k61", "x": 8, "y": 1}, - {"label": "k62", "x": 9, "y": 1}, - {"label": "k63", "x": 10, "y": 1}, - {"label": "k64", "x": 11, "y": 1}, - {"label": "k65", "x": 12, "y": 1}, - {"label": "k20", "x": 0, "y": 2}, - {"label": "k21", "x": 1, "y": 2}, - {"label": "k22", "x": 2, "y": 2}, - {"label": "k23", "x": 3, "y": 2}, - {"label": "k24", "x": 4, "y": 2}, - {"label": "k25", "x": 5, "y": 2}, - {"label": "k70", "x": 7, "y": 2}, - {"label": "k71", "x": 8, "y": 2}, - {"label": "k72", "x": 9, "y": 2}, - {"label": "k73", "x": 10, "y": 2}, - {"label": "k74", "x": 11, "y": 2}, - {"label": "k75", "x": 12, "y": 2}, - {"label": "k30", "x": 0, "y": 3}, - {"label": "k31", "x": 1, "y": 3}, - {"label": "k32", "x": 2, "y": 3}, - {"label": "k33", "x": 3, "y": 3}, - {"label": "k34", "x": 4, "y": 3}, - {"label": "k35", "x": 5, "y": 3}, - {"label": "k36", "x": 6, "y": 3}, - {"label": "k80", "x": 7, "y": 3}, - {"label": "k81", "x": 8, "y": 3}, - {"label": "k82", "x": 9, "y": 3}, - {"label": "k83", "x": 10, "y": 3}, - {"label": "k84", "x": 11, "y": 3}, - {"label": "k85", "x": 12, "y": 3}, - {"label": "k40", "x": 0, "y": 4}, - {"label": "k41", "x": 1, "y": 4}, - {"label": "k42", "x": 2, "y": 4}, - {"label": "k43", "x": 3, "y": 4}, - {"label": "k44", "x": 4, "y": 4}, - {"label": "k45", "x": 5, "y": 4}, - {"label": "k46", "x": 6, "y": 4}, - {"label": "k90", "x": 7, "y": 4}, - {"label": "k91", "x": 8, "y": 4}, - {"label": "k92", "x": 9, "y": 4}, - {"label": "k93", "x": 10, "y": 4}, - {"label": "k94", "x": 11, "y": 4}, - {"label": "k95", "x": 12, "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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 0], "x": 7, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4} ] } } diff --git a/keyboards/mechwild/waka60/waka60.c b/keyboards/mechwild/waka60/waka60.c deleted file mode 100644 index f0c5f143e433..000000000000 --- a/keyboards/mechwild/waka60/waka60.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 . - */ - -#include "waka60.h" diff --git a/keyboards/mechwild/waka60/waka60.h b/keyboards/mechwild/waka60/waka60.h deleted file mode 100644 index 4e7d82e92965..000000000000 --- a/keyboards/mechwild/waka60/waka60.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k50, k51, k52, k53, k54, k55, \ - k10, k11, k12, k13, k14, k15, k60, k61, k62, k63, k64, k65, \ - k20, k21, k22, k23, k24, k25, k70, k71, k72, k73, k74, k75, \ - k30, k31, k32, k33, k34, k35, k36, k80, k81, k82, k83, k84, k85, \ - k40, k41, k42, k43, k44, k45, k46, k90, k91, k92, k93, k94, k95 \ -) { \ - { k00, k01, k02, k03, k04, k05, ___}, \ - { k10, k11, k12, k13, k14, k15, ___}, \ - { k20, k21, k22, k23, k24, k25, ___}, \ - { k30, k31, k32, k33, k34, k35, k36}, \ - { k40, k41, k42, k43, k44, k45, k46}, \ - { k50, k51, k52, k53, k54, k55, ___}, \ - { k60, k61, k62, k63, k64, k65, ___}, \ - { k70, k71, k72, k73, k74, k75, ___}, \ - { k80, k81, k82, k83, k84, k85, ___}, \ - { k90, k91, k92, k93, k94, k95, ___} \ -} diff --git a/keyboards/mehkee96/info.json b/keyboards/mehkee96/info.json index 7a95a92fc2c0..f192bb503635 100644 --- a/keyboards/mehkee96/info.json +++ b/keyboards/mehkee96/info.json @@ -25,9 +25,117 @@ }, "processor": "atmega32a", "bootloader": "bootloadhid", - "layouts": { + "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"Print Screen", "x":13, "y":0}, {"label":"Delete", "x":14, "y":0}, {"label":"Home", "x":15, "y":0}, {"label":"End", "x":16, "y":0}, {"label":"Page Up", "x":17, "y":0}, {"label":"Page Down", "x":18, "y":0}, {"label":"`", "x":0, "y":1}, {"label":"1", "x":1, "y":1}, {"label":"2", "x":2, "y":1}, {"label":"3", "x":3, "y":1}, {"label":"4", "x":4, "y":1}, {"label":"5", "x":5, "y":1}, {"label":"6", "x":6, "y":1}, {"label":"7", "x":7, "y":1}, {"label":"8", "x":8, "y":1}, {"label":"9", "x":9, "y":1}, {"label":"0", "x":10, "y":1}, {"label":"-", "x":11, "y":1}, {"label":"=", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Num Lock", "x":15, "y":1}, {"label":"P/", "x":16, "y":1}, {"label":"P*", "x":17, "y":1}, {"label":"P-", "x":18, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"[", "x":11.5, "y":2}, {"label":"]", "x":12.5, "y":2}, {"label":"\\", "x":13.5, "y":2, "w":1.5}, {"label":"P7", "x":15, "y":2}, {"label":"P8", "x":16, "y":2}, {"label":"P9", "x":17, "y":2}, {"label":"P+", "x":18, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":";", "x":10.75, "y":3}, {"label":"'", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"P4", "x":15, "y":3}, {"label":"P5", "x":16, "y":3}, {"label":"P6", "x":17, "y":3}, {"label":"P+", "x":18, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":",", "x":9.25, "y":4}, {"label":".", "x":10.25, "y":4}, {"label":"/", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14, "y":4}, {"label":"P1", "x":15, "y":4}, {"label":"P2", "x":16, "y":4}, {"label":"P3", "x":17, "y":4}, {"label":"PEnter", "x":18, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Win", "x":11, "y":5}, {"label":"Fn", "x":12, "y":5}, {"label":"Left", "x":13, "y":5}, {"label":"Down", "x":14, "y":5}, {"label":"Right", "x":15, "y":5}, {"label":"P0", "x":16, "y":5}, {"label":"P.", "x":17, "y":5}, {"label":"PEnter", "x":18, "y":5}] + "layout": [ + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 2], "x": 1, "y": 0}, + {"matrix": [5, 3], "x": 2, "y": 0}, + {"matrix": [5, 4], "x": 3, "y": 0}, + {"matrix": [5, 5], "x": 4, "y": 0}, + {"matrix": [6, 0], "x": 5, "y": 0}, + {"matrix": [6, 10], "x": 6, "y": 0}, + {"matrix": [7, 10], "x": 7, "y": 0}, + {"matrix": [7, 0], "x": 8, "y": 0}, + {"matrix": [5, 11], "x": 9, "y": 0}, + {"matrix": [5, 12], "x": 10, "y": 0}, + {"matrix": [5, 13], "x": 11, "y": 0}, + {"matrix": [5, 14], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [2, 14], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [7, 6], "x": 16, "y": 0}, + {"matrix": [7, 9], "x": 17, "y": 0}, + {"matrix": [7, 8], "x": 18, "y": 0}, + + {"matrix": [4, 0], "x": 0, "y": 1}, + {"matrix": [4, 1], "x": 1, "y": 1}, + {"matrix": [4, 2], "x": 2, "y": 1}, + {"matrix": [4, 3], "x": 3, "y": 1}, + {"matrix": [4, 4], "x": 4, "y": 1}, + {"matrix": [4, 5], "x": 5, "y": 1}, + {"matrix": [6, 1], "x": 6, "y": 1}, + {"matrix": [6, 11], "x": 7, "y": 1}, + {"matrix": [7, 11], "x": 8, "y": 1}, + {"matrix": [7, 1], "x": 9, "y": 1}, + {"matrix": [4, 10], "x": 10, "y": 1}, + {"matrix": [4, 11], "x": 11, "y": 1}, + {"matrix": [4, 12], "x": 12, "y": 1}, + {"matrix": [4, 14], "x": 13, "y": 1, "w": 2}, + {"matrix": [4, 6], "x": 15, "y": 1}, + {"matrix": [4, 7], "x": 16, "y": 1}, + {"matrix": [4, 8], "x": 17, "y": 1}, + {"matrix": [4, 9], "x": 18, "y": 1}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2}, + {"matrix": [3, 2], "x": 2.5, "y": 2}, + {"matrix": [3, 3], "x": 3.5, "y": 2}, + {"matrix": [3, 4], "x": 4.5, "y": 2}, + {"matrix": [3, 5], "x": 5.5, "y": 2}, + {"matrix": [6, 2], "x": 6.5, "y": 2}, + {"matrix": [6, 12], "x": 7.5, "y": 2}, + {"matrix": [7, 12], "x": 8.5, "y": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 2}, + {"matrix": [3, 10], "x": 10.5, "y": 2}, + {"matrix": [3, 11], "x": 11.5, "y": 2}, + {"matrix": [3, 12], "x": 12.5, "y": 2}, + {"matrix": [3, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [3, 6], "x": 15, "y": 2}, + {"matrix": [3, 7], "x": 16, "y": 2}, + {"matrix": [3, 8], "x": 17, "y": 2}, + {"matrix": [3, 9], "x": 18, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3}, + {"matrix": [2, 2], "x": 2.75, "y": 3}, + {"matrix": [2, 3], "x": 3.75, "y": 3}, + {"matrix": [2, 4], "x": 4.75, "y": 3}, + {"matrix": [2, 5], "x": 5.75, "y": 3}, + {"matrix": [6, 3], "x": 6.75, "y": 3}, + {"matrix": [6, 13], "x": 7.75, "y": 3}, + {"matrix": [7, 13], "x": 8.75, "y": 3}, + {"matrix": [7, 3], "x": 9.75, "y": 3}, + {"matrix": [2, 10], "x": 10.75, "y": 3}, + {"matrix": [2, 11], "x": 11.75, "y": 3}, + {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [2, 6], "x": 15, "y": 3}, + {"matrix": [2, 7], "x": 16, "y": 3}, + {"matrix": [2, 8], "x": 17, "y": 3}, + {"matrix": [2, 9], "x": 18, "y": 3}, + + {"matrix": [1, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [1, 1], "x": 2.25, "y": 4}, + {"matrix": [1, 2], "x": 3.25, "y": 4}, + {"matrix": [1, 3], "x": 4.25, "y": 4}, + {"matrix": [1, 4], "x": 5.25, "y": 4}, + {"matrix": [1, 5], "x": 6.25, "y": 4}, + {"matrix": [6, 4], "x": 7.25, "y": 4}, + {"matrix": [6, 14], "x": 8.25, "y": 4}, + {"matrix": [7, 14], "x": 9.25, "y": 4}, + {"matrix": [7, 4], "x": 10.25, "y": 4}, + {"matrix": [1, 10], "x": 11.25, "y": 4}, + {"matrix": [1, 11], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [6, 8], "x": 14, "y": 4}, + {"matrix": [1, 6], "x": 15, "y": 4}, + {"matrix": [1, 7], "x": 16, "y": 4}, + {"matrix": [1, 8], "x": 17, "y": 4}, + {"matrix": [1, 9], "x": 18, "y": 4}, + + {"matrix": [0, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [0, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [7, 5], "x": 10, "y": 5}, + {"matrix": [0, 10], "x": 11, "y": 5}, + {"matrix": [0, 11], "x": 12, "y": 5}, + {"matrix": [6, 6], "x": 13, "y": 5}, + {"matrix": [6, 7], "x": 14, "y": 5}, + {"matrix": [6, 9], "x": 15, "y": 5}, + {"matrix": [0, 6], "x": 16, "y": 5}, + {"matrix": [0, 8], "x": 17, "y": 5}, + {"matrix": [0, 9], "x": 18, "y": 5} + ] } } } diff --git a/keyboards/mehkee96/mehkee96.h b/keyboards/mehkee96/mehkee96.h deleted file mode 100644 index 32d4fa72a1e1..000000000000 --- a/keyboards/mehkee96/mehkee96.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - k50, k52, k53, k54, k55, k60, k6A, k7A, k70, k5B, k5C, k5D, k5E, k1D, k2E, k0D, k76, k79, k78, \ - k40, k41, k42, k43, k44, k45, k61, k6B, k7B, k71, k4A, k4B, k4C, k4E, k46, k47, k48, k49, \ - k30, k31, k32, k33, k34, k35, k62, k6C, k7C, k72, k3A, k3B, k3C, k3D, k36, k37, k38, k39, \ - k20, k21, k22, k23, k24, k25, k63, k6D, k7D, k73, k2A, k2B, k2D, k26, k27, k28, k29, \ - k10, k11, k12, k13, k14, k15, k64, k6E, k7E, k74, k1A, k1B, k68, k16, k17, k18, k19, \ - k00, k01, k02, k65, k75, k0A, k0B, k66, k67, k69, k06, k08, k09 \ -) { \ - { k00, k01, k02, XXX, XXX, XXX, k06, XXX, k08, k09, k0A, k0B, XXX, k0D, XXX }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, XXX }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, XXX, k4E }, \ - { k50, XXX, k52, k53, k54, k55, XXX, XXX, XXX, XXX, XXX, k5B, k5C, k5D, k5E }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E }, \ - { k70, k71, k72, k73, k74, k75, k76, XXX, k78, k79, k7A, k7B, k7C, k7D, k7E } \ -} diff --git a/keyboards/melgeek/tegic/info.json b/keyboards/melgeek/tegic/info.json index 68850559ba39..31aa06732308 100644 --- a/keyboards/melgeek/tegic/info.json +++ b/keyboards/melgeek/tegic/info.json @@ -25,92 +25,95 @@ "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.25, "y": 0}, - {"x": 6.25, "y": 0}, - {"x": 7.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15.5, "y": 0}, + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "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": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, - {"x": 0, "y": 1.5}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1.5}, - {"x": 4, "y": 1.5}, - {"x": 5, "y": 1.5}, - {"x": 6, "y": 1.5}, - {"x": 7, "y": 1.5}, - {"x": 8, "y": 1.5}, - {"x": 9, "y": 1.5}, - {"x": 10, "y": 1.5}, - {"x": 11, "y": 1.5}, - {"x": 12, "y": 1.5}, - {"x": 13, "y": 1.5, "w": 2}, - {"x": 15.5, "y": 1.5}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, - {"x": 0, "y": 2.5, "w": 1.5}, - {"x": 1.5, "y": 2.5}, - {"x": 2.5, "y": 2.5}, - {"x": 3.5, "y": 2.5}, - {"x": 4.5, "y": 2.5}, - {"x": 5.5, "y": 2.5}, - {"x": 6.5, "y": 2.5}, - {"x": 7.5, "y": 2.5}, - {"x": 8.5, "y": 2.5}, - {"x": 9.5, "y": 2.5}, - {"x": 10.5, "y": 2.5}, - {"x": 11.5, "y": 2.5}, - {"x": 12.5, "y": 2.5}, - {"x": 13.5, "y": 2.5, "w": 1.5}, - {"x": 15.5, "y": 2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, - {"x": 0, "y": 3.5, "w": 1.75}, - {"x": 1.75, "y": 3.5}, - {"x": 2.75, "y": 3.5}, - {"x": 3.75, "y": 3.5}, - {"x": 4.75, "y": 3.5}, - {"x": 5.75, "y": 3.5}, - {"x": 6.75, "y": 3.5}, - {"x": 7.75, "y": 3.5}, - {"x": 8.75, "y": 3.5}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75,"y": 3.5}, - {"x": 11.75,"y": 3.5}, - {"x": 12.75,"y": 3.5, "w": 2.25}, + {"matrix": [1, 14], "x": 15.5, "y": 1.5}, - {"x": 0, "y": 4.5, "w": 2.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.5}, - {"x": 4.25, "y": 4.5}, - {"x": 5.25, "y": 4.5}, - {"x": 6.25, "y": 4.5}, - {"x": 7.25, "y": 4.5}, - {"x": 8.25, "y": 4.5}, - {"x": 9.25, "y": 4.5}, - {"x": 10.25,"y": 4.5}, - {"x": 11.25,"y": 4.5}, - {"x": 12.25,"y": 4.5, "w": 2.25}, - {"x": 14.5, "y": 4.5}, + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, - {"x": 0, "y": 5.5, "w": 1.25}, - {"x": 1.25, "y": 5.5, "w": 1.25}, - {"x": 2.5, "y": 5.5, "w": 1.25}, - {"x": 3.75, "y": 5.5, "w": 6.25}, - {"x": 10, "y": 5.5, "w": 1.25}, - {"x": 11.25,"y": 5.5}, - {"x": 12.25,"y": 5.5, "w": 1.25}, - {"x": 13.5, "y": 5.5}, - {"x": 14.5, "y": 5.5}, - {"x": 15.5, "y": 5.5} + {"matrix": [2, 14], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 13], "x": 14.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.5}, + {"matrix": [5, 11], "x": 12.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 13.5, "y": 5.5}, + {"matrix": [5, 13], "x": 14.5, "y": 5.5}, + {"matrix": [5, 14], "x": 15.5, "y": 5.5} ] } } diff --git a/keyboards/melgeek/tegic/rev1/rev1.c b/keyboards/melgeek/tegic/rev1/rev1.c index 04e490794c7e..24c7fd6cb74d 100755 --- a/keyboards/melgeek/tegic/rev1/rev1.c +++ b/keyboards/melgeek/tegic/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "tegic.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/melgeek/tegic/tegic.h b/keyboards/melgeek/tegic/tegic.h deleted file mode 100755 index 537b87b87a7d..000000000000 --- a/keyboards/melgeek/tegic/tegic.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 MelGeek - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, \ - K50, K51, K52, K55, K59, K5A, K5B, K5C, K5D, K5E \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, XXX }, \ - {K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, XXX, K4D, XXX }, \ - {K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, K5B, K5C, K5D, K5E } \ -} diff --git a/keyboards/mincedshon/ecila/ecila.h b/keyboards/mincedshon/ecila/ecila.h deleted file mode 100644 index 5d03c58ecadd..000000000000 --- a/keyboards/mincedshon/ecila/ecila.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2022 mincedshon (@mincedshon) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \ - k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, \ - k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, \ - k59, k60, k61, k62, k63, k64, k65, k66, k67 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14 }, \ - { k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, KC_NO, k43 }, \ - { k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \ - { KC_NO, k59, KC_NO, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, k64, KC_NO, k65, k66, k67 } \ -} diff --git a/keyboards/mincedshon/ecila/info.json b/keyboards/mincedshon/ecila/info.json index 6b277ce59057..36cdb6a4d41d 100644 --- a/keyboards/mincedshon/ecila/info.json +++ b/keyboards/mincedshon/ecila/info.json @@ -30,11 +30,90 @@ "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.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "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":16, "y":0, "w":2}, - {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "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}, {"x":14.5, "y":1}, {"x":15.5, "y":1}, {"x":16.5, "y":1, "w":1.5}, - {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "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}, {"x":14.75, "y":2}, {"x":15.75, "y":2, "w":2.25}, - {"x":0, "y":3}, {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3}, {"x":13.25, "y":3}, {"x":14.25, "y":3}, {"x":15.65, "y":3.25}, {"x":17, "y":3}, - {"x":1.25, "y":4, "w":1.5}, {"x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2}, {"x":7.75, "y":4}, {"x":9.25, "y":4, "w":2.75}, {"x":12, "y":4}, {"x":14.65, "y":4.25}, {"x":15.65, "y":4.25}, {"x":16.65, "y":4.25} + {"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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + + {"matrix": [0, 8], "x": 10, "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, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1}, + {"matrix": [1, 13], "x": 15.5, "y": 1}, + {"matrix": [1, 14], "x": 16.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": 9.75, "y": 2}, + {"matrix": [2, 8], "x": 10.75, "y": 2}, + {"matrix": [2, 9], "x": 11.75, "y": 2}, + {"matrix": [2, 10], "x": 12.75, "y": 2}, + {"matrix": [2, 11], "x": 13.75, "y": 2}, + {"matrix": [2, 12], "x": 14.75, "y": 2}, + {"matrix": [2, 14], "x": 15.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 3], "x": 4.5, "y": 3}, + {"matrix": [3, 4], "x": 5.5, "y": 3}, + {"matrix": [3, 5], "x": 6.5, "y": 3}, + {"matrix": [3, 6], "x": 7.5, "y": 3}, + + {"matrix": [3, 7], "x": 9.25, "y": 3}, + {"matrix": [3, 8], "x": 10.25, "y": 3}, + {"matrix": [3, 9], "x": 11.25, "y": 3}, + {"matrix": [3, 10], "x": 12.25, "y": 3}, + {"matrix": [3, 11], "x": 13.25, "y": 3}, + {"matrix": [3, 12], "x": 14.25, "y": 3}, + + {"matrix": [3, 13], "x": 15.65, "y": 3.25}, + + {"matrix": [3, 14], "x": 17, "y": 3}, + + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 7.75, "y": 4}, + + {"matrix": [4, 8], "x": 9.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12, "y": 4}, + + {"matrix": [4, 12], "x": 14.65, "y": 4.25}, + {"matrix": [4, 13], "x": 15.65, "y": 4.25}, + {"matrix": [4, 14], "x": 16.65, "y": 4.25} ] } } diff --git a/keyboards/mino_plus/mino_plus.c b/keyboards/mino_plus/mino_plus.c index befc5c450621..62434016f72e 100644 --- a/keyboards/mino_plus/mino_plus.c +++ b/keyboards/mino_plus/mino_plus.c @@ -1,6 +1,6 @@ // Copyright 2022 ShandonCodes (@ShandonCodes) // SPDX-License-Identifier: GPL-2.0-or-later -#include "mino_plus.h" +#include "quantum.h" #ifdef OLED_ENABLE #define FRAMES 5 diff --git a/keyboards/mino_plus/mino_plus.h b/keyboards/mino_plus/mino_plus.h deleted file mode 100644 index c525c04462a8..000000000000 --- a/keyboards/mino_plus/mino_plus.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 ShandonCodes (@ShandonCodes) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_mino_plus_soldered -# include "soldered.h" -#endif \ No newline at end of file diff --git a/keyboards/mino_plus/soldered/info.json b/keyboards/mino_plus/soldered/info.json index 1c9504746683..fc75d06e1324 100644 --- a/keyboards/mino_plus/soldered/info.json +++ b/keyboards/mino_plus/soldered/info.json @@ -48,375 +48,81 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "1", - "x": 1, - "y": 0 - }, - { - "label": "2", - "x": 2, - "y": 0 - }, - { - "label": "3", - "x": 3, - "y": 0 - }, - { - "label": "4", - "x": 4, - "y": 0 - }, - { - "label": "5", - "x": 5, - "y": 0 - }, - { - "label": "6", - "x": 6, - "y": 0 - }, - { - "label": "7", - "x": 7, - "y": 0 - }, - { - "label": "8", - "x": 8, - "y": 0 - }, - { - "label": "9", - "x": 9, - "y": 0 - }, - { - "label": "0", - "x": 10, - "y": 0 - }, - { - "label": "_", - "x": 11, - "y": 0 - }, - { - "label": "+", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "Del", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "{", - "x": 11.5, - "y": 1 - }, - { - "label": "}", - "x": 12.5, - "y": 1 - }, - { - "label": "|", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "Ins", - "x": 15, - "y": 1 - }, - { - "label": "Caps", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": ":", - "x": 10.75, - "y": 2 - }, - { - "label": "Enter", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "Pgup", - "x": 15, - "y": 2 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": "<", - "x": 9.25, - "y": 3 - }, - { - "label": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "Shift", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "Up", - "x": 14, - "y": 3 - }, - { - "label": "Pgdn", - "x": 15, - "y": 3 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Super", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "Super", - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "2.25", - "x": 3.75, - "y": 4, - "w": 2.25 - }, - { - "label": "2.75", - "x": 3.75, - "y": 4, - "w": 2.75 - }, - { - "label": "1.25", - "x": 6, - "y": 4, - "w": 1.25 - }, - { - "label": "Meta", - "x": 10, - "y": 4 - }, - { - "label": "Win", - "x": 11, - "y": 4 - }, - { - "label": "Ctrl", - "x": 12, - "y": 4 - }, - { - "label": "Left", - "x": 13, - "y": 4 - }, - { - "label": "Down", - "x": 14, - "y": 4 - }, - { - "label": "Right", - "x": 15, - "y": 4 - }, - { - "label": "\"", - "x": 11.5, - "y": 7 - } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [2, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/mino_plus/soldered/soldered.c b/keyboards/mino_plus/soldered/soldered.c index efaaef61c67a..6dd113ebfac8 100644 --- a/keyboards/mino_plus/soldered/soldered.c +++ b/keyboards/mino_plus/soldered/soldered.c @@ -1,6 +1,6 @@ // Copyright 2022 ShandonCodes (@ShandonCodes) // SPDX-License-Identifier: GPL-2.0-or-later -#include "soldered.h" +#include "quantum.h" void board_init(void) { SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP; diff --git a/keyboards/mino_plus/soldered/soldered.h b/keyboards/mino_plus/soldered/soldered.h deleted file mode 100644 index 73ae27a50667..000000000000 --- a/keyboards/mino_plus/soldered/soldered.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2022 ShandonCodes (@ShandonCodes) -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k2e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k45, k47, k49, k4a, k4b, k4c, k4d, k4e\ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - { k40, k41, k42, k43, KC_NO, k45, KC_NO, k47, KC_NO, k49, k4a, k4b, k4c, k4d, k4e}, \ -} - diff --git a/keyboards/mint60/info.json b/keyboards/mint60/info.json index 90b5236d4375..bd51052853f9 100644 --- a/keyboards/mint60/info.json +++ b/keyboards/mint60/info.json @@ -24,72 +24,82 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":7, "y":0}, - {"label":"&", "x":8, "y":0}, - {"label":"*", "x":9, "y":0}, - {"label":"(", "x":10, "y":0}, - {"label":")", "x":11, "y":0}, - {"label":"_", "x":12, "y":0}, - {"label":"+", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"{", "x":12.5, "y":1}, - {"label":"}", "x":13.5, "y":1}, - {"label":"|", "x":14.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":":", "x":11.75, "y":2}, - {"label":"\"", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2}, - {"label":"Z", "x":2, "y":3}, - {"label":"X", "x":3, "y":3}, - {"label":"C", "x":4, "y":3}, - {"label":"V", "x":5, "y":3}, - {"label":"B", "x":6, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3}, - {"label":"Up", "x":14, "y":3}, - {"label":"Fn", "x":15, "y":3}, - {"label":"Esc", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4, "w":1.25}, - {"label":"Win", "x":2.25, "y":4, "w":1.25}, - {"label":"Alt", "x":3.5, "y":4, "w":1.25}, - {"label":"Space", "x":4.75, "y":4, "w":2.25}, - {"label":"Space", "x":7.75, "y":4, "w":2.75}, - {"label":"Win", "x":10.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":11.75, "y":4, "w":1.25}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + {"matrix": [5, 7], "x": 14, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 7], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + + {"matrix": [8, 0], "x": 8, "y": 3}, + {"matrix": [8, 1], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 5], "x": 13, "y": 3}, + {"matrix": [8, 6], "x": 14, "y": 3}, + {"matrix": [8, 7], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 2.25}, + + {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 2.75}, + {"matrix": [9, 1], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 13, "y": 4}, + {"matrix": [9, 6], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/mint60/mint60.h b/keyboards/mint60/mint60.h deleted file mode 100644 index 78529921aa53..000000000000 --- a/keyboards/mint60/mint60.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2018 Eucalyn - * - * 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" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - L00,L01,L02,L03,L04,L05, R00,R01,R02,R03,R04,R05,R06, R07, \ - L10, L11,L12,L13,L14,L15, R10,R11,R12,R13,R14,R15,R16,R17, \ - L20, L21,L22,L23,L24,L25, R20,R21,R22,R23,R24,R25, R27, \ - L30, L31,L32,L33,L34,L35, R30,R31,R32,R33,R34,R35,R36,R37, \ - L40,L41, L42, L43, L44, R40, R41, R43, R45,R46,R47 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, KC_NO, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, KC_NO, R43, KC_NO, R45, R46, R47 }, \ -} diff --git a/keyboards/misonoworks/chocolatebar/chocolatebar.c b/keyboards/misonoworks/chocolatebar/chocolatebar.c index dc9a251df49e..ea30292b864c 100644 --- a/keyboards/misonoworks/chocolatebar/chocolatebar.c +++ b/keyboards/misonoworks/chocolatebar/chocolatebar.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 "chocolatebar.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/misonoworks/chocolatebar/chocolatebar.h b/keyboards/misonoworks/chocolatebar/chocolatebar.h deleted file mode 100644 index badebdb73b5f..000000000000 --- a/keyboards/misonoworks/chocolatebar/chocolatebar.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2021 MisonoWorks - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K111, K113, K114, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K211, K212, K213, K214, K215, \ - K300, K301, K302, K303, K305, K306, K308, K311, K312, K313, K314, K315 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, KC_NO, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K111, KC_NO, K113, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, K211, K212, K213, K214, K215 }, \ - { K300, K301, K302, K303, KC_NO, K305, K306, KC_NO, K308, KC_NO, KC_NO, K311, K312, K313, K314, K315 } \ -} diff --git a/keyboards/misonoworks/chocolatebar/info.json b/keyboards/misonoworks/chocolatebar/info.json index ce4f796b88d0..abb58f29f597 100644 --- a/keyboards/misonoworks/chocolatebar/info.json +++ b/keyboards/misonoworks/chocolatebar/info.json @@ -21,64 +21,70 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"U", "x":7, "y":0}, - {"label":"I", "x":8, "y":0}, - {"label":"O", "x":9, "y":0}, - {"label":"P", "x":10, "y":0}, - {"label":"Back Space", "x":11, "y":0}, - {"label":"7", "x":13, "y":0}, - {"label":"8", "x":14, "y":0}, - {"label":"9", "x":15, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"A", "x":1.5, "y":1}, - {"label":"S", "x":2.5, "y":1}, - {"label":"D", "x":3.5, "y":1}, - {"label":"F", "x":4.5, "y":1}, - {"label":"G", "x":5.5, "y":1}, - {"label":"H", "x":6.5, "y":1}, - {"label":"J", "x":7.5, "y":1}, - {"label":"K", "x":8.5, "y":1}, - {"label":"L", "x":9.5, "y":1}, - {"label":"Enter", "x":10.5, "y":1, "w":1.5}, - {"label":"4", "x":13, "y":1}, - {"label":"5", "x":14, "y":1}, - {"label":"6", "x":15, "y":1}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, - {"label":"Shift", "x":0, "y":2, "w":2}, - {"label":"Z", "x":2, "y":2}, - {"label":"X", "x":3, "y":2}, - {"label":"C", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, - {"label":"B", "x":6, "y":2}, - {"label":"N", "x":7, "y":2}, - {"label":"M", "x":8, "y":2}, - {"label":", <", "x":9, "y":2}, - {"label":"Shift", "x":10, "y":2, "w":1.5}, - {"label":"Up", "x":11.75, "y":2.25}, - {"label":"1", "x":13, "y":2}, - {"label":"2", "x":14, "y":2}, - {"label":"3", "x":15, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1, "w": 1.5}, - {"label":"Ctrl", "x":0, "y":3, "w":1.5}, - {"label":"Alt", "x":1.5, "y":3, "w":1.5}, - {"label":"Meta", "x":3, "y":3}, - {"x":4, "y":3, "w":2}, - {"x":6, "y":3, "w":2}, - {"label":"Super", "x":8, "y":3}, - {"label":"Ctrl", "x":9, "y":3, "w":1.5}, - {"label":"Left", "x":10.75, "y":3.25}, - {"label":"Down", "x":11.75, "y":3.25}, - {"label":"Right", "x":12.75, "y":3.25}, - {"label":"0", "x":14, "y":3}, - {"label":"Calc", "x":15, "y":3} + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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, 11], "x": 10, "y": 2, "w": 1.5}, + + {"matrix": [2, 12], "x": 11.75, "y": 2.25}, + + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3, "w": 2}, + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.5}, + + {"matrix": [3, 11], "x": 10.75, "y": 3.25}, + {"matrix": [3, 12], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25}, + + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3} ] } } diff --git a/keyboards/misonoworks/karina/info.json b/keyboards/misonoworks/karina/info.json index 803f31a18eaf..5ebaf686928b 100644 --- a/keyboards/misonoworks/karina/info.json +++ b/keyboards/misonoworks/karina/info.json @@ -27,49 +27,50 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Encoder 1", "x":0, "y":0}, - {"label":"Encoder 2", "x":10, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"Q", "x":0.5, "y":1}, - {"label":"W", "x":1.5, "y":1}, - {"label":"E", "x":2.5, "y":1}, - {"label":"R", "x":3.5, "y":1}, - {"label":"T", "x":4.5, "y":1}, - {"label":"Y", "x":5.5, "y":1}, - {"label":"U", "x":6.5, "y":1}, - {"label":"I", "x":7.5, "y":1}, - {"label":"O", "x":8.5, "y":1}, - {"label":"P", "x":9.5, "y":1}, + {"matrix": [2, 10], "x": 10, "y": 0}, - {"label":"Tab", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6, "y":2}, - {"label":"J", "x":7, "y":2}, - {"label":"K", "x":8, "y":2}, - {"label":"L", "x":9, "y":2}, - {"label":"Enter", "x":10, "y":2}, + {"matrix": [0, 1], "x": 0.5, "y": 1}, + {"matrix": [0, 2], "x": 1.5, "y": 1}, + {"matrix": [0, 3], "x": 2.5, "y": 1}, + {"matrix": [0, 4], "x": 3.5, "y": 1}, + {"matrix": [0, 5], "x": 4.5, "y": 1}, + {"matrix": [0, 6], "x": 5.5, "y": 1}, + {"matrix": [0, 7], "x": 6.5, "y": 1}, + {"matrix": [0, 8], "x": 7.5, "y": 1}, + {"matrix": [0, 9], "x": 8.5, "y": 1}, + {"matrix": [0, 10], "x": 9.5, "y": 1}, - {"label":"Shift", "x":0, "y":3, "w":1.5}, - {"label":"Z", "x":1.5, "y":3}, - {"label":"X", "x":2.5, "y":3}, - {"label":"C", "x":3.5, "y":3}, - {"label":"V", "x":4.5, "y":3}, - {"label":"B", "x":5.5, "y":3}, - {"label":"N", "x":6.5, "y":3}, - {"label":"M", "x":7.5, "y":3}, - {"label":"<", "x":8.5, "y":3}, - {"label":">", "x":9.5, "y":3, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "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, 8], "x": 8, "y": 2}, + {"matrix": [1, 9], "x": 9, "y": 2}, + {"matrix": [1, 10], "x": 10, "y": 2}, - {"label":"Alt", "x":0, "y":4, "w":1.75}, - {"label":"MO(1)", "x":1.75, "y":4, "w":1.25}, - {"label":"Space", "x":3, "y":4, "w":2.75}, - {"label":"Backspace", "x":5.75, "y":4, "w":2.25}, - {"label":"MO(2)", "x":8, "y":4, "w":1.25}, - {"label":"Control", "x":9.25, "y":4, "w":1.75} + {"matrix": [2, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 3}, + {"matrix": [2, 2], "x": 2.5, "y": 3}, + {"matrix": [2, 3], "x": 3.5, "y": 3}, + {"matrix": [2, 4], "x": 4.5, "y": 3}, + {"matrix": [2, 5], "x": 5.5, "y": 3}, + {"matrix": [2, 6], "x": 6.5, "y": 3}, + {"matrix": [2, 7], "x": 7.5, "y": 3}, + {"matrix": [2, 8], "x": 8.5, "y": 3}, + {"matrix": [2, 9], "x": 9.5, "y": 3, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [3, 3], "x": 3, "y": 4, "w": 2.75}, + {"matrix": [3, 6], "x": 5.75, "y": 4, "w": 2.25}, + {"matrix": [3, 8], "x": 8, "y": 4, "w": 1.25}, + {"matrix": [3, 9], "x": 9.25, "y": 4, "w": 1.75} ] } } diff --git a/keyboards/misonoworks/karina/karina.h b/keyboards/misonoworks/karina/karina.h deleted file mode 100644 index 2baeb5db5cf5..000000000000 --- a/keyboards/misonoworks/karina/karina.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 MisonoWorks - -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( \ - K000, K210, \ - 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, \ - K300, K301, K303, K306, K308, K309 \ -) { \ - { 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, KC_NO, K303, KC_NO, KC_NO, K306, KC_NO, K308, K309, KC_NO } \ -} diff --git a/keyboards/mitosis/info.json b/keyboards/mitosis/info.json index a6d48c4e4ec2..feab60b7fb8c 100644 --- a/keyboards/mitosis/info.json +++ b/keyboards/mitosis/info.json @@ -12,7 +12,63 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.75}, {"x":1, "y":0.25}, {"x":2, "y":0}, {"x":3, "y":0.25}, {"x":4, "y":0.125}, {"x":7, "y":0.125}, {"x":8, "y":0.25}, {"x":9, "y":0}, {"x":10, "y":0.25}, {"x":11, "y":0.75}, {"x":0, "y":1.75}, {"x":1, "y":1.25}, {"x":2, "y":1}, {"x":3, "y":1.25}, {"x":4, "y":1.125}, {"x":7, "y":1.125}, {"x":8, "y":1.25}, {"x":9, "y":1}, {"x":10, "y":1.25}, {"x":11, "y":1.75}, {"x":0, "y":2.75}, {"x":1, "y":2.25}, {"x":2, "y":2}, {"x":3, "y":2.25}, {"x":4, "y":2.125}, {"x":7, "y":2.125}, {"x":8, "y":2.25}, {"x":9, "y":2}, {"x":10, "y":2.25}, {"x":11, "y":2.75}, {"x":1.5, "y":3.75}, {"x":2.5, "y":3.75}, {"x":3.5, "y":3.75}, {"x":4.5, "y":3.75}, {"x":6.5, "y":3.75}, {"x":7.5, "y":3.75}, {"x":8.5, "y":3.75}, {"x":9.5, "y":3.75}, {"x":1.5, "y":4.75}, {"x":2.5, "y":4.75}, {"x":3.5, "y":4.75}, {"x":4.5, "y":4.75}, {"x":6.5, "y":4.75}, {"x":7.5, "y":4.75}, {"x":8.5, "y":4.75}, {"x":9.5, "y":4.75}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + + {"matrix": [0, 5], "x": 7, "y": 0.125}, + {"matrix": [0, 6], "x": 8, "y": 0.25}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0.25}, + {"matrix": [0, 9], "x": 11, "y": 0.75}, + + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + + {"matrix": [1, 5], "x": 7, "y": 1.125}, + {"matrix": [1, 6], "x": 8, "y": 1.25}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + + {"matrix": [2, 5], "x": 7, "y": 2.125}, + {"matrix": [2, 6], "x": 8, "y": 2.25}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2.25}, + {"matrix": [2, 9], "x": 11, "y": 2.75}, + + {"matrix": [3, 1], "x": 1.5, "y": 3.75}, + {"matrix": [3, 2], "x": 2.5, "y": 3.75}, + {"matrix": [3, 3], "x": 3.5, "y": 3.75}, + {"matrix": [3, 4], "x": 4.5, "y": 3.75}, + + {"matrix": [3, 5], "x": 6.5, "y": 3.75}, + {"matrix": [3, 6], "x": 7.5, "y": 3.75}, + {"matrix": [3, 7], "x": 8.5, "y": 3.75}, + {"matrix": [3, 8], "x": 9.5, "y": 3.75}, + + {"matrix": [4, 1], "x": 1.5, "y": 4.75}, + {"matrix": [4, 2], "x": 2.5, "y": 4.75}, + {"matrix": [4, 3], "x": 3.5, "y": 4.75}, + {"matrix": [4, 4], "x": 4.5, "y": 4.75}, + + {"matrix": [4, 5], "x": 6.5, "y": 4.75}, + {"matrix": [4, 6], "x": 7.5, "y": 4.75}, + {"matrix": [4, 7], "x": 8.5, "y": 4.75}, + {"matrix": [4, 8], "x": 9.5, "y": 4.75} + ] } } } diff --git a/keyboards/mitosis/mitosis.h b/keyboards/mitosis/mitosis.h index 4b7d3a60c414..04ef56503ff1 100644 --- a/keyboards/mitosis/mitosis.h +++ b/keyboards/mitosis/mitosis.h @@ -41,22 +41,3 @@ #define set_led_cyan PORTF = PORTF & ~(1<. */ -#include "gas75.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/ml/gas75/gas75.h b/keyboards/ml/gas75/gas75.h deleted file mode 100644 index 88291ac4a8fa..000000000000 --- a/keyboards/ml/gas75/gas75.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2022 ML - * - * 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 XXX KC_NO - -/* 54 ◯ 53 - * ┌───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┬───┬───┬───┐┌───┐┌───┐ - * │00 ││01 │02 │03 │04 ││05 │06 │07 │08 ││09 │0A │0B │0C ││0D ││0E │ - * └───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┴───┴───┴───┘└───┘└───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D ││1E │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D ││2E │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤├───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D ││3E │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘└───┘ - * │40 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │┌───┐ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─────┘│4D │ - * │50 │51 │52 │56 │5A │5B │ ┌───┼───┼───┐ - * └────┴────┴────┴────────────────────────┴────┴────┘ │5C │5D │5E │ - * └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K54, K0E, K53, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, XXX }, \ - { K50, K51, K52, K53, K54, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E } \ -} diff --git a/keyboards/ml/gas75/info.json b/keyboards/ml/gas75/info.json index d2a09cf7f71c..48e0abb14ea5 100644 --- a/keyboards/ml/gas75/info.json +++ b/keyboards/ml/gas75/info.json @@ -29,94 +29,104 @@ "layouts": { "LAYOUT": { "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":"Delete", "x":14, "y":0}, - {"label":"Encoder CCW", "x":15, "y":0, "w":0.5}, - {"label":"Mute", "x":15.5, "y":0}, - {"label":"Encoder CW", "x":16.5, "y":0, "w":0.5}, + {"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":"Home", "x":15.25, "y":1.25}, + {"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}, - {"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":"PgUp", "x":15.25, "y":2.25}, + {"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}, - {"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":"PgDn", "x":15.25, "y":3.25}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "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":1.75}, - {"label":"\u2191", "x":14.25, "y":4.5}, + {"matrix": [0, 13], "x": 14, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "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":"\u2190", "x":13.25, "y":5.5}, - {"label":"\u2193", "x":14.25, "y":5.5}, - {"label":"\u2192", "x":15.25, "y":5.5} + {"matrix": [5, 4], "x": 15, "y": 0, "w": 0.5}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [5, 3], "x": 16.5, "y": 0, "w": 0.5}, + + {"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": [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": [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": [3, 14], "x": 15.25, "y": 3.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": 1.75}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.5}, + + {"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, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/mmkzoo65/info.json b/keyboards/mmkzoo65/info.json index bd98fdbd3527..837a82916b11 100644 --- a/keyboards/mmkzoo65/info.json +++ b/keyboards/mmkzoo65/info.json @@ -18,76 +18,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Delete", "x":15, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"PgUp", "x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"PgDn", "x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Fn", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "x":15, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/mmkzoo65/mmkzoo65.h b/keyboards/mmkzoo65/mmkzoo65.h deleted file mode 100644 index 59b2b7f56c4b..000000000000 --- a/keyboards/mmkzoo65/mmkzoo65.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 TW59420 - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K406, K410, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, K414 } \ -} diff --git a/keyboards/mntre/info.json b/keyboards/mntre/info.json index 7fae38f4ada9..90bfc3fc5608 100644 --- a/keyboards/mntre/info.json +++ b/keyboards/mntre/info.json @@ -22,93 +22,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "ESC", "x": 0, "y": 0}, - {"label": "F1", "x": 1, "y": 0}, - {"label": "F2", "x": 2, "y": 0}, - {"label": "F3", "x": 3, "y": 0}, - {"label": "F4", "x": 4, "y": 0}, - {"label": "F5", "x": 5, "y": 0}, - {"label": "F6", "x": 6, "y": 0}, - {"label": "F7", "x": 7, "y": 0}, - {"label": "F8", "x": 8, "y": 0}, - {"label": "F9", "x": 9, "y": 0}, - {"label": "F10", "x": 10, "y": 0}, - {"label": "F11", "x": 11, "y": 0}, - {"label": "F12", "x": 12, "y": 0}, - {"label": "NO", "x": 13, "y": 0, "w": 1.5}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5}, - {"label": "GRAVE", "x": 0, "y": 1}, - {"label": "1", "x": 1, "y": 1}, - {"label": "2", "x": 2, "y": 1}, - {"label": "3", "x": 3, "y": 1}, - {"label": "4", "x": 4, "y": 1}, - {"label": "5", "x": 5, "y": 1}, - {"label": "6", "x": 6, "y": 1}, - {"label": "7", "x": 7, "y": 1}, - {"label": "8", "x": 8, "y": 1}, - {"label": "9", "x": 9, "y": 1}, - {"label": "0", "x": 10, "y": 1}, - {"label": "MINUS", "x": 11, "y": 1}, - {"label": "EQUAL", "x": 12, "y": 1}, - {"label": "BSPACE", "x": 13, "y": 1, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5}, - {"label": "TAB", "x": 0, "y": 2, "w": 1.5}, - {"label": "Q", "x": 1.5, "y": 2}, - {"label": "W", "x": 2.5, "y": 2}, - {"label": "E", "x": 3.5, "y": 2}, - {"label": "R", "x": 4.5, "y": 2}, - {"label": "T", "x": 5.5, "y": 2}, - {"label": "Y", "x": 6.5, "y": 2}, - {"label": "U", "x": 7.5, "y": 2}, - {"label": "I", "x": 8.5, "y": 2}, - {"label": "O", "x": 9.5, "y": 2}, - {"label": "P", "x": 10.5, "y": 2}, - {"label": "LBRACKET", "x": 11.5, "y": 2}, - {"label": "RBRACKET", "x": 12.5, "y": 2}, - {"label": "BSLASH", "x": 13.5, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2}, - {"label": "LCTRL", "x": 0, "y": 3}, - {"label": "APP", "x": 1, "y": 3}, - {"label": "A", "x": 2, "y": 3}, - {"label": "S", "x": 3, "y": 3}, - {"label": "D", "x": 4, "y": 3}, - {"label": "F", "x": 5, "y": 3}, - {"label": "G", "x": 6, "y": 3}, - {"label": "H", "x": 7, "y": 3}, - {"label": "J", "x": 8, "y": 3}, - {"label": "K", "x": 9, "y": 3}, - {"label": "L", "x": 10, "y": 3}, - {"label": "SCOLON", "x": 11, "y": 3}, - {"label": "QUOTE", "x": 12, "y": 3}, - {"label": "ENTER", "x": 13, "y": 3, "w": 1.5}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3, "w": 1.5}, - {"label": "LSHIFT", "x": 0, "y": 4, "w": 1.5}, - {"label": "DEL", "x": 1.5, "y": 4}, - {"label": "Z", "x": 2.5, "y": 4}, - {"label": "X", "x": 3.5, "y": 4}, - {"label": "C", "x": 4.5, "y": 4}, - {"label": "V", "x": 5.5, "y": 4}, - {"label": "B", "x": 6.5, "y": 4}, - {"label": "N", "x": 7.5, "y": 4}, - {"label": "M", "x": 8.5, "y": 4}, - {"label": "COMMA", "x": 9.5, "y": 4}, - {"label": "DOT", "x": 10.5, "y": 4}, - {"label": "SLASH", "x": 11.5, "y": 4}, - {"label": "UP", "x": 12.5, "y": 4}, - {"label": "RSHIFT", "x": 13.5, "y": 4}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + {"matrix": [4, 7], "x": 7.5, "y": 4}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4}, + {"matrix": [4, 10], "x": 10.5, "y": 4}, + {"matrix": [4, 11], "x": 11.5, "y": 4}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4}, - {"label": "RGUI", "x": 0, "y": 5, "w": 1.5}, - {"label": "LGUI", "x": 1.5, "y": 5, "w": 1.5}, - {"label": "RCTRL", "x": 3, "y": 5, "w": 1.5}, - {"label": "SPACE", "x": 4.5, "y": 5, "w": 1.5}, - {"label": "LALT", "x": 6, "y": 5}, - {"label": "RALT", "x": 7, "y": 5}, - {"label": "SPACE", "x": 8, "y": 5, "w": 1.5}, - {"label": "PGUP", "x": 9.5, "y": 5}, - {"label": "PGDOWN", "x": 10.5, "y": 5}, - {"label": "LEFT", "x": 11.5, "y": 5}, - {"label": "DOWN", "x": 12.5, "y": 5}, - {"label": "RIGHT", "x": 13.5, "y": 5} + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5, "w": 1.5}, + {"matrix": [5, 2], "x": 3, "y": 5, "w": 1.5}, + {"matrix": [5, 3], "x": 4.5, "y": 5, "w": 1.5}, + {"matrix": [5, 4], "x": 6, "y": 5}, + {"matrix": [5, 5], "x": 7, "y": 5}, + {"matrix": [5, 6], "x": 8, "y": 5, "w": 1.5}, + {"matrix": [5, 7], "x": 9.5, "y": 5}, + {"matrix": [5, 8], "x": 10.5, "y": 5}, + {"matrix": [5, 9], "x": 11.5, "y": 5}, + {"matrix": [5, 10], "x": 12.5, "y": 5}, + {"matrix": [5, 11], "x": 13.5, "y": 5} ] } } diff --git a/keyboards/mntre/mntre.c b/keyboards/mntre/mntre.c index c21070b23b1f..80ed074c2f0d 100644 --- a/keyboards/mntre/mntre.c +++ b/keyboards/mntre/mntre.c @@ -1,7 +1,7 @@ // Copyright 2021 Cedric Vincent (@cdc-mkb) // SPDX-License-Identifier: GPL-2.0-or-later -#include "mntre.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/mntre/mntre.h b/keyboards/mntre/mntre.h deleted file mode 100644 index 8a481144238d..000000000000 --- a/keyboards/mntre/mntre.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2021 Cedric Vincent (@cdc-mkb) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, \ - k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, KC_NO, KC_NO } \ -} diff --git a/keyboards/mokey/mokey64/info.json b/keyboards/mokey/mokey64/info.json index 36126d924314..caff88fb4207 100644 --- a/keyboards/mokey/mokey64/info.json +++ b/keyboards/mokey/mokey64/info.json @@ -18,74 +18,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0}, - {"label":"k0c", "x":12, "y":0}, - {"label":"k0e", "x":13, "y":0, "w":2}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, - {"label":"k10", "x":0, "y":1, "w":1.5}, - {"label":"k12", "x":1.5, "y":1}, - {"label":"k13", "x":2.5, "y":1}, - {"label":"k14", "x":3.5, "y":1}, - {"label":"k15", "x":4.5, "y":1}, - {"label":"k16", "x":5.5, "y":1}, - {"label":"k17", "x":6.5, "y":1}, - {"label":"k18", "x":7.5, "y":1}, - {"label":"k19", "x":8.5, "y":1}, - {"label":"k1a", "x":9.5, "y":1}, - {"label":"k1b", "x":10.5, "y":1}, - {"label":"k1c", "x":11.5, "y":1}, - {"label":"k1d", "x":12.5, "y":1}, - {"label":"k1e", "x":13.5, "y":1, "w":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"k20", "x":0, "y":2, "w":1.75}, - {"label":"k22", "x":1.75, "y":2}, - {"label":"k23", "x":2.75, "y":2}, - {"label":"k24", "x":3.75, "y":2}, - {"label":"k25", "x":4.75, "y":2}, - {"label":"k26", "x":5.75, "y":2}, - {"label":"k27", "x":6.75, "y":2}, - {"label":"k28", "x":7.75, "y":2}, - {"label":"k29", "x":8.75, "y":2}, - {"label":"k2a", "x":9.75, "y":2}, - {"label":"k2b", "x":10.75, "y":2}, - {"label":"k2c", "x":11.75, "y":2}, - {"label":"k2d", "x":12.75, "y":2, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"label":"k30", "x":0, "y":3, "w":2}, - {"label":"k32", "x":2, "y":3}, - {"label":"k33", "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":"k38", "x":8, "y":3}, - {"label":"k39", "x":9, "y":3}, - {"label":"k3a", "x":10, "y":3}, - {"label":"k3b", "x":11, "y":3}, - {"label":"k3c", "x":12, "y":3}, - {"label":"k3d", "x":13, "y":3}, - {"label":"k3e", "x":14, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, - {"label":"k40", "x":0, "y":4, "w":1.25}, - {"label":"k41", "x":1.25, "y":4, "w":1.25}, - {"label":"k43", "x":2.5, "y":4, "w":1.25}, - {"label":"k46", "x":3.75, "y":4, "w":6.25}, - {"label":"k4a", "x":10, "y":4}, - {"label":"k4b", "x":11, "y":4}, - {"label":"k4c", "x":12, "y":4}, - {"label":"k4d", "x":13, "y":4}, - {"label":"k4e", "x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4} ] } } diff --git a/keyboards/mokey/mokey64/mokey64.h b/keyboards/mokey/mokey64/mokey64.h deleted file mode 100644 index 8dddc4faefef..000000000000 --- a/keyboards/mokey/mokey64/mokey64.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2021 Kyle McCreery - * - * 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 XXX KC_NO - -/* - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ - * │10 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d │1e │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ - * │20 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d │ - * ├──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬───┬───┤ - * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3c │3d │3e │ - * ├────┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┼───┼───┼───┼───┤ - * │40 │41 │43 │ 46 │4a │4b │4c │4d │4e │ - * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┘ -*/ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \ - k40, k41, k43, k46, k4a, k4b, k4c, k4d, k4e \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e }, \ - { k40, k41, k43, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e } \ -} diff --git a/keyboards/molecule/info.json b/keyboards/molecule/info.json index aff785210775..51ca67c2820d 100755 --- a/keyboards/molecule/info.json +++ b/keyboards/molecule/info.json @@ -18,50 +18,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":1}, - {"label":"W", "x":1, "y":0.25}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0.5}, - {"label":"T", "x":4, "y":0.75}, - {"label":"Y", "x":9.75, "y":0.75}, - {"label":"U", "x":10.75, "y":0.5}, - {"label":"I", "x":11.75, "y":0}, - {"label":"O", "x":12.75, "y":0.25}, - {"label":"P", "x":13.75, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.5}, + {"matrix": [0, 4], "x": 4, "y": 0.75}, - {"label":"A", "x":0, "y":2}, - {"label":"S", "x":1, "y":1.25}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1.5}, - {"label":"G", "x":4, "y":1.75}, - {"label":"H", "x":9.75, "y":1.75}, - {"label":"J", "x":10.75, "y":1.5}, - {"label":"K", "x":11.75, "y":1}, - {"label":"L", "x":12.75, "y":1.25}, - {"label":";", "x":13.75, "y":2}, + {"matrix": [0, 5], "x": 9.75, "y": 0.75}, + {"matrix": [0, 6], "x": 10.75, "y": 0.5}, + {"matrix": [0, 7], "x": 11.75, "y": 0}, + {"matrix": [0, 8], "x": 12.75, "y": 0.25}, + {"matrix": [0, 9], "x": 13.75, "y": 1}, - {"label":"Z", "x":0, "y":3}, - {"label":"X", "x":1, "y":2.25}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2.5}, - {"label":"B", "x":4, "y":2.75}, - {"label":"N", "x":9.75, "y":2.75}, - {"label":"M", "x":10.75, "y":2.5}, - {"label":",", "x":11.75, "y":2}, - {"label":".", "x":12.75, "y":2.25}, - {"label":"/", "x":13.75, "y":3}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.75}, - {"label":"Ctrl", "x":1, "y":3.25}, - {"label":"Shift", "x":2, "y":3}, - {"label":"Alt", "x":5.25, "y":3}, - {"label":"Space", "x":6.25, "y":3.25, "h":1.5}, - {"label":"Enter", "x":7.5, "y":3.25, "h":1.5}, - {"label":"Super", "x":8.5, "y":3}, - {"label":"Shift", "x":11.75, "y":3}, - {"label":"Ctrl", "x":12.75, "y":3.25}, + {"matrix": [1, 5], "x": 9.75, "y": 1.75}, + {"matrix": [1, 6], "x": 10.75, "y": 1.5}, + {"matrix": [1, 7], "x": 11.75, "y": 1}, + {"matrix": [1, 8], "x": 12.75, "y": 1.25}, + {"matrix": [1, 9], "x": 13.75, "y": 2}, - {"label":"Lower", "x":5.25, "y":4}, - {"label":"Raise", "x":8.5, "y":4} + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.75}, + + {"matrix": [2, 5], "x": 9.75, "y": 2.75}, + {"matrix": [2, 6], "x": 10.75, "y": 2.5}, + {"matrix": [2, 7], "x": 11.75, "y": 2}, + {"matrix": [2, 8], "x": 12.75, "y": 2.25}, + {"matrix": [2, 9], "x": 13.75, "y": 3}, + + {"matrix": [3, 0], "x": 1, "y": 3.25}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 5.25, "y": 3}, + {"matrix": [3, 4], "x": 6.25, "y": 3.25, "h": 1.5}, + + {"matrix": [3, 5], "x": 7.5, "y": 3.25, "h": 1.5}, + {"matrix": [3, 6], "x": 8.5, "y": 3}, + {"matrix": [3, 8], "x": 11.75, "y": 3}, + {"matrix": [3, 9], "x": 12.75, "y": 3.25}, + + {"matrix": [3, 2], "x": 5.25, "y": 4}, + + {"matrix": [3, 7], "x": 8.5, "y": 4} ] } } diff --git a/keyboards/molecule/molecule.h b/keyboards/molecule/molecule.h deleted file mode 100755 index a7769f89a1ad..000000000000 --- a/keyboards/molecule/molecule.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 bbrfkr - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L33, L34, R30, R31, R33, R34, \ - L32, R32 \ - ) \ - { \ - { L00, L01, L02, L03, L04, R00, R01, R02, R03, R04 }, \ - { L10, L11, L12, L13, L14, R10, R11, R12, R13, R14 }, \ - { L20, L21, L22, L23, L24, R20, R21, R22, R23, R24 }, \ - { L30, L31, L32, L33, L34, R30, R31, R32, R33, R34 }, \ - } diff --git a/keyboards/momoka_ergo/info.json b/keyboards/momoka_ergo/info.json index fbba58a8402b..fa116fd1c0cb 100644 --- a/keyboards/momoka_ergo/info.json +++ b/keyboards/momoka_ergo/info.json @@ -25,83 +25,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L05", "x":0, "y":0.375, "w":1.5}, - {"label":"L04", "x":1.5, "y":0.375}, - {"label":"L03", "x":2.5, "y":0.125}, - {"label":"L02", "x":3.5, "y":0}, - {"label":"L01", "x":4.5, "y":0.125}, - {"label":"L00", "x":5.5, "y":0.25}, - {"label":"R70", "x":12.5, "y":0.25}, - {"label":"R71", "x":13.5, "y":0.125}, - {"label":"R72", "x":14.5, "y":0}, - {"label":"R73", "x":15.5, "y":0.125}, - {"label":"R74", "x":16.5, "y":0.375}, - {"label":"R75", "x":17.5, "y":0.375, "w":1.5}, + {"matrix": [0, 5], "x": 0, "y": 0.375, "w": 1.5}, + {"matrix": [0, 4], "x": 1.5, "y": 0.375}, + {"matrix": [0, 3], "x": 2.5, "y": 0.125}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 1], "x": 4.5, "y": 0.125}, + {"matrix": [0, 0], "x": 5.5, "y": 0.25}, - {"label":"L15", "x":0, "y":1.375, "w":1.5}, - {"label":"L14", "x":1.5, "y":1.375}, - {"label":"L13", "x":2.5, "y":1.125}, - {"label":"L12", "x":3.5, "y":1}, - {"label":"L11", "x":4.5, "y":1.125}, - {"label":"L10", "x":5.5, "y":1.25}, - {"label":"R80", "x":12.5, "y":1.25}, - {"label":"R81", "x":13.5, "y":1.125}, - {"label":"R82", "x":14.5, "y":1}, - {"label":"R83", "x":15.5, "y":1.125}, - {"label":"R84", "x":16.5, "y":1.375}, - {"label":"R85", "x":17.5, "y":1.375, "w":1.5}, + {"matrix": [7, 0], "x": 12.5, "y": 0.25}, + {"matrix": [7, 1], "x": 13.5, "y": 0.125}, + {"matrix": [7, 2], "x": 14.5, "y": 0}, + {"matrix": [7, 3], "x": 15.5, "y": 0.125}, + {"matrix": [7, 4], "x": 16.5, "y": 0.375}, + {"matrix": [7, 5], "x": 17.5, "y": 0.375, "w": 1.5}, - {"label":"L25", "x":0, "y":2.375, "w":1.5}, - {"label":"L24", "x":1.5, "y":2.375}, - {"label":"L23", "x":2.5, "y":2.125}, - {"label":"L22", "x":3.5, "y":2}, - {"label":"L21", "x":4.5, "y":2.125}, - {"label":"L20", "x":5.5, "y":2.25}, - {"label":"R90", "x":12.5, "y":2.25}, - {"label":"R91", "x":13.5, "y":2.125}, - {"label":"R92", "x":14.5, "y":2}, - {"label":"R93", "x":15.5, "y":2.125}, - {"label":"R94", "x":16.5, "y":2.375}, - {"label":"R95", "x":17.5, "y":2.375, "w":1.5}, + {"matrix": [1, 5], "x": 0, "y": 1.375, "w": 1.5}, + {"matrix": [1, 4], "x": 1.5, "y": 1.375}, + {"matrix": [1, 3], "x": 2.5, "y": 1.125}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 1], "x": 4.5, "y": 1.125}, + {"matrix": [1, 0], "x": 5.5, "y": 1.25}, - {"label":"L35", "x":0, "y":3.375, "w":1.5}, - {"label":"L34", "x":1.5, "y":3.375}, - {"label":"L33", "x":2.5, "y":3.125}, - {"label":"L32", "x":3.5, "y":3}, - {"label":"L31", "x":4.5, "y":3.125}, - {"label":"L30", "x":5.5, "y":3.25}, - {"label":"RA0", "x":12.5, "y":3.25}, - {"label":"RA1", "x":13.5, "y":3.125}, - {"label":"RA2", "x":14.5, "y":3}, - {"label":"RA3", "x":15.5, "y":3.125}, - {"label":"RA4", "x":16.5, "y":3.375}, - {"label":"RA5", "x":17.5, "y":3.375, "w":1.5}, + {"matrix": [8, 0], "x": 12.5, "y": 1.25}, + {"matrix": [8, 1], "x": 13.5, "y": 1.125}, + {"matrix": [8, 2], "x": 14.5, "y": 1}, + {"matrix": [8, 3], "x": 15.5, "y": 1.125}, + {"matrix": [8, 4], "x": 16.5, "y": 1.375}, + {"matrix": [8, 5], "x": 17.5, "y": 1.375, "w": 1.5}, - {"label":"L45", "x":0.5, "y":4.375}, - {"label":"L44", "x":1.5, "y":4.375}, - {"label":"L43", "x":2.5, "y":4.125}, - {"label":"L42", "x":3.5, "y":4}, - {"label":"L41", "x":4.5, "y":4.125}, - {"label":"RB1", "x":13.5, "y":4.125}, - {"label":"RB2", "x":14.5, "y":4}, - {"label":"RB3", "x":15.5, "y":4.125}, - {"label":"RB4", "x":16.5, "y":4.375}, - {"label":"RB5", "x":17.5, "y":4.375}, + {"matrix": [2, 5], "x": 0, "y": 2.375, "w": 1.5}, + {"matrix": [2, 4], "x": 1.5, "y": 2.375}, + {"matrix": [2, 3], "x": 2.5, "y": 2.125}, + {"matrix": [2, 2], "x": 3.5, "y": 2}, + {"matrix": [2, 1], "x": 4.5, "y": 2.125}, + {"matrix": [2, 0], "x": 5.5, "y": 2.25}, - {"label":"L51", "x":7, "y":4.875}, - {"label":"L40", "x":8, "y":4.875}, - {"label":"RB0", "x":10, "y":4.875}, - {"label":"RC1", "x":11, "y":4.875}, + {"matrix": [9, 0], "x": 12.5, "y": 2.25}, + {"matrix": [9, 1], "x": 13.5, "y": 2.125}, + {"matrix": [9, 2], "x": 14.5, "y": 2}, + {"matrix": [9, 3], "x": 15.5, "y": 2.125}, + {"matrix": [9, 4], "x": 16.5, "y": 2.375}, + {"matrix": [9, 5], "x": 17.5, "y": 2.375, "w": 1.5}, - {"label":"L50", "x":8, "y":5.875}, - {"label":"RC0", "x":10, "y":5.875}, + {"matrix": [3, 5], "x": 0, "y": 3.375, "w": 1.5}, + {"matrix": [3, 4], "x": 1.5, "y": 3.375}, + {"matrix": [3, 3], "x": 2.5, "y": 3.125}, + {"matrix": [3, 2], "x": 3.5, "y": 3}, + {"matrix": [3, 1], "x": 4.5, "y": 3.125}, + {"matrix": [3, 0], "x": 5.5, "y": 3.25}, - {"label":"L52", "x":6, "y":5.875, "h":2}, - {"label":"L61", "x":7, "y":5.875, "h":2}, - {"label":"L60", "x":8, "y":6.875}, - {"label":"RD0", "x":10, "y":6.875}, - {"label":"RD1", "x":11, "y":5.875, "h":2}, - {"label":"RC2", "x":12, "y":5.875, "h":2} + {"matrix": [10, 0], "x": 12.5, "y": 3.25}, + {"matrix": [10, 1], "x": 13.5, "y": 3.125}, + {"matrix": [10, 2], "x": 14.5, "y": 3}, + {"matrix": [10, 3], "x": 15.5, "y": 3.125}, + {"matrix": [10, 4], "x": 16.5, "y": 3.375}, + {"matrix": [10, 5], "x": 17.5, "y": 3.375, "w": 1.5}, + + {"matrix": [4, 5], "x": 0.5, "y": 4.375}, + {"matrix": [4, 4], "x": 1.5, "y": 4.375}, + {"matrix": [4, 3], "x": 2.5, "y": 4.125}, + {"matrix": [4, 2], "x": 3.5, "y": 4}, + {"matrix": [4, 1], "x": 4.5, "y": 4.125}, + + {"matrix": [11, 1], "x": 13.5, "y": 4.125}, + {"matrix": [11, 2], "x": 14.5, "y": 4}, + {"matrix": [11, 3], "x": 15.5, "y": 4.125}, + {"matrix": [11, 4], "x": 16.5, "y": 4.375}, + {"matrix": [11, 5], "x": 17.5, "y": 4.375}, + + {"matrix": [5, 1], "x": 7, "y": 4.875}, + {"matrix": [4, 0], "x": 8, "y": 4.875}, + + {"matrix": [11, 0], "x": 10, "y": 4.875}, + {"matrix": [12, 1], "x": 11, "y": 4.875}, + + {"matrix": [5, 0], "x": 8, "y": 5.875}, + + {"matrix": [12, 0], "x": 10, "y": 5.875}, + + {"matrix": [5, 2], "x": 6, "y": 5.875, "h": 2}, + {"matrix": [6, 1], "x": 7, "y": 5.875, "h": 2}, + {"matrix": [6, 0], "x": 8, "y": 6.875}, + + {"matrix": [13, 0], "x": 10, "y": 6.875}, + {"matrix": [13, 1], "x": 11, "y": 5.875, "h": 2}, + {"matrix": [12, 2], "x": 12, "y": 5.875, "h": 2} ] } } diff --git a/keyboards/momoka_ergo/momoka_ergo.h b/keyboards/momoka_ergo/momoka_ergo.h deleted file mode 100644 index 1bbc1b242ac2..000000000000 --- a/keyboards/momoka_ergo/momoka_ergo.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Copyright 2021 StefanGrindelwald - * - * 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 XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L05, L04, L03, L02, L01, L00, R70, R71, R72, R73, R74, R75, \ - L15, L14, L13, L12, L11, L10, R80, R81, R82, R83, R84, R85, \ - L25, L24, L23, L22, L21, L20, R90, R91, R92, R93, R94, R95, \ - L35, L34, L33, L32, L31, L30, RA0, RA1, RA2, RA3, RA4, RA5, \ - L45, L44, L43, L42, L41, RB1, RB2, RB3, RB4, RB5, \ - L51, L40, RB0, RC1, \ - L50, RC0, \ - L52, L61, L60, RD0, RD1, RC2 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { L50, L51, L52, XXX, XXX, XXX }, \ - { L60, L61, XXX, XXX, XXX, XXX }, \ - { R70, R71, R72, R73, R74, R75 }, \ - { R80, R81, R82, R83, R84, R85 }, \ - { R90, R91, R92, R93, R94, R95 }, \ - { RA0, RA1, RA2, RA3, RA4, RA5 }, \ - { RB0, RB1, RB2, RB3, RB4, RB5 }, \ - { RC0, RC1, RC2, XXX, XXX, XXX }, \ - { RD0, RD1, XXX, XXX, XXX, XXX } \ - } diff --git a/keyboards/morizon/info.json b/keyboards/morizon/info.json index 4d4e0aa69b26..12cd59a31f78 100644 --- a/keyboards/morizon/info.json +++ b/keyboards/morizon/info.json @@ -18,72 +18,76 @@ "layouts": { "LAYOUT": { "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": 8, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 11, "y": 0 }, - { "x": 12, "y": 0 }, - { "x": 13, "y": 0 }, - { "x": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 13, "y": 1 }, - { "x": 0, "y": 2 }, - { "x": 1, "y": 2 }, - { "x": 2, "y": 2 }, - { "x": 3, "y": 2 }, - { "x": 4, "y": 2 }, - { "x": 5, "y": 2 }, - { "x": 6, "y": 2 }, - { "x": 7, "y": 2 }, - { "x": 8, "y": 2 }, - { "x": 9, "y": 2 }, - { "x": 10, "y": 2 }, - { "x": 11, "y": 2 }, - { "x": 12, "y": 2 }, - { "x": 13, "y": 2 }, - { "x": 0, "y": 3 }, - { "x": 1, "y": 3 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 13, "y": 3 }, - { "x": 0, "y": 4 }, - { "x": 1, "y": 4 }, - { "x": 2, "y": 4 }, - { "x": 3, "y": 4 }, - { "x": 4, "y": 4 }, - { "x": 5, "y": 4 }, - { "x": 6, "y": 4 }, - { "x": 7, "y": 4 }, - { "x": 8, "y": 4 }, - { "x": 9, "y": 4 }, - { "x": 10, "y": 4 }, - { "x": 11, "y": 4 }, - { "x": 12, "y": 4 }, - { "x": 13, "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": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [6, 1], "x": 8, "y": 1}, + {"matrix": [6, 2], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 5], "x": 12, "y": 1}, + {"matrix": [6, 6], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [7, 0], "x": 7, "y": 2}, + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [7, 6], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [8, 0], "x": 7, "y": 3}, + {"matrix": [8, 1], "x": 8, "y": 3}, + {"matrix": [8, 2], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 5], "x": 12, "y": 3}, + {"matrix": [8, 6], "x": 13, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [9, 0], "x": 7, "y": 4}, + {"matrix": [9, 1], "x": 8, "y": 4}, + {"matrix": [9, 2], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 4], "x": 11, "y": 4}, + {"matrix": [9, 5], "x": 12, "y": 4}, + {"matrix": [9, 6], "x": 13, "y": 4} ] } } diff --git a/keyboards/morizon/morizon.h b/keyboards/morizon/morizon.h deleted file mode 100644 index a6c84ee502a6..000000000000 --- a/keyboards/morizon/morizon.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2022 Steven Karrmann - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - 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, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k00 , k01, k02, k03, k04, k05, KC_NO }, \ - { k10 , k11, k12, k13, k14, k15, KC_NO }, \ - { k20 , k21, k22, k23, k24, k25, k26 }, \ - { k30 , k31, k32, k33, k34, k35, k36 }, \ - { k40 , k41, k42, k43, k44, k45, k46 }, \ - { KC_NO, k06, k07, k08, k09, k0a, k0b }, \ - { KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k27 , k28, k29, k2a, k2b, k2c, k2d }, \ - { k37 , k38, k39, k3a, k3b, k3c, k3d }, \ - { k47 , k48, k49, k4a, k4b, k4c, k4d } \ -} diff --git a/keyboards/mschwingen/modelm/info.json b/keyboards/mschwingen/modelm/info.json index 4df6816eb18f..5118f4ed3785 100644 --- a/keyboards/mschwingen/modelm/info.json +++ b/keyboards/mschwingen/modelm/info.json @@ -16,115 +16,129 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":13, "y":0}, - {"x":14, "y":0}, - {"x":15.5, "y":0}, - {"x":16.5, "y":0}, - {"x":17.5, "y":0}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2, "w":2}, - {"x":15.5, "y":2}, - {"x":16.5, "y":2}, - {"x":17.5, "y":2}, - {"x":19, "y":2}, - {"x":20, "y":2}, - {"x":21, "y":2}, - {"x":22, "y":2}, - - {"x":0, "y":3, "w":1.5}, - {"x":1.5, "y":3}, - {"x":2.5, "y":3}, - {"x":3.5, "y":3}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.5, "y":3}, - {"x":7.5, "y":3}, - {"x":8.5, "y":3}, - {"x":9.5, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3, "w":1.5}, - {"x":15.5, "y":3}, - {"x":16.5, "y":3}, - {"x":17.5, "y":3}, - {"x":19, "y":3}, - {"x":20, "y":3}, - {"x":21, "y":3}, - {"x":22, "y":3, "h":2}, - - {"x":0, "y":4, "w":1.75}, - {"x":1.75, "y":4}, - {"x":2.75, "y":4}, - {"x":3.75, "y":4}, - {"x":4.75, "y":4}, - {"x":5.75, "y":4}, - {"x":6.75, "y":4}, - {"x":7.75, "y":4}, - {"x":8.75, "y":4}, - {"x":9.75, "y":4}, - {"x":10.75, "y":4}, - {"x":11.75, "y":4}, - {"x":12.75, "y":4}, - {"x":13.75, "y":4, "w":1.25}, - {"x":19, "y":4}, - {"x":20, "y":4}, - {"x":21, "y":4}, - - {"x":0, "y":5, "w":1.25}, - {"x":1.25, "y":5}, - {"x":2.25, "y":5}, - {"x":3.25, "y":5}, - {"x":4.25, "y":5}, - {"x":5.25, "y":5}, - {"x":6.25, "y":5}, - {"x":7.25, "y":5}, - {"x":8.25, "y":5}, - {"x":9.25, "y":5}, - {"x":10.25, "y":5}, - {"x":11.25, "y":5}, - {"x":12.25, "y":5, "w":2.75}, - {"x":16.5, "y":5}, - {"x":19, "y":5}, - {"x":20, "y":5}, - {"x":21, "y":5}, - {"x":22, "y":5, "h":2}, - - {"x":0, "y":6, "w":1.5}, - {"x":2.5, "y":6, "w":1.5}, - {"x":4, "y":6, "w":7}, - {"x":11, "y":6, "w":1.5}, - {"x":13.5, "y":6, "w":1.5}, - {"x":15.5, "y":6}, - {"x":16.5, "y":6}, - {"x":17.5, "y":6}, - {"x":19, "y":6, "w":2}, - {"x":21, "y":6} + {"matrix": [13, 7], "x": 0, "y": 0}, + + {"matrix": [12, 5], "x": 2, "y": 0}, + {"matrix": [11, 5], "x": 3, "y": 0}, + {"matrix": [11, 6], "x": 4, "y": 0}, + {"matrix": [11, 7], "x": 5, "y": 0}, + + {"matrix": [9, 7], "x": 6.5, "y": 0}, + {"matrix": [7, 7], "x": 7.5, "y": 0}, + {"matrix": [6, 6], "x": 8.5, "y": 0}, + {"matrix": [6, 5], "x": 9.5, "y": 0}, + + {"matrix": [9, 5], "x": 11, "y": 0}, + {"matrix": [9, 4], "x": 12, "y": 0}, + {"matrix": [4, 4], "x": 13, "y": 0}, + {"matrix": [3, 4], "x": 14, "y": 0}, + + {"matrix": [0, 4], "x": 15.5, "y": 0}, + {"matrix": [0, 3], "x": 16.5, "y": 0}, + {"matrix": [1, 1], "x": 17.5, "y": 0}, + + {"matrix": [13, 5], "x": 0, "y": 2}, + {"matrix": [13, 4], "x": 1, "y": 2}, + {"matrix": [12, 4], "x": 2, "y": 2}, + {"matrix": [11, 4], "x": 3, "y": 2}, + {"matrix": [10, 4], "x": 4, "y": 2}, + {"matrix": [10, 5], "x": 5, "y": 2}, + {"matrix": [8, 5], "x": 6, "y": 2}, + {"matrix": [8, 4], "x": 7, "y": 2}, + {"matrix": [7, 4], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [9, 6], "x": 13, "y": 2, "w": 2}, + + {"matrix": [3, 5], "x": 15.5, "y": 2}, + {"matrix": [1, 5], "x": 16.5, "y": 2}, + {"matrix": [2, 5], "x": 17.5, "y": 2}, + + {"matrix": [4, 1], "x": 19, "y": 2}, + {"matrix": [3, 1], "x": 20, "y": 2}, + {"matrix": [2, 1], "x": 21, "y": 2}, + {"matrix": [2, 0], "x": 22, "y": 2}, + + {"matrix": [13, 6], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [13, 3], "x": 1.5, "y": 3}, + {"matrix": [12, 3], "x": 2.5, "y": 3}, + {"matrix": [11, 3], "x": 3.5, "y": 3}, + {"matrix": [10, 3], "x": 4.5, "y": 3}, + {"matrix": [10, 6], "x": 5.5, "y": 3}, + {"matrix": [8, 6], "x": 6.5, "y": 3}, + {"matrix": [8, 3], "x": 7.5, "y": 3}, + {"matrix": [7, 3], "x": 8.5, "y": 3}, + {"matrix": [6, 3], "x": 9.5, "y": 3}, + {"matrix": [5, 3], "x": 10.5, "y": 3}, + {"matrix": [5, 6], "x": 11.5, "y": 3}, + {"matrix": [7, 6], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 5], "x": 15.5, "y": 3}, + {"matrix": [1, 4], "x": 16.5, "y": 3}, + {"matrix": [2, 4], "x": 17.5, "y": 3}, + + {"matrix": [4, 3], "x": 19, "y": 3}, + {"matrix": [3, 3], "x": 20, "y": 3}, + {"matrix": [2, 3], "x": 21, "y": 3}, + {"matrix": [1, 3], "x": 22, "y": 3, "h": 2}, + + {"matrix": [12, 6], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [13, 2], "x": 1.75, "y": 4}, + {"matrix": [12, 2], "x": 2.75, "y": 4}, + {"matrix": [11, 2], "x": 3.75, "y": 4}, + {"matrix": [10, 2], "x": 4.75, "y": 4}, + {"matrix": [10, 7], "x": 5.75, "y": 4}, + {"matrix": [8, 7], "x": 6.75, "y": 4}, + {"matrix": [8, 2], "x": 7.75, "y": 4}, + {"matrix": [7, 2], "x": 8.75, "y": 4}, + {"matrix": [6, 2], "x": 9.75, "y": 4}, + {"matrix": [5, 2], "x": 10.75, "y": 4}, + {"matrix": [5, 7], "x": 11.75, "y": 4}, + {"matrix": [5, 1], "x": 12.75, "y": 4}, + {"matrix": [9, 1], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 6], "x": 19, "y": 4}, + {"matrix": [3, 6], "x": 20, "y": 4}, + {"matrix": [2, 6], "x": 21, "y": 4}, + + {"matrix": [14, 6], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [12, 7], "x": 1.25, "y": 5}, + {"matrix": [13, 1], "x": 2.25, "y": 5}, + {"matrix": [12, 1], "x": 3.25, "y": 5}, + {"matrix": [11, 1], "x": 4.25, "y": 5}, + {"matrix": [10, 1], "x": 5.25, "y": 5}, + {"matrix": [10, 0], "x": 6.25, "y": 5}, + {"matrix": [8, 0], "x": 7.25, "y": 5}, + {"matrix": [8, 1], "x": 8.25, "y": 5}, + {"matrix": [7, 1], "x": 9.25, "y": 5}, + {"matrix": [6, 1], "x": 10.25, "y": 5}, + {"matrix": [5, 0], "x": 11.25, "y": 5}, + {"matrix": [14, 1], "x": 12.25, "y": 5, "w": 2.75}, + + {"matrix": [1, 7], "x": 16.5, "y": 5}, + + {"matrix": [4, 2], "x": 19, "y": 5}, + {"matrix": [3, 2], "x": 20, "y": 5}, + {"matrix": [2, 2], "x": 21, "y": 5}, + {"matrix": [1, 2], "x": 22, "y": 5, "h": 2}, + + {"matrix": [15, 5], "x": 0, "y": 6, "w": 1.5}, + {"matrix": [0, 7], "x": 2.5, "y": 6, "w": 1.5}, + {"matrix": [9, 0], "x": 4, "y": 6, "w": 7}, + {"matrix": [0, 0], "x": 11, "y": 6, "w": 1.5}, + {"matrix": [15, 1], "x": 13.5, "y": 6, "w": 1.5}, + + {"matrix": [1, 0], "x": 15.5, "y": 6}, + {"matrix": [4, 0], "x": 16.5, "y": 6}, + {"matrix": [3, 0], "x": 17.5, "y": 6}, + + {"matrix": [3, 7], "x": 19, "y": 6, "w": 2}, + {"matrix": [2, 7], "x": 21, "y": 6} ] } } + } diff --git a/keyboards/mschwingen/modelm/modelm.h b/keyboards/mschwingen/modelm/modelm.h index 04b6b6112570..d842793ccdbd 100644 --- a/keyboards/mschwingen/modelm/modelm.h +++ b/keyboards/mschwingen/modelm/modelm.h @@ -20,39 +20,3 @@ extern void update_layer_leds(void); #include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * The first section contains "names" for physical keys of the keyboard - * and defines their position on the board. - * The second section defines position of the keys on the switch matrix - * (where COLUMNS and ROWS crosses). */ - -/* universla layout for both 101 and 102-key versions */ -#define LAYOUT( \ - K5A, K5B, K5C, K5D, K5E, K5F, K5G, K5H, K5I, K5J, K5K, K5L, K5M, K5N, K5O, K5P, \ - \ - K4A, K4B, K4C, K4D, K4E, K4F, K4G, K4H, K4I, K4J, K4K, K4L, K4M, K4N, K4O, K4P, K4Q, K4R, K4S, K4T, K4U, \ - K3A, K3B, K3C, K3D, K3E, K3F, K3G, K3H, K3I, K3J, K3K, K3L, K3M, K3N, K3O, K3P, K3Q, K3R, K3S, K3T, K3U, \ - K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, K2J, K2K, K2L, K2M, K2N, K2O, K2P, K2Q, \ - K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, K1I, K1J, K1K, K1L, K1M, K1N, K1O, K1P, K1Q, K1R, \ - K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H, K0I, K0J \ -) \ - {/* COL0 ............ COL7 */ \ - { K0D , KC_NO, KC_NO, K5O , K5N , KC_NO, KC_NO, K0B }, /* ROW0 */ \ - { K0F , K5P , K1R , K3U , K3P , K4P , KC_NO, K1N }, \ - { K4U , K4T , K1Q , K3T , K3Q , K4Q , K2Q , K0J }, \ - { K0H , K4S , K1P , K3S , K5M , K4O , K2P , K0I }, \ - { K0G , K4R , K1O , K3R , K5L , K3O , K2O , KC_NO }, \ - { K1L , K2M , K2K , K3K , K4K , K4L , K3L , K2L }, \ - { KC_NO, K1K , K2J , K3J , K4J , K5I , K5H , KC_NO }, \ - { KC_NO, K1J , K2I , K3I , K4I , K4M , K3M , K5G }, \ - { K1H , K1I , K2H , K3H , K4H , K4G , K3G , K2G }, \ - { K0C , K2N , K3N , KC_NO, K5K , K5J , K4N , K5F }, \ - { K1G , K1F , K2E , K3E , K4E , K4F , K3F , K2F }, \ - { KC_NO, K1E , K2D , K3D , K4D , K5C , K5D , K5E }, \ - { KC_NO, K1D , K2C , K3C , K4C , K5B , K2A , K1B }, \ - { KC_NO, K1C , K2B , K3B , K4B , K4A , K3A , K5A }, \ - { KC_NO, K1M , KC_NO, KC_NO, KC_NO, KC_NO, K1A , KC_NO }, \ - { KC_NO, K0E , KC_NO, KC_NO, KC_NO, K0A , KC_NO, KC_NO }, /* ROW15 */ \ -} - diff --git a/keyboards/mt/mt980/info.json b/keyboards/mt/mt980/info.json index 2e291fc69bcd..8c58c84c67be 100644 --- a/keyboards/mt/mt980/info.json +++ b/keyboards/mt/mt980/info.json @@ -33,109 +33,125 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K50", "x":0, "y":0}, - {"label":"K52", "x":1.25, "y":0}, - {"label":"K53", "x":2.25, "y":0}, - {"label":"K54", "x":3.25, "y":0}, - {"label":"K55", "x":4.25, "y":0}, - {"label":"K57", "x":5.5, "y":0}, - {"label":"K58", "x":6.5, "y":0}, - {"label":"KB8", "x":7.5, "y":0}, - {"label":"KB7", "x":8.5, "y":0}, - {"label":"KB5", "x":9.75, "y":0}, - {"label":"KB4", "x":10.75, "y":0}, - {"label":"KB3", "x":11.75, "y":0}, - {"label":"KB6", "x":12.75, "y":0}, - {"label":"K51", "x":14, "y":0}, - {"label":"KB2", "x":15.5, "y":0}, - {"label":"KB1", "x":16.5, "y":0}, - {"label":"KB0", "x":17.5, "y":0}, - {"label":"K63", "x":18.5, "y":0}, - {"label":"K40", "x":0, "y":1.5}, - {"label":"K41", "x":1, "y":1.5}, - {"label":"K42", "x":2, "y":1.5}, - {"label":"K43", "x":3, "y":1.5}, - {"label":"K44", "x":4, "y":1.5}, - {"label":"K45", "x":5, "y":1.5}, - {"label":"K46", "x":6, "y":1.5}, - {"label":"K47", "x":7, "y":1.5}, - {"label":"K48", "x":8, "y":1.5}, - {"label":"KA8", "x":9, "y":1.5}, - {"label":"KA7", "x":10, "y":1.5}, - {"label":"KA5", "x":11, "y":1.5}, - {"label":"KA4", "x":12, "y":1.5}, - {"label":"KA3", "x":13, "y":1.5}, - {"label":"KA6", "x":14, "y":1.5}, - {"label":"KA2", "x":15.5, "y":1.5}, - {"label":"KA1", "x":16.5, "y":1.5}, - {"label":"KA0", "x":17.5, "y":1.5}, - {"label":"K64", "x":18.5, "y":1.5}, - {"label":"K30", "x":0, "y":2.5, "w":1.5}, - {"label":"K31", "x":1.5, "y":2.5}, - {"label":"K32", "x":2.5, "y":2.5}, - {"label":"K33", "x":3.5, "y":2.5}, - {"label":"K34", "x":4.5, "y":2.5}, - {"label":"K35", "x":5.5, "y":2.5}, - {"label":"K36", "x":6.5, "y":2.5}, - {"label":"K37", "x":7.5, "y":2.5}, - {"label":"K38", "x":8.5, "y":2.5}, - {"label":"K98", "x":9.5, "y":2.5}, - {"label":"K97", "x":10.5, "y":2.5}, - {"label":"K95", "x":11.5, "y":2.5}, - {"label":"K94", "x":12.5, "y":2.5}, - {"label":"K84", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K96", "x":15.5, "y":2.5}, - {"label":"K92", "x":16.5, "y":2.5}, - {"label":"K91", "x":17.5, "y":2.5}, - {"label":"K90", "x":18.5, "y":2.5}, - {"label":"K20", "x":0, "y":3.5, "w":1.75}, - {"label":"K21", "x":1.75, "y":3.5}, - {"label":"K22", "x":2.75, "y":3.5}, - {"label":"K23", "x":3.75, "y":3.5}, - {"label":"K24", "x":4.75, "y":3.5}, - {"label":"K25", "x":5.75, "y":3.5}, - {"label":"K26", "x":6.75, "y":3.5}, - {"label":"K27", "x":7.75, "y":3.5}, - {"label":"K28", "x":8.75, "y":3.5}, - {"label":"K88", "x":9.75, "y":3.5}, - {"label":"K87", "x":10.75, "y":3.5}, - {"label":"K85", "x":11.75, "y":3.5}, - {"label":"K93", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K86", "x":15.5, "y":3.5}, - {"label":"K82", "x":16.5, "y":3.5}, - {"label":"K81", "x":17.5, "y":3.5}, - {"label":"K80", "x":18.5, "y":3.5}, - {"label":"K10", "x":0, "y":4.5, "w":1.25}, - {"label":"K11", "x":1.25, "y":4.5}, - {"label":"K12", "x":2.25, "y":4.5}, - {"label":"K13", "x":3.25, "y":4.5}, - {"label":"K14", "x":4.25, "y":4.5}, - {"label":"K15", "x":5.25, "y":4.5}, - {"label":"K16", "x":6.25, "y":4.5}, - {"label":"K17", "x":7.25, "y":4.5}, - {"label":"K18", "x":8.25, "y":4.5}, - {"label":"K78", "x":9.25, "y":4.5}, - {"label":"K77", "x":10.25, "y":4.5}, - {"label":"K75", "x":11.25, "y":4.5}, - {"label":"K74", "x":12.25, "y":4.5, "w":1.75}, - {"label":"K73", "x":14.25, "y":4.75}, - {"label":"K76", "x":15.5, "y":4.5}, - {"label":"K72", "x":16.5, "y":4.5}, - {"label":"K71", "x":17.5, "y":4.5}, - {"label":"K70", "x":18.5, "y":4.5}, - {"label":"K00", "x":0, "y":5.5, "w":1.25}, - {"label":"K01", "x":1.25, "y":5.5}, - {"label":"K02", "x":2.25, "y":5.5, "w":1.25}, - {"label":"K06", "x":3.5, "y":5.5, "w":6.25}, - {"label":"K08", "x":9.75, "y":5.5}, - {"label":"K07", "x":10.75, "y":5.5}, - {"label":"K05", "x":11.75, "y":5.5, "w":1.25}, - {"label":"K04", "x":13.25, "y":5.75}, - {"label":"K03", "x":14.25, "y":5.75}, - {"label":"K66", "x":15.25, "y":5.75}, - {"label":"K62", "x":16.5, "y":5.5}, - {"label":"K61", "x":17.5, "y":5.5}, - {"label":"K60", "x":18.5, "y":5.5} + {"matrix": [5, 0], "x": 0, "y": 0}, + + {"matrix": [5, 2], "x": 1.25, "y": 0}, + {"matrix": [5, 3], "x": 2.25, "y": 0}, + {"matrix": [5, 4], "x": 3.25, "y": 0}, + {"matrix": [5, 5], "x": 4.25, "y": 0}, + + {"matrix": [5, 7], "x": 5.5, "y": 0}, + {"matrix": [5, 8], "x": 6.5, "y": 0}, + {"matrix": [11, 8], "x": 7.5, "y": 0}, + {"matrix": [11, 7], "x": 8.5, "y": 0}, + + {"matrix": [11, 5], "x": 9.75, "y": 0}, + {"matrix": [11, 4], "x": 10.75, "y": 0}, + {"matrix": [11, 3], "x": 11.75, "y": 0}, + {"matrix": [11, 6], "x": 12.75, "y": 0}, + + {"matrix": [5, 1], "x": 14, "y": 0}, + + {"matrix": [11, 2], "x": 15.5, "y": 0}, + {"matrix": [11, 1], "x": 16.5, "y": 0}, + {"matrix": [11, 0], "x": 17.5, "y": 0}, + {"matrix": [6, 3], "x": 18.5, "y": 0}, + + {"matrix": [4, 0], "x": 0, "y": 1.5}, + {"matrix": [4, 1], "x": 1, "y": 1.5}, + {"matrix": [4, 2], "x": 2, "y": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 1.5}, + {"matrix": [4, 5], "x": 5, "y": 1.5}, + {"matrix": [4, 6], "x": 6, "y": 1.5}, + {"matrix": [4, 7], "x": 7, "y": 1.5}, + {"matrix": [4, 8], "x": 8, "y": 1.5}, + {"matrix": [10, 8], "x": 9, "y": 1.5}, + {"matrix": [10, 7], "x": 10, "y": 1.5}, + {"matrix": [10, 5], "x": 11, "y": 1.5}, + {"matrix": [10, 4], "x": 12, "y": 1.5}, + {"matrix": [10, 3], "x": 13, "y": 1.5}, + {"matrix": [10, 6], "x": 14, "y": 1.5}, + + {"matrix": [10, 2], "x": 15.5, "y": 1.5}, + {"matrix": [10, 1], "x": 16.5, "y": 1.5}, + {"matrix": [10, 0], "x": 17.5, "y": 1.5}, + {"matrix": [6, 4], "x": 18.5, "y": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 2.5}, + {"matrix": [3, 2], "x": 2.5, "y": 2.5}, + {"matrix": [3, 3], "x": 3.5, "y": 2.5}, + {"matrix": [3, 4], "x": 4.5, "y": 2.5}, + {"matrix": [3, 5], "x": 5.5, "y": 2.5}, + {"matrix": [3, 6], "x": 6.5, "y": 2.5}, + {"matrix": [3, 7], "x": 7.5, "y": 2.5}, + {"matrix": [3, 8], "x": 8.5, "y": 2.5}, + {"matrix": [9, 8], "x": 9.5, "y": 2.5}, + {"matrix": [9, 7], "x": 10.5, "y": 2.5}, + {"matrix": [9, 5], "x": 11.5, "y": 2.5}, + {"matrix": [9, 4], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [9, 6], "x": 15.5, "y": 2.5}, + {"matrix": [9, 2], "x": 16.5, "y": 2.5}, + {"matrix": [9, 1], "x": 17.5, "y": 2.5}, + {"matrix": [9, 0], "x": 18.5, "y": 2.5}, + + {"matrix": [2, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 3.5}, + {"matrix": [2, 2], "x": 2.75, "y": 3.5}, + {"matrix": [2, 3], "x": 3.75, "y": 3.5}, + {"matrix": [2, 4], "x": 4.75, "y": 3.5}, + {"matrix": [2, 5], "x": 5.75, "y": 3.5}, + {"matrix": [2, 6], "x": 6.75, "y": 3.5}, + {"matrix": [2, 7], "x": 7.75, "y": 3.5}, + {"matrix": [2, 8], "x": 8.75, "y": 3.5}, + {"matrix": [8, 8], "x": 9.75, "y": 3.5}, + {"matrix": [8, 7], "x": 10.75, "y": 3.5}, + {"matrix": [8, 5], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [8, 6], "x": 15.5, "y": 3.5}, + {"matrix": [8, 2], "x": 16.5, "y": 3.5}, + {"matrix": [8, 1], "x": 17.5, "y": 3.5}, + {"matrix": [8, 0], "x": 18.5, "y": 3.5}, + + {"matrix": [1, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 4.5}, + {"matrix": [1, 2], "x": 2.25, "y": 4.5}, + {"matrix": [1, 3], "x": 3.25, "y": 4.5}, + {"matrix": [1, 4], "x": 4.25, "y": 4.5}, + {"matrix": [1, 5], "x": 5.25, "y": 4.5}, + {"matrix": [1, 6], "x": 6.25, "y": 4.5}, + {"matrix": [1, 7], "x": 7.25, "y": 4.5}, + {"matrix": [1, 8], "x": 8.25, "y": 4.5}, + {"matrix": [7, 8], "x": 9.25, "y": 4.5}, + {"matrix": [7, 7], "x": 10.25, "y": 4.5}, + {"matrix": [7, 5], "x": 11.25, "y": 4.5}, + {"matrix": [7, 4], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [7, 3], "x": 14.25, "y": 4.75}, + + {"matrix": [7, 6], "x": 15.5, "y": 4.5}, + {"matrix": [7, 2], "x": 16.5, "y": 4.5}, + {"matrix": [7, 1], "x": 17.5, "y": 4.5}, + {"matrix": [7, 0], "x": 18.5, "y": 4.5}, + + {"matrix": [0, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 5.5}, + {"matrix": [0, 2], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [0, 6], "x": 3.5, "y": 5.5, "w": 6.25}, + {"matrix": [0, 8], "x": 9.75, "y": 5.5}, + {"matrix": [0, 7], "x": 10.75, "y": 5.5}, + {"matrix": [0, 5], "x": 11.75, "y": 5.5, "w": 1.25}, + + {"matrix": [0, 4], "x": 13.25, "y": 5.75}, + {"matrix": [0, 3], "x": 14.25, "y": 5.75}, + {"matrix": [6, 6], "x": 15.25, "y": 5.75}, + + {"matrix": [6, 2], "x": 16.5, "y": 5.5}, + {"matrix": [6, 1], "x": 17.5, "y": 5.5}, + {"matrix": [6, 0], "x": 18.5, "y": 5.5} ] } } diff --git a/keyboards/mt/mt980/mt980.h b/keyboards/mt/mt980/mt980.h deleted file mode 100644 index d9804b33926e..000000000000 --- a/keyboards/mt/mt980/mt980.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K050, K052, K053, K054, K055, K057, K058, K118, K117, K115, K114, K113, K116, K051, K112, K111, K110, K063, \ - K040, K041, K042, K043, K044, K045, K046, K047, K048, K108, K107, K105, K104, K103, K106, K102, K101, K100, K064, \ - K030, K031, K032, K033, K034, K035, K036, K037, K038, K098, K097, K095, K094, K084, K096, K092, K091, K090, \ - K020, K021, K022, K023, K024, K025, K026, K027, K028, K088, K087, K085, K093, K086, K082, K081, K080, \ - K010, K011, K012, K013, K014, K015, K016, K017, K018, K078, K077, K075, K074, K073, K076, K072, K071, K070, \ - K000, K001, K002, K006, K008, K007, K005, K004, K003, K066, K062, K061, K060 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008 }, \ - { K010, K011, K012, K013, K014, K015, K016, K017, K018 }, \ - { K020, K021, K022, K023, K024, K025, K026, K027, K028 }, \ - { K030, K031, K032, K033, K034, K035, K036, K037, K038 }, \ - { K040, K041, K042, K043, K044, K045, K046, K047, K048 }, \ - { K050, K051, K052, K053, K054, K055, KC_NO, K057, K058 }, \ - { K060, K061, K062, K063, K064, KC_NO, K066, KC_NO, KC_NO}, \ - { K070, K071, K072, K073, K074, K075, K076, K077, K078 }, \ - { K080, K081, K082, KC_NO, K084, K085, K086, K087, K088 }, \ - { K090, K091, K092, K093, K094, K095, K096, K097, K098 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108 }, \ - { K110, K111, K112, K113, K114, K115, K116, K117, K118 } \ -} diff --git a/keyboards/murcielago/info.json b/keyboards/murcielago/info.json index 1c9eaef3a192..78c991fdeeb9 100644 --- a/keyboards/murcielago/info.json +++ b/keyboards/murcielago/info.json @@ -38,67 +38,76 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [ - {"label":"0,0", "x":0, "y":0.425}, - {"label":"0,1", "x":1, "y":0.25}, - {"label":"0,2", "x":2, "y":0.125}, - {"label":"0,3", "x":3, "y":0}, - {"label":"0,4", "x":4, "y":0.125}, - {"label":"0,5", "x":5, "y":0.25}, - {"label":"6,0", "x":9, "y":0.25}, - {"label":"6,1", "x":10, "y":0.125}, - {"label":"6,2", "x":11, "y":0}, - {"label":"6,3", "x":12, "y":0.125}, - {"label":"6,4", "x":13, "y":0.25}, - {"label":"6,5", "x":14, "y":0.425}, - {"label":"1,0", "x":0, "y":1.425}, - {"label":"1,1", "x":1, "y":1.25}, - {"label":"1,2", "x":2, "y":1.125}, - {"label":"1,3", "x":3, "y":1}, - {"label":"1,4", "x":4, "y":1.125}, - {"label":"1,5", "x":5, "y":1.25}, - {"label":"7,0", "x":9, "y":1.25}, - {"label":"7,1", "x":10, "y":1.125}, - {"label":"7,2", "x":11, "y":1}, - {"label":"7,3", "x":12, "y":1.125}, - {"label":"7,4", "x":13, "y":1.25}, - {"label":"7,5", "x":14, "y":1.425}, - {"label":"2,0", "x":0, "y":2.425}, - {"label":"2,1", "x":1, "y":2.25}, - {"label":"2,2", "x":2, "y":2.125}, - {"label":"2,3", "x":3, "y":2}, - {"label":"2,4", "x":4, "y":2.125}, - {"label":"2,5", "x":5, "y":2.25}, - {"label":"8,0", "x":9, "y":2.25}, - {"label":"8,1", "x":10, "y":2.125}, - {"label":"8,2", "x":11, "y":2}, - {"label":"8,3", "x":12, "y":2.125}, - {"label":"8,4", "x":13, "y":2.25}, - {"label":"8,5", "x":14, "y":2.425}, - {"label":"3,0", "x":0, "y":3.425}, - {"label":"3,1", "x":1, "y":3.25}, - {"label":"3,2", "x":2, "y":3.125}, - {"label":"3,3", "x":3, "y":3}, - {"label":"3,4", "x":4, "y":3.125}, - {"label":"3,5", "x":5, "y":3.25}, - {"label":"5,5", "x":6, "y":3.25}, - {"label":"11,0", "x":8, "y":3.25}, - {"label":"9,0", "x":9, "y":3.25}, - {"label":"9,1", "x":10, "y":3.125}, - {"label":"9,2", "x":11, "y":3}, - {"label":"9,3", "x":12, "y":3.125}, - {"label":"9,4", "x":13, "y":3.25}, - {"label":"9,5", "x":14, "y":3.425}, - {"label":"4,1", "x":1.7, "y":4.25}, - {"label":"4,2", "x":2.7, "y":4.05}, - {"label":"4,3", "x":3.7, "y":4.15}, - {"label":"4,4", "x":4.7, "y":4.35}, - {"label":"4,5", "x":5.8, "y":4.25, "h":1.5}, - {"label":"10,0", "x":8.2, "y":4.25, "h":1.5}, - {"label":"10,1", "x":9.3, "y":4.35}, - {"label":"10,2", "x":10.3, "y":4.15}, - {"label":"10,3", "x":11.3, "y":4.05}, - {"label":"10,4", "x":12.3, "y":4.25} + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.425}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [6, 0], "x": 9, "y": 0.25}, + {"matrix": [6, 1], "x": 10, "y": 0.125}, + {"matrix": [6, 2], "x": 11, "y": 0}, + {"matrix": [6, 3], "x": 12, "y": 0.125}, + {"matrix": [6, 4], "x": 13, "y": 0.25}, + {"matrix": [6, 5], "x": 14, "y": 0.425}, + + {"matrix": [1, 0], "x": 0, "y": 1.425}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [7, 0], "x": 9, "y": 1.25}, + {"matrix": [7, 1], "x": 10, "y": 1.125}, + {"matrix": [7, 2], "x": 11, "y": 1}, + {"matrix": [7, 3], "x": 12, "y": 1.125}, + {"matrix": [7, 4], "x": 13, "y": 1.25}, + {"matrix": [7, 5], "x": 14, "y": 1.425}, + + {"matrix": [2, 0], "x": 0, "y": 2.425}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [8, 0], "x": 9, "y": 2.25}, + {"matrix": [8, 1], "x": 10, "y": 2.125}, + {"matrix": [8, 2], "x": 11, "y": 2}, + {"matrix": [8, 3], "x": 12, "y": 2.125}, + {"matrix": [8, 4], "x": 13, "y": 2.25}, + {"matrix": [8, 5], "x": 14, "y": 2.425}, + + {"matrix": [3, 0], "x": 0, "y": 3.425}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [5, 5], "x": 6, "y": 3.25}, + + {"matrix": [11, 0], "x": 8, "y": 3.25}, + {"matrix": [9, 0], "x": 9, "y": 3.25}, + {"matrix": [9, 1], "x": 10, "y": 3.125}, + {"matrix": [9, 2], "x": 11, "y": 3}, + {"matrix": [9, 3], "x": 12, "y": 3.125}, + {"matrix": [9, 4], "x": 13, "y": 3.25}, + {"matrix": [9, 5], "x": 14, "y": 3.425}, + + {"matrix": [4, 1], "x": 1.7, "y": 4.25}, + {"matrix": [4, 2], "x": 2.7, "y": 4.05}, + {"matrix": [4, 3], "x": 3.7, "y": 4.15}, + {"matrix": [4, 4], "x": 4.7, "y": 4.35}, + {"matrix": [4, 5], "x": 5.8, "y": 4.25, "h": 1.5}, + + {"matrix": [10, 0], "x": 8.2, "y": 4.25, "h": 1.5}, + {"matrix": [10, 1], "x": 9.3, "y": 4.35}, + {"matrix": [10, 2], "x": 10.3, "y": 4.15}, + {"matrix": [10, 3], "x": 11.3, "y": 4.05}, + {"matrix": [10, 4], "x": 12.3, "y": 4.25} ] } } diff --git a/keyboards/murcielago/murcielago.h b/keyboards/murcielago/murcielago.h deleted file mode 100644 index 458df972f7eb..000000000000 --- a/keyboards/murcielago/murcielago.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2020 elagil - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix.k - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05 },\ - { L10, L11, L12, L13, L14, L15 },\ - { L20, L21, L22, L23, L24, L25 },\ - { L30, L31, L32, L33, L34, L35 },\ - { KC_NO, L41, L42, L43, L44, L45 },\ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L36 },\ - { R01, R02, R03, R04, R05, R06 },\ - { R11, R12, R13, R14, R15, R16 },\ - { R21, R22, R23, R24, R25, R26 },\ - { R31, R32, R33, R34, R35, R36 },\ - { R41, R42, R43, R44, R45, KC_NO },\ - { R30, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/mwstudio/alicekk/alicekk.c b/keyboards/mwstudio/alicekk/alicekk.c deleted file mode 100644 index e8ab40b2b9f6..000000000000 --- a/keyboards/mwstudio/alicekk/alicekk.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2022 TW59420 - * - * 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 . - */ -#include "alicekk.h" diff --git a/keyboards/mwstudio/alicekk/alicekk.h b/keyboards/mwstudio/alicekk/alicekk.h deleted file mode 100644 index 8bd3cfee8760..000000000000 --- a/keyboards/mwstudio/alicekk/alicekk.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2022 TW59420 - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K401, K402, K404, K405, K408, K410, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { KC_NO, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { KC_NO, K401, K402, KC_NO, K404, K405, KC_NO, KC_NO, K408, KC_NO, K410, KC_NO, K412, K413, K414 } \ -} diff --git a/keyboards/mwstudio/alicekk/info.json b/keyboards/mwstudio/alicekk/info.json index b88dd97b3ae3..523444ffa68c 100644 --- a/keyboards/mwstudio/alicekk/info.json +++ b/keyboards/mwstudio/alicekk/info.json @@ -24,87 +24,86 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.5, "y": 0}, + {"matrix": [0, 0], "x": 0.5, "y": 0}, - {"x": 1.75, "y": 0}, - {"x": 2.75, "y": 0}, - {"x": 3.75, "y": 0}, - {"x": 4.75, "y": 0}, - {"x": 5.75, "y": 0}, - {"x": 6.75, "y": 0}, - {"x": 7.75, "y": 0}, + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, - {"x": 9.25, "y": 0}, - {"x": 10.25, "y": 0}, - {"x": 11.25, "y": 0}, - {"x": 12.25, "y": 0}, - {"x": 13.25, "y": 0}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0, "w": 2}, + {"matrix": [0, 8], "x": 9.25, "y": 0}, + {"matrix": [0, 9], "x": 10.25, "y": 0}, + {"matrix": [0, 10], "x": 11.25, "y": 0}, + {"matrix": [0, 11], "x": 12.25, "y": 0}, + {"matrix": [0, 12], "x": 13.25, "y": 0}, + {"matrix": [0, 13], "x": 14.25, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0, "w": 2}, - {"x": 0.25, "y": 1}, + {"matrix": [1, 0], "x": 0.25, "y": 1}, - {"x": 1.5, "y": 1, "w": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, + {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1, "w": 1.5}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1}, + {"matrix": [1, 12], "x": 14, "y": 1}, + {"matrix": [1, 13], "x": 15, "y": 1}, + {"matrix": [1, 14], "x": 16, "y": 1, "w": 1.5}, - {"x": 0, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, - {"x": 1.25, "y": 2, "w": 1.75}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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}, - {"x": 9.5, "y": 2}, - {"x": 10.5, "y": 2}, - {"x": 11.5, "y": 2}, - {"x": 12.5, "y": 2}, - {"x": 13.5, "y": 2}, - {"x": 14.5, "y": 2}, - {"x": 15.5, "y": 2, "w": 2.25}, + {"matrix": [2, 7], "x": 9.5, "y": 2}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 11.5, "y": 2}, + {"matrix": [2, 10], "x": 12.5, "y": 2}, + {"matrix": [2, 11], "x": 13.5, "y": 2}, + {"matrix": [2, 12], "x": 14.5, "y": 2}, + {"matrix": [2, 14], "x": 15.5, "y": 2, "w": 2.25}, - {"x": 1, "y": 3, "w": 2.25}, - {"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}, + {"matrix": [3, 1], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 3}, - {"x": 14.75, "y": 3}, - {"x": 15.75, "y": 3}, - {"x": 16.75, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 9.75, "y": 3}, + {"matrix": [3, 8], "x": 10.75, "y": 3}, + {"matrix": [3, 9], "x": 11.75, "y": 3}, + {"matrix": [3, 10], "x": 12.75, "y": 3}, + {"matrix": [3, 11], "x": 13.75, "y": 3}, + {"matrix": [3, 12], "x": 14.75, "y": 3}, + {"matrix": [3, 13], "x": 15.75, "y": 3}, + {"matrix": [3, 14], "x": 16.75, "y": 3, "w": 1.25}, - {"x": 1, "y": 4, "w": 1.25}, - {"x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 6, "y": 4, "w": 2.25}, - {"x": 4.75, "y": 4, "w": 1.25}, - {"x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 8], "x": 9.75, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 12.5, "y": 4, "w": 1.25}, - {"x": 9.75, "y": 4, "w": 2.75}, - {"x": 12.5, "y": 4, "w": 1.25}, - - {"x": 14.75, "y": 4}, - {"x": 15.75, "y": 4}, - {"x": 16.75, "y": 4} + {"matrix": [4, 12], "x": 14.75, "y": 4}, + {"matrix": [4, 13], "x": 15.75, "y": 4}, + {"matrix": [4, 14], "x": 16.75, "y": 4} ] } } diff --git a/keyboards/mwstudio/mw65_rgb/info.json b/keyboards/mwstudio/mw65_rgb/info.json index f4c1a5067243..c2a8a6c18829 100644 --- a/keyboards/mwstudio/mw65_rgb/info.json +++ b/keyboards/mwstudio/mw65_rgb/info.json @@ -29,79 +29,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1!", "x":1, "y":0}, - {"label":"2@", "x":2, "y":0}, - {"label":"3#", "x":3, "y":0}, - {"label":"4$", "x":4, "y":0}, - {"label":"5%", "x":5, "y":0}, - {"label":"6^", "x":6, "y":0}, - {"label":"7&", "x":7, "y":0}, - {"label":"8*", "x":8, "y":0}, - {"label":"9(", "x":9, "y":0}, - {"label":"0)", "x":10, "y":0}, - {"label":"-_", "x":11, "y":0}, - {"label":"=+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Encoder CCW", "x":15, "y":0, "w":0.5}, - {"label":"Delete", "x":15.5, "y":0}, - {"label":"Encoder CW", "x":16.5, "y":0, "w":0.5}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[{", "x":11.5, "y":1}, - {"label":"]}", "x":12.5, "y":1}, - {"label":"\\|", "x":13.5, "y":1, "w":1.5}, - {"label":"PgUp", "x":15, "y":1}, + {"matrix": [4, 4], "x": 15, "y": 0, "w": 0.5}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [4, 3], "x": 16.5, "y": 0, "w": 0.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";:", "x":10.75, "y":2}, - {"label":"'\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"PgDn", "x":15, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",<", "x":9.25, "y":3}, - {"label":".>", "x":10.25, "y":3}, - {"label":"/?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"End", "x":15, "y":3}, + {"matrix": [1, 14], "x": 15, "y": 1}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"Space", "x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Fn", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "x":15, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/mwstudio/mw65_rgb/mw65_rgb.c b/keyboards/mwstudio/mw65_rgb/mw65_rgb.c index 5fd657c6b95d..0cd8fdaa75a6 100644 --- a/keyboards/mwstudio/mw65_rgb/mw65_rgb.c +++ b/keyboards/mwstudio/mw65_rgb/mw65_rgb.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "mw65_rgb.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mwstudio/mw65_rgb/mw65_rgb.h b/keyboards/mwstudio/mw65_rgb/mw65_rgb.h deleted file mode 100644 index 3c49721df019..000000000000 --- a/keyboards/mwstudio/mw65_rgb/mw65_rgb.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2021 TW59420 - * - * 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 XXX KC_NO - -/* 44 ◯ 43 - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2D │2E │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │30 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │40 │41 │42 │46 │4A │4B │ │4C │4D │4E │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K44, K0E, K43, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, K44, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/mwstudio/mw75/info.json b/keyboards/mwstudio/mw75/info.json index aaac84fcb185..cc2e3dc40816 100644 --- a/keyboards/mwstudio/mw75/info.json +++ b/keyboards/mwstudio/mw75/info.json @@ -32,94 +32,99 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.5, "y":0}, - {"label":"F2", "x":2.5, "y":0}, - {"label":"F3", "x":3.5, "y":0}, - {"label":"F4", "x":4.5, "y":0}, - {"label":"F5", "x":6, "y":0}, - {"label":"F6", "x":7, "y":0}, - {"label":"F7", "x":8, "y":0}, - {"label":"F8", "x":9, "y":0}, - {"label":"F9", "x":10.5, "y":0}, - {"label":"F10", "x":11.5, "y":0}, - {"label":"F11", "x":12.5, "y":0}, - {"label":"F12", "x":13.5, "y":0}, - {"label":"Encoder CCW", "x":15, "y":0, "w":0.5}, - {"label":"Encoder Click", "x":15.5, "y":0}, - {"label":"Encoder CW", "x":16.5, "y":0, "w":0.5}, + {"matrix": [0, 1], "x": 0, "y": 0}, - {"label":"`~", "x":0, "y":1.5}, - {"label":"1!", "x":1, "y":1.5}, - {"label":"2@", "x":2, "y":1.5}, - {"label":"3#", "x":3, "y":1.5}, - {"label":"4$", "x":4, "y":1.5}, - {"label":"5%", "x":5, "y":1.5}, - {"label":"6^", "x":6, "y":1.5}, - {"label":"7&", "x":7, "y":1.5}, - {"label":"8*", "x":8, "y":1.5}, - {"label":"9(", "x":9, "y":1.5}, - {"label":"0)", "x":10, "y":1.5}, - {"label":"-_", "x":11, "y":1.5}, - {"label":"=+", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Delete", "x":15, "y":1.5}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, - {"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":"PgUp", "x":15, "y":2.5}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, - {"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":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"PgDn", "x":15, "y":3.5}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"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":"Shift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"\u2191", "x":14, "y":4.5}, - {"label":"End", "x":15, "y":4.5}, + {"matrix": [5, 4], "x": 15, "y": 0, "w": 0.5}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [5, 3], "x": 16.5, "y": 0, "w": 0.5}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"label":"Space", "x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Fn", "x":11.25, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":13, "y":5.5}, - {"label":"\u2193", "x":14, "y":5.5}, - {"label":"\u2192", "x":15, "y":5.5} + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + {"matrix": [4, 14], "x": 15, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5}, + {"matrix": [5, 14], "x": 15, "y": 5.5} ] } } diff --git a/keyboards/mwstudio/mw75/mw75.c b/keyboards/mwstudio/mw75/mw75.c index 7e6641d5dbdc..dda51cb9712a 100644 --- a/keyboards/mwstudio/mw75/mw75.c +++ b/keyboards/mwstudio/mw75/mw75.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "mw75.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mwstudio/mw75/mw75.h b/keyboards/mwstudio/mw75/mw75.h deleted file mode 100644 index c6542fc57a29..000000000000 --- a/keyboards/mwstudio/mw75/mw75.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Copyright 2021 TW59420 - * - * 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 XXX KC_NO - -/* 54 ◯ 53 - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ - * │01 │ │02 │03 │04 │05 │ │06 │07 │08 │09 │ │0A │0B │0C │0D │ │0E │ - * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3D │3E │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤ - * │40 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │4C │4D │4E │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤ - * │50 │51 │52 │56 │5A │5B │ │5C │5D │5E │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ - -#define LAYOUT( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K54, K0E, K53, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, \ - K40, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \ - K50, K51, K52, K56, K5A, K5B, K5C, K5D, K5E \ -) { \ - { XXX, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E }, \ - { K40, XXX, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ - { K50, K51, K52, K53, K54, XXX, K56, XXX, XXX, XXX, K5A, K5B, K5C, K5D, K5E }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/mwstudio/mw75r2/info.json b/keyboards/mwstudio/mw75r2/info.json index c66145d73189..f86df57fe5ae 100644 --- a/keyboards/mwstudio/mw75r2/info.json +++ b/keyboards/mwstudio/mw75r2/info.json @@ -29,92 +29,97 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.5, "y":0}, - {"label":"F2", "x":2.5, "y":0}, - {"label":"F3", "x":3.5, "y":0}, - {"label":"F4", "x":4.5, "y":0}, - {"label":"F5", "x":6, "y":0}, - {"label":"F6", "x":7, "y":0}, - {"label":"F7", "x":8, "y":0}, - {"label":"F8", "x":9, "y":0}, - {"label":"F9", "x":10.5, "y":0}, - {"label":"F10", "x":11.5, "y":0}, - {"label":"F11", "x":12.5, "y":0}, - {"label":"F12", "x":13.5, "y":0}, - {"label":"DEL", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"`", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Delete", "x":15, "y":1.5}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, - {"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":"PgUp", "x":15, "y":2.5}, + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, - {"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":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"PgDn", "x":15, "y":3.5}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, - {"label":"Shift", "x":0, "y":4.5, "w":2.25}, - {"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":"Shift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"\u2191", "x":14, "y":4.5}, - {"label":"End", "x":15, "y":4.5}, + {"matrix": [0, 14], "x": 15, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, - {"x":3.75, "y":5.5, "w":6.25}, - {"label":"Alt", "x":10, "y":5.5, "w":1.25}, - {"label":"Fn", "x":11.25, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":13, "y":5.5}, - {"label":"\u2193", "x":14, "y":5.5}, - {"label":"\u2192", "x":15, "y":5.5} + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + {"matrix": [4, 14], "x": 15, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5}, + {"matrix": [5, 14], "x": 15, "y": 5.5} ] } } diff --git a/keyboards/mwstudio/mw75r2/mw75r2.c b/keyboards/mwstudio/mw75r2/mw75r2.c index 339e2a539430..ca058e9d8dbb 100644 --- a/keyboards/mwstudio/mw75r2/mw75r2.c +++ b/keyboards/mwstudio/mw75r2/mw75r2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "mw75r2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/mwstudio/mw75r2/mw75r2.h b/keyboards/mwstudio/mw75r2/mw75r2.h deleted file mode 100644 index 593b2ebb11a3..000000000000 --- a/keyboards/mwstudio/mw75r2/mw75r2.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 TW59420 - * - * 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( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,\ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,\ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314,\ - K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,\ - K500, K501, K502, K506, K510, K511, K512, K513, K514\ -) { \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 },\ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 },\ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 },\ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 },\ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414 },\ - { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514 }\ -} diff --git a/keyboards/nacly/sodium42/info.json b/keyboards/nacly/sodium42/info.json index 255d4e85e23a..0c92f469aea8 100644 --- a/keyboards/nacly/sodium42/info.json +++ b/keyboards/nacly/sodium42/info.json @@ -21,55 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.75}, - {"x": 1, "y": 0.5}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0.25}, - {"x": 4, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.5}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 1}, - {"x": 8.75, "y": 1}, - {"x": 9.75, "y": 0.5}, - {"x": 10.75, "y": 0}, - {"x": 11.75, "y": 0.5}, - {"x": 12.75, "y": 0.75}, + {"matrix": [4, 4], "x": 8.75, "y": 1}, + {"matrix": [4, 3], "x": 9.75, "y": 0.5}, + {"matrix": [4, 2], "x": 10.75, "y": 0}, + {"matrix": [4, 1], "x": 11.75, "y": 0.5}, + {"matrix": [4, 0], "x": 12.75, "y": 0.75}, - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.5}, - {"x": 2, "y": 1}, - {"x": 3, "y": 1.25}, - {"x": 4, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 2}, - {"x": 8.75, "y": 2}, - {"x": 9.75, "y": 1.5}, - {"x": 10.75, "y": 1}, - {"x": 11.75, "y": 1.5}, - {"x": 12.75, "y": 1.75}, + {"matrix": [5, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 3], "x": 9.75, "y": 1.5}, + {"matrix": [5, 2], "x": 10.75, "y": 1}, + {"matrix": [5, 1], "x": 11.75, "y": 1.5}, + {"matrix": [5, 0], "x": 12.75, "y": 1.75}, - {"x": 0, "y": 2.75}, - {"x": 1, "y": 2.5}, - {"x": 2, "y": 2}, - {"x": 3, "y": 2.25}, - {"x": 4, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 3}, - {"x": 8.75, "y": 3}, - {"x": 9.75, "y": 2.5}, - {"x": 10.75, "y": 2}, - {"x": 11.75, "y": 2.5}, - {"x": 12.75, "y": 2.75}, + {"matrix": [6, 4], "x": 8.75, "y": 3}, + {"matrix": [6, 3], "x": 9.75, "y": 2.5}, + {"matrix": [6, 2], "x": 10.75, "y": 2}, + {"matrix": [6, 1], "x": 11.75, "y": 2.5}, + {"matrix": [6, 0], "x": 12.75, "y": 2.75}, - {"x": 0, "y": 3.75}, - {"x": 1, "y": 3.5}, - {"x": 2, "y": 3}, - {"x": 3, "y": 3.25}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4.5}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.25}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4.5}, - {"x": 7.75, "y": 4.5}, - {"x": 8.75, "y": 4}, - {"x": 9.75, "y": 3.5}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3.5}, - {"x": 12.75, "y": 3.75} + {"matrix": [7, 5], "x": 7.75, "y": 4.5}, + {"matrix": [7, 4], "x": 8.75, "y": 4}, + {"matrix": [7, 3], "x": 9.75, "y": 3.5}, + {"matrix": [7, 2], "x": 10.75, "y": 3}, + {"matrix": [7, 1], "x": 11.75, "y": 3.5}, + {"matrix": [7, 0], "x": 12.75, "y": 3.75} ] } } diff --git a/keyboards/nacly/sodium42/sodium42.h b/keyboards/nacly/sodium42/sodium42.h deleted file mode 100644 index 427b6f4d43c7..000000000000 --- a/keyboards/nacly/sodium42/sodium42.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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(\ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30 \ -)\ - {\ - { L00, L01, L02, L03, L04, KC_NO }, \ - { L10, L11, L12, L13, L14, KC_NO }, \ - { L20, L21, L22, L23, L24, KC_NO }, \ - { L30, L31, L32, L33, L34, L35 }, \ -\ - { R00, R01, R02, R03, R04, KC_NO }, \ - { R10, R11, R12, R13, R14, KC_NO }, \ - { R20, R21, R22, R23, R24, KC_NO }, \ - { R30, R31, R32, R33, R34, R35 } \ -} diff --git a/keyboards/nacly/sodium50/info.json b/keyboards/nacly/sodium50/info.json index 182162e39f5c..920a2f946f73 100644 --- a/keyboards/nacly/sodium50/info.json +++ b/keyboards/nacly/sodium50/info.json @@ -21,63 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.75}, - {"x": 1, "y": 0.75}, - {"x": 2, "y": 0.5}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.25}, - {"x": 5, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 0.5}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0.5}, - {"x": 13.75, "y": 0.75}, - {"x": 14.75, "y": 0.75}, + {"matrix": [4, 5], "x": 9.75, "y": 1}, + {"matrix": [4, 4], "x": 10.75, "y": 0.5}, + {"matrix": [4, 3], "x": 11.75, "y": 0}, + {"matrix": [4, 2], "x": 12.75, "y": 0.5}, + {"matrix": [4, 1], "x": 13.75, "y": 0.75}, + {"matrix": [4, 0], "x": 14.75, "y": 0.75}, - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.75}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 1.5}, - {"x": 11.75, "y": 1}, - {"x": 12.75, "y": 1.5}, - {"x": 13.75, "y": 1.75}, - {"x": 14.75, "y": 1.75}, + {"matrix": [5, 5], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 1.5}, + {"matrix": [5, 3], "x": 11.75, "y": 1}, + {"matrix": [5, 2], "x": 12.75, "y": 1.5}, + {"matrix": [5, 1], "x": 13.75, "y": 1.75}, + {"matrix": [5, 0], "x": 14.75, "y": 1.75}, - {"x": 0, "y": 2.75}, - {"x": 1, "y": 2.75}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 2.5}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2.5}, - {"x": 13.75, "y": 2.75}, - {"x": 14.75, "y": 2.75}, + {"matrix": [6, 5], "x": 9.75, "y": 3}, + {"matrix": [6, 4], "x": 10.75, "y": 2.5}, + {"matrix": [6, 3], "x": 11.75, "y": 2}, + {"matrix": [6, 2], "x": 12.75, "y": 2.5}, + {"matrix": [6, 1], "x": 13.75, "y": 2.75}, + {"matrix": [6, 0], "x": 14.75, "y": 2.75}, - {"x": 0, "y": 3.75}, - {"x": 1, "y": 3.75}, - {"x": 2, "y": 3.5}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.25}, - {"x": 5, "y": 4}, - {"x": 6, "y": 4.5}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 4}, + {"matrix": [3, 6], "x": 6, "y": 4.5}, - {"x": 8.75, "y": 4.5}, - {"x": 9.75, "y": 4}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3.5}, - {"x": 13.75, "y": 3.75}, - {"x": 14.75, "y": 3.75} + {"matrix": [7, 6], "x": 8.75, "y": 4.5}, + {"matrix": [7, 5], "x": 9.75, "y": 4}, + {"matrix": [7, 4], "x": 10.75, "y": 3.5}, + {"matrix": [7, 3], "x": 11.75, "y": 3}, + {"matrix": [7, 2], "x": 12.75, "y": 3.5}, + {"matrix": [7, 1], "x": 13.75, "y": 3.75}, + {"matrix": [7, 0], "x": 14.75, "y": 3.75} ] } } diff --git a/keyboards/nacly/sodium50/sodium50.h b/keyboards/nacly/sodium50/sodium50.h deleted file mode 100644 index 384867f193c6..000000000000 --- a/keyboards/nacly/sodium50/sodium50.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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(\ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30 \ -)\ - {\ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ -\ - { R00, R01, R02, R03, R04, R05, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36 } \ -} diff --git a/keyboards/nacly/sodium62/info.json b/keyboards/nacly/sodium62/info.json index 07e380569bbb..8632bfabdf7f 100644 --- a/keyboards/nacly/sodium62/info.json +++ b/keyboards/nacly/sodium62/info.json @@ -21,77 +21,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.75}, - {"x": 1, "y": 0.75}, - {"x": 2, "y": 0.5}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0.25}, - {"x": 5, "y": 1}, + {"matrix": [0, 0], "x": 0, "y": 0.75}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.5}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 1}, - {"x": 9.75, "y": 1}, - {"x": 10.75, "y": 0.5}, - {"x": 11.75, "y": 0}, - {"x": 12.75, "y": 0.5}, - {"x": 13.75, "y": 0.75}, - {"x": 14.75, "y": 0.75}, + {"matrix": [5, 5], "x": 9.75, "y": 1}, + {"matrix": [5, 4], "x": 10.75, "y": 0.5}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0.5}, + {"matrix": [5, 1], "x": 13.75, "y": 0.75}, + {"matrix": [5, 0], "x": 14.75, "y": 0.75}, - {"x": 0, "y": 1.75}, - {"x": 1, "y": 1.75}, - {"x": 2, "y": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1.25}, - {"x": 5, "y": 2}, + {"matrix": [1, 0], "x": 0, "y": 1.75}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 2}, - {"x": 9.75, "y": 2}, - {"x": 10.75, "y": 1.5}, - {"x": 11.75, "y": 1}, - {"x": 12.75, "y": 1.5}, - {"x": 13.75, "y": 1.75}, - {"x": 14.75, "y": 1.75}, + {"matrix": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 1.5}, + {"matrix": [6, 3], "x": 11.75, "y": 1}, + {"matrix": [6, 2], "x": 12.75, "y": 1.5}, + {"matrix": [6, 1], "x": 13.75, "y": 1.75}, + {"matrix": [6, 0], "x": 14.75, "y": 1.75}, - {"x": 0, "y": 2.75}, - {"x": 1, "y": 2.75}, - {"x": 2, "y": 2.5}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2.25}, - {"x": 5, "y": 3}, + {"matrix": [2, 0], "x": 0, "y": 2.75}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 3}, - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 2.5}, - {"x": 11.75, "y": 2}, - {"x": 12.75, "y": 2.5}, - {"x": 13.75, "y": 2.75}, - {"x": 14.75, "y": 2.75}, + {"matrix": [7, 5], "x": 9.75, "y": 3}, + {"matrix": [7, 4], "x": 10.75, "y": 2.5}, + {"matrix": [7, 3], "x": 11.75, "y": 2}, + {"matrix": [7, 2], "x": 12.75, "y": 2.5}, + {"matrix": [7, 1], "x": 13.75, "y": 2.75}, + {"matrix": [7, 0], "x": 14.75, "y": 2.75}, - {"x": 0, "y": 3.75}, - {"x": 1, "y": 3.75}, - {"x": 2, "y": 3.5}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3.25}, - {"x": 5, "y": 4}, + {"matrix": [3, 0], "x": 0, "y": 3.75}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.5}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 4}, - {"x": 9.75, "y": 4}, - {"x": 10.75, "y": 3.5}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3.5}, - {"x": 13.75, "y": 3.75}, - {"x": 14.75, "y": 3.75}, + {"matrix": [8, 5], "x": 9.75, "y": 4}, + {"matrix": [8, 4], "x": 10.75, "y": 3.5}, + {"matrix": [8, 3], "x": 11.75, "y": 3}, + {"matrix": [8, 2], "x": 12.75, "y": 3.5}, + {"matrix": [8, 1], "x": 13.75, "y": 3.75}, + {"matrix": [8, 0], "x": 14.75, "y": 3.75}, - {"x": 0, "y": 4.75}, - {"x": 1, "y": 4.75}, - {"x": 2, "y": 4.5}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4.25}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5.5}, + {"matrix": [4, 0], "x": 0, "y": 4.75}, + {"matrix": [4, 1], "x": 1, "y": 4.75}, + {"matrix": [4, 2], "x": 2, "y": 4.5}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.25}, + {"matrix": [4, 5], "x": 5, "y": 5}, + {"matrix": [4, 6], "x": 6, "y": 5.5}, - {"x": 8.75, "y": 5.5}, - {"x": 9.75, "y": 5}, - {"x": 10.75, "y": 4.5}, - {"x": 11.75, "y": 4}, - {"x": 12.75, "y": 4.5}, - {"x": 13.75, "y": 4.75}, - {"x": 14.75, "y": 4.75} + {"matrix": [9, 6], "x": 8.75, "y": 5.5}, + {"matrix": [9, 5], "x": 9.75, "y": 5}, + {"matrix": [9, 4], "x": 10.75, "y": 4.5}, + {"matrix": [9, 3], "x": 11.75, "y": 4}, + {"matrix": [9, 2], "x": 12.75, "y": 4.5}, + {"matrix": [9, 1], "x": 13.75, "y": 4.75}, + {"matrix": [9, 0], "x": 14.75, "y": 4.75} ] } } diff --git a/keyboards/nacly/sodium62/sodium62.c b/keyboards/nacly/sodium62/sodium62.c index d418313374d6..55d8c3c558bc 100644 --- a/keyboards/nacly/sodium62/sodium62.c +++ b/keyboards/nacly/sodium62/sodium62.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "sodium62.h" +#include "quantum.h" #ifdef OLED_ENABLE bool oled_task_kb(void) { diff --git a/keyboards/nacly/sodium62/sodium62.h b/keyboards/nacly/sodium62/sodium62.h deleted file mode 100644 index 7db100233306..000000000000 --- a/keyboards/nacly/sodium62/sodium62.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2022 NaCly - * - * 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(\ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40 \ -)\ - {\ - { L00, L01, L02, L03, L04, L05, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ -\ - { R00, R01, R02, R03, R04, R05, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, KC_NO }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/nacly/splitreus62/info.json b/keyboards/nacly/splitreus62/info.json index e8361decda3b..5c61b6f5fe42 100644 --- a/keyboards/nacly/splitreus62/info.json +++ b/keyboards/nacly/splitreus62/info.json @@ -23,7 +23,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.7}, + + {"matrix": [6, 5], "x": 9, "y": 0.7}, + {"matrix": [6, 4], "x": 10, "y": 0.35}, + {"matrix": [6, 3], "x": 11, "y": 0}, + {"matrix": [6, 2], "x": 12, "y": 0.35}, + {"matrix": [6, 1], "x": 13, "y": 0.6}, + {"matrix": [6, 0], "x": 14, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.7}, + + {"matrix": [7, 5], "x": 9, "y": 1.7}, + {"matrix": [7, 4], "x": 10, "y": 1.35}, + {"matrix": [7, 3], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1.35}, + {"matrix": [7, 1], "x": 13, "y": 1.6}, + {"matrix": [7, 0], "x": 14, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.7}, + + {"matrix": [8, 5], "x": 9, "y": 2.7}, + {"matrix": [8, 4], "x": 10, "y": 2.35}, + {"matrix": [8, 3], "x": 11, "y": 2}, + {"matrix": [8, 2], "x": 12, "y": 2.35}, + {"matrix": [8, 1], "x": 13, "y": 2.6}, + {"matrix": [8, 0], "x": 14, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.35}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.7}, + + {"matrix": [9, 5], "x": 9, "y": 3.7}, + {"matrix": [9, 4], "x": 10, "y": 3.35}, + {"matrix": [9, 3], "x": 11, "y": 3}, + {"matrix": [9, 2], "x": 12, "y": 3.35}, + {"matrix": [9, 1], "x": 13, "y": 3.6}, + {"matrix": [9, 0], "x": 14, "y": 3.6}, + + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.35}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.35}, + {"matrix": [4, 5], "x": 5, "y": 4.7}, + {"matrix": [5, 5], "x": 6, "y": 3.95, "h": 1.5}, + + {"matrix": [11, 5], "x": 8, "y": 3.95, "h": 1.5}, + {"matrix": [10, 5], "x": 9, "y": 4.7}, + {"matrix": [10, 4], "x": 10, "y": 4.35}, + {"matrix": [10, 3], "x": 11, "y": 4}, + {"matrix": [10, 2], "x": 12, "y": 4.35}, + {"matrix": [10, 1], "x": 13, "y": 4.6}, + {"matrix": [10, 0], "x": 14, "y": 4.6} + ] } } - } +} diff --git a/keyboards/nacly/splitreus62/splitreus62.h b/keyboards/nacly/splitreus62/splitreus62.h deleted file mode 100644 index bc6c2a9131e2..000000000000 --- a/keyboards/nacly/splitreus62/splitreus62.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT(\ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L55, R55, R45, R44, R43, R42, R41, R40 \ -)\ - {\ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55 }, \ -\ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { R30, R31, R32, R33, R34, R35 }, \ - { R40, R41, R42, R43, R44, R45 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R55 } \ -} diff --git a/keyboards/nacly/ua62/info.json b/keyboards/nacly/ua62/info.json index 82e284ebe754..383825414b6b 100644 --- a/keyboards/nacly/ua62/info.json +++ b/keyboards/nacly/ua62/info.json @@ -17,7 +17,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.6}, {"x":2, "y":0.35}, {"x":3, "y":0}, {"x":4, "y":0.35}, {"x":5, "y":0.7}, {"x":9, "y":0.7}, {"x":10, "y":0.35}, {"x":11, "y":0}, {"x":12, "y":0.35}, {"x":13, "y":0.6}, {"x":14, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.6}, {"x":2, "y":1.35}, {"x":3, "y":1}, {"x":4, "y":1.35}, {"x":5, "y":1.7}, {"x":9, "y":1.7}, {"x":10, "y":1.35}, {"x":11, "y":1}, {"x":12, "y":1.35}, {"x":13, "y":1.6}, {"x":14, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.6}, {"x":2, "y":2.35}, {"x":3, "y":2}, {"x":4, "y":2.35}, {"x":5, "y":2.7}, {"x":9, "y":2.7}, {"x":10, "y":2.35}, {"x":11, "y":2}, {"x":12, "y":2.35}, {"x":13, "y":2.6}, {"x":14, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.6}, {"x":2, "y":3.35}, {"x":3, "y":3}, {"x":4, "y":3.35}, {"x":5, "y":3.7}, {"x":9, "y":3.7}, {"x":10, "y":3.35}, {"x":11, "y":3}, {"x":12, "y":3.35}, {"x":13, "y":3.6}, {"x":14, "y":3.6}, {"x":0, "y":4.6}, {"x":1, "y":4.6}, {"x":2, "y":4.35}, {"x":3, "y":4}, {"x":4, "y":4.35}, {"x":5, "y":4.7}, {"x":6, "y":3.95, "h":1.5}, {"x":8, "y":3.95, "h":1.5}, {"x":9, "y":4.7}, {"x":10, "y":4.35}, {"x":11, "y":4}, {"x":12, "y":4.35}, {"x":13, "y":4.6}, {"x":14, "y":4.6}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0.35}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.35}, + {"matrix": [0, 5], "x": 5, "y": 0.7}, + + {"matrix": [0, 7], "x": 9, "y": 0.7}, + {"matrix": [0, 8], "x": 10, "y": 0.35}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.35}, + {"matrix": [0, 11], "x": 13, "y": 0.6}, + {"matrix": [0, 12], "x": 14, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.6}, + {"matrix": [1, 2], "x": 2, "y": 1.35}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.35}, + {"matrix": [1, 5], "x": 5, "y": 1.7}, + + {"matrix": [1, 7], "x": 9, "y": 1.7}, + {"matrix": [1, 8], "x": 10, "y": 1.35}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.35}, + {"matrix": [1, 11], "x": 13, "y": 1.6}, + {"matrix": [1, 12], "x": 14, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.6}, + {"matrix": [2, 2], "x": 2, "y": 2.35}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.35}, + {"matrix": [2, 5], "x": 5, "y": 2.7}, + + {"matrix": [2, 7], "x": 9, "y": 2.7}, + {"matrix": [2, 8], "x": 10, "y": 2.35}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.35}, + {"matrix": [2, 11], "x": 13, "y": 2.6}, + {"matrix": [2, 12], "x": 14, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.6}, + {"matrix": [3, 2], "x": 2, "y": 3.35}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.35}, + {"matrix": [3, 5], "x": 5, "y": 3.7}, + + {"matrix": [3, 7], "x": 9, "y": 3.7}, + {"matrix": [3, 8], "x": 10, "y": 3.35}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3.35}, + {"matrix": [3, 11], "x": 13, "y": 3.6}, + {"matrix": [3, 12], "x": 14, "y": 3.6}, + + {"matrix": [4, 0], "x": 0, "y": 4.6}, + {"matrix": [4, 1], "x": 1, "y": 4.6}, + {"matrix": [4, 2], "x": 2, "y": 4.35}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.35}, + {"matrix": [4, 5], "x": 5, "y": 4.7}, + {"matrix": [4, 6], "x": 6, "y": 3.95, "h": 1.5}, + + {"matrix": [3, 6], "x": 8, "y": 3.95, "h": 1.5}, + {"matrix": [4, 7], "x": 9, "y": 4.7}, + {"matrix": [4, 8], "x": 10, "y": 4.35}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 10], "x": 12, "y": 4.35}, + {"matrix": [4, 11], "x": 13, "y": 4.6}, + {"matrix": [4, 12], "x": 14, "y": 4.6} + ] } } - } +} diff --git a/keyboards/nacly/ua62/ua62.h b/keyboards/nacly/ua62/ua62.h deleted file mode 100644 index 4509bbff3d85..000000000000 --- a/keyboards/nacly/ua62/ua62.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 NaCly - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - 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, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, KC_NO, k06, k07, k08, k09, k0a, k0b }, \ - { k10, k11, k12, k13, k14, k15, KC_NO, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, KC_NO, k26, k27, k28, k29, k2a, k2b }, \ - { k30, k31, k32, k33, k34, k35, k47, k36, k37, k38, k39, k3a, k3b }, \ - { k40, k41, k42, k43, k44, k45, k46, k48, k49, k4a, k4b, k4c, k4d }, \ -} diff --git a/keyboards/neito/info.json b/keyboards/neito/info.json index 10cce03e827e..8db2eb29f3d0 100644 --- a/keyboards/neito/info.json +++ b/keyboards/neito/info.json @@ -31,82 +31,81 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0.62, "y":0.25}, - {"label":"1,0", "x":1.62, "y":0.25}, - {"label":"0,1", "x":2.62, "y":0.19}, - {"label":"1,1", "x":4, "y":0.44}, - {"label":"0,2", "x":5, "y":0.44}, - {"label":"1,2", "x":6, "y":0.44}, - {"label":"0,3", "x":7, "y":0.44}, - {"label":"1,3", "x":10.25, "y":0.44}, - {"label":"0,4", "x":11.25, "y":0.44}, - {"label":"1,4", "x":12.25, "y":0.44}, - {"label":"0,5", "x":13.25, "y":0.44}, - {"label":"1,5", "x":14.94, "y":0.19}, - {"label":"0,6", "x":15.94, "y":0.25}, - {"label":"1,6", "x":16.94, "y":0.25, "w":2}, - {"label":"0,7", "x":19.19, "y":0}, + {"matrix": [0, 0], "x": 0.62, "y": 0.25}, + {"matrix": [1, 0], "x": 1.62, "y": 0.25}, + {"matrix": [0, 1], "x": 2.62, "y": 0.19}, + {"matrix": [1, 1], "x": 4, "y": 0.44}, + {"matrix": [0, 2], "x": 5, "y": 0.44}, + {"matrix": [1, 2], "x": 6, "y": 0.44}, + {"matrix": [0, 3], "x": 7, "y": 0.44}, + {"matrix": [1, 3], "x": 10.25, "y": 0.44}, + {"matrix": [0, 4], "x": 11.25, "y": 0.44}, + {"matrix": [1, 4], "x": 12.25, "y": 0.44}, + {"matrix": [0, 5], "x": 13.25, "y": 0.44}, + {"matrix": [1, 5], "x": 14.94, "y": 0.19}, + {"matrix": [0, 6], "x": 15.94, "y": 0.25}, + {"matrix": [1, 6], "x": 16.94, "y": 0.25, "w": 2}, + {"matrix": [0, 7], "x": 19.19, "y": 0}, + {"matrix": [2, 0], "x": 0.43, "y": 1.25, "w": 1.5}, + {"matrix": [3, 0], "x": 1.93, "y": 1.25}, + {"matrix": [2, 1], "x": 3.5, "y": 1.44}, + {"matrix": [3, 1], "x": 4.5, "y": 1.44}, + {"matrix": [2, 2], "x": 5.5, "y": 1.44}, + {"matrix": [3, 2], "x": 6.5, "y": 1.44}, + {"matrix": [2, 3], "x": 9.75, "y": 1.44}, + {"matrix": [3, 3], "x": 10.75, "y": 1.44}, + {"matrix": [2, 4], "x": 11.75, "y": 1.44}, + {"matrix": [3, 4], "x": 12.75, "y": 1.44}, + {"matrix": [2, 5], "x": 13.75, "y": 1.44}, + {"matrix": [3, 5], "x": 15.69, "y": 1.25}, + {"matrix": [2, 6], "x": 16.69, "y": 1.25}, + {"matrix": [3, 6], "x": 17.94, "y": 1.25, "w": 1.25, "h": 2}, + {"matrix": [2, 7], "x": 19.44, "y": 1}, - {"label":"2,0", "x":0.43, "y":1.25, "w":1.5}, - {"label":"3,0", "x":1.93, "y":1.25}, - {"label":"2,1", "x":3.5, "y":1.44}, - {"label":"3,1", "x":4.5, "y":1.44}, - {"label":"2,2", "x":5.5, "y":1.44}, - {"label":"3,2", "x":6.5, "y":1.44}, - {"label":"2,3", "x":9.75, "y":1.44}, - {"label":"3,3", "x":10.75, "y":1.44}, - {"label":"2,4", "x":11.75, "y":1.44}, - {"label":"3,4", "x":12.75, "y":1.44}, - {"label":"2,5", "x":13.75, "y":1.44}, - {"label":"3,5", "x":15.69, "y":1.25}, - {"label":"2,6", "x":16.69, "y":1.25}, - {"label":"3,6", "x":17.94, "y":1.25, "w":1.25, "h":2}, - {"label":"2,7", "x":19.44, "y":1}, + {"matrix": [4, 0], "x": 0.18, "y": 2.25, "w": 1.75}, + {"matrix": [5, 0], "x": 1.93, "y": 2.25}, + {"matrix": [4, 1], "x": 3.75, "y": 2.44}, + {"matrix": [5, 1], "x": 4.75, "y": 2.44}, + {"matrix": [4, 2], "x": 5.75, "y": 2.44}, + {"matrix": [5, 2], "x": 6.75, "y": 2.44}, + {"matrix": [4, 3], "x": 10, "y": 2.44}, + {"matrix": [5, 3], "x": 11, "y": 2.44}, + {"matrix": [4, 4], "x": 12, "y": 2.44}, + {"matrix": [5, 4], "x": 13, "y": 2.44}, + {"matrix": [4, 5], "x": 14.94, "y": 2.25}, + {"matrix": [5, 5], "x": 15.94, "y": 2.25}, + {"matrix": [4, 6], "x": 16.94, "y": 2.25}, + {"matrix": [4, 7], "x": 19.69, "y": 2}, - {"label":"4,0", "x":0.18, "y":2.25, "w":1.75}, - {"label":"5,0", "x":1.93, "y":2.25}, - {"label":"4,1", "x":3.75, "y":2.44}, - {"label":"5,1", "x":4.75, "y":2.44}, - {"label":"4,2", "x":5.75, "y":2.44}, - {"label":"5,2", "x":6.75, "y":2.44}, - {"label":"4,3", "x":10, "y":2.44}, - {"label":"5,3", "x":11, "y":2.44}, - {"label":"4,4", "x":12, "y":2.44}, - {"label":"5,4", "x":13, "y":2.44}, - {"label":"4,5", "x":14.94, "y":2.25}, - {"label":"5,5", "x":15.94, "y":2.25}, - {"label":"4,6", "x":16.94, "y":2.25}, - {"label":"4,7", "x":19.69, "y":2}, + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.25}, + {"matrix": [8, 0], "x": 1.25, "y": 3.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3.25}, + {"matrix": [6, 1], "x": 4.25, "y": 3.44}, + {"matrix": [7, 1], "x": 5.25, "y": 3.44}, + {"matrix": [6, 2], "x": 6.25, "y": 3.44}, + {"matrix": [7, 2], "x": 7.25, "y": 3.44}, + {"matrix": [8, 3], "x": 9.25, "y": 3.44}, + {"matrix": [6, 3], "x": 10.25, "y": 3.44}, + {"matrix": [7, 3], "x": 11.25, "y": 3.44}, + {"matrix": [6, 4], "x": 12.25, "y": 3.44}, + {"matrix": [7, 4], "x": 13.25, "y": 3.44}, + {"matrix": [6, 5], "x": 15.44, "y": 3.25}, + {"matrix": [6, 6], "x": 16.44, "y": 3.25, "w": 1.75}, + {"matrix": [7, 6], "x": 18.44, "y": 3.5}, - {"label":"6,0", "x":0, "y":3.25, "w":1.25}, - {"label":"8,0", "x":1.25, "y":3.25}, - {"label":"7,0", "x":2.25, "y":3.25}, - {"label":"6,1", "x":4.25, "y":3.44}, - {"label":"7,1", "x":5.25, "y":3.44}, - {"label":"6,2", "x":6.25, "y":3.44}, - {"label":"7,2", "x":7.25, "y":3.44}, - {"label":"8,3", "x":9.25, "y":3.44}, - {"label":"6,3", "x":10.25, "y":3.44}, - {"label":"7,3", "x":11.25, "y":3.44}, - {"label":"6,4", "x":12.25, "y":3.44}, - {"label":"7,4", "x":13.25, "y":3.44}, - {"label":"6,5", "x":15.44, "y":3.25}, - {"label":"6,6", "x":16.44, "y":3.25, "w":1.75}, - {"label":"7,6", "x":18.44, "y":3.5}, - - {"label":"9,0", "x":0, "y":4.25, "w":1.5}, - {"label":"8,1", "x":4.25, "y":4.44, "w":1.5}, - {"label":"8,2", "x":5.75, "y":4.44, "w":2}, - {"label":"9,2", "x":7.75, "y":4.44}, - {"label":"9,3", "x":9.75, "y":4.44, "w":2.75}, - {"label":"8,4", "x":12.5, "y":4.44, "w":1.5}, - {"label":"8,6", "x":17.44, "y":4.5}, - {"label":"9,6", "x":18.44, "y":4.5}, - {"label":"8,7", "x":19.44, "y":4.5} + {"matrix": [9, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [8, 1], "x": 4.25, "y": 4.44, "w": 1.5}, + {"matrix": [8, 2], "x": 5.75, "y": 4.44, "w": 2}, + {"matrix": [9, 2], "x": 7.75, "y": 4.44}, + {"matrix": [9, 3], "x": 9.75, "y": 4.44, "w": 2.75}, + {"matrix": [8, 4], "x": 12.5, "y": 4.44, "w": 1.5}, + {"matrix": [8, 6], "x": 17.44, "y": 4.5}, + {"matrix": [9, 6], "x": 18.44, "y": 4.5}, + {"matrix": [8, 7], "x": 19.44, "y": 4.5} ] } } diff --git a/keyboards/neito/neito.h b/keyboards/neito/neito.h deleted file mode 100644 index 35f1df286245..000000000000 --- a/keyboards/neito/neito.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2020 Oliver Granlund - * - * 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( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, \ - k60, k80, k70, k61, k71, k62, k72, k83, k63, k73, k64, k74, k65, k66, k76, \ - k90, k81, k82, k92, k93, k84, k86, k96, k87 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k30, k31, k32, k33, k34, k35, k36, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k46, k47 }, \ - { k50, k51, k52, k53, k54, k55, KC_NO, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, k66, KC_NO }, \ - { k70, k71, k72, k73, k74, KC_NO, k76, KC_NO }, \ - { k80, k81, k82, k83, k84, KC_NO, k86, k87 }, \ - { k90, KC_NO, k92, k93, KC_NO, KC_NO, k96, KC_NO }, \ -} diff --git a/keyboards/nek_type_a/info.json b/keyboards/nek_type_a/info.json index 49e78b298b05..b81bb4b2ce76 100644 --- a/keyboards/nek_type_a/info.json +++ b/keyboards/nek_type_a/info.json @@ -13,94 +13,112 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0.5, "y":0, "w":1.75}, - {"label":"F1", "x":2.75, "y":0}, - {"label":"F2", "x":3.75, "y":0}, - {"label":"F3", "x":4.75, "y":0}, - {"label":"F4", "x":5.75, "y":0}, - {"label":"F5", "x":8.25, "y":0}, - {"label":"F6", "x":9.25, "y":0}, - {"label":"F7", "x":10.25, "y":0}, - {"label":"F8", "x":11.25, "y":0}, - {"label":"F9", "x":12.5, "y":0}, - {"label":"F10", "x":13.5, "y":0}, - {"label":"F11", "x":14.5, "y":0}, - {"label":"F12", "x":15.5, "y":0}, - {"label":"Mute", "x":16.75, "y":0}, - {"label":"Volume Down", "x":17.75, "y":0}, - {"label":"Volume Up", "x":18.75, "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":8, "y":1.25, "w":1.5}, - {"label":"8", "x":9.5, "y":1.25}, - {"label":"9", "x":10.5, "y":1.25}, - {"label":"0", "x":11.5, "y":1.25}, - {"label":"-", "x":12.5, "y":1.25}, - {"label":"=", "x":13.5, "y":1.25}, - {"label":"Backspace", "x":14.5, "y":1.25, "w":2}, - {"label":"Insert", "x":16.75, "y":1.25}, - {"label":"Home", "x":17.75, "y":1.25}, - {"label":"Page Up", "x":18.75, "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, "w":1.5}, - {"label":"Y", "x":8, "y":2.25}, - {"label":"U", "x":9, "y":2.25}, - {"label":"I", "x":10, "y":2.25}, - {"label":"O", "x":11, "y":2.25}, - {"label":"P", "x":12, "y":2.25}, - {"label":"[", "x":13, "y":2.25}, - {"label":"]", "x":14, "y":2.25}, - {"label":"\\", "x":15, "y":2.25, "w":1.5}, - {"label":"Delete", "x":16.75, "y":2.25}, - {"label":"End", "x":17.75, "y":2.25}, - {"label":"Page Down", "x":18.75, "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, "w":1.25}, - {"label":"H", "x":8, "y":3.25, "w":1.25}, - {"label":"J", "x":9.25, "y":3.25}, - {"label":"K", "x":10.25, "y":3.25}, - {"label":"L", "x":11.25, "y":3.25}, - {"label":";", "x":12.25, "y":3.25}, - {"label":"'", "x":13.25, "y":3.25}, - {"label":"Enter", "x":14.25, "y":3.25, "w":2.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2}, - {"label":"Z", "x":2, "y":4.25}, - {"label":"X", "x":3, "y":4.25}, - {"label":"C", "x":4, "y":4.25}, - {"label":"V", "x":5, "y":4.25}, - {"label":"B", "x":6, "y":4.25}, - {"label":"N", "x":8, "y":4.25, "w":1.5}, - {"label":"M", "x":9.5, "y":4.25}, - {"label":",", "x":10.5, "y":4.25}, - {"label":".", "x":11.5, "y":4.25}, - {"label":"/", "x":12.5, "y":4.25}, - {"label":"Shift", "x":13.5, "y":4.25, "w":2.75}, - {"label":"Up", "x":17.75, "y":3.75}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, - {"label":"Alt", "x":1.5, "y":5.25, "w":1.25}, - {"label":"Cmd", "x":2.75, "y":5.25, "w":1.5}, - {"label":"Space", "x":4.25, "y":5.25, "w":2.75}, - {"label":"Space", "x":8, "y":5.25, "w":2.75}, - {"label":"Cmd", "x":10.75, "y":5.25, "w":1.5}, - {"label":"Alt", "x":12.25, "y":5.25, "w":1.25}, - {"label":"Ctrl", "x":13.5, "y":5.25, "w":1.5}, - {"label":"Menu", "x":15, "y":5.25, "w":1.25}, - {"label":"Left", "x":16.75, "y":4.75}, - {"label":"Down", "x":17.75, "y":4.75}, - {"label":"Right", "x":18.75, "y":4.75} + {"matrix": [0, 1], "x": 0.5, "y": 0, "w": 1.75}, + + {"matrix": [0, 3], "x": 2.75, "y": 0}, + {"matrix": [0, 4], "x": 3.75, "y": 0}, + {"matrix": [0, 5], "x": 4.75, "y": 0}, + {"matrix": [0, 6], "x": 5.75, "y": 0}, + + {"matrix": [0, 7], "x": 8.25, "y": 0}, + {"matrix": [0, 8], "x": 9.25, "y": 0}, + {"matrix": [0, 9], "x": 10.25, "y": 0}, + {"matrix": [0, 10], "x": 11.25, "y": 0}, + + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + + {"matrix": [0, 15], "x": 16.75, "y": 0}, + {"matrix": [0, 16], "x": 17.75, "y": 0}, + {"matrix": [0, 17], "x": 18.75, "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": 8, "y": 1.25, "w": 1.5}, + {"matrix": [1, 8], "x": 9.5, "y": 1.25}, + {"matrix": [1, 9], "x": 10.5, "y": 1.25}, + {"matrix": [1, 10], "x": 11.5, "y": 1.25}, + {"matrix": [1, 11], "x": 12.5, "y": 1.25}, + {"matrix": [1, 12], "x": 13.5, "y": 1.25}, + {"matrix": [1, 14], "x": 14.5, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 16.75, "y": 1.25}, + {"matrix": [1, 16], "x": 17.75, "y": 1.25}, + {"matrix": [1, 17], "x": 18.75, "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, "w": 1.5}, + + {"matrix": [2, 7], "x": 8, "y": 2.25}, + {"matrix": [2, 8], "x": 9, "y": 2.25}, + {"matrix": [2, 9], "x": 10, "y": 2.25}, + {"matrix": [2, 10], "x": 11, "y": 2.25}, + {"matrix": [2, 11], "x": 12, "y": 2.25}, + {"matrix": [2, 12], "x": 13, "y": 2.25}, + {"matrix": [2, 13], "x": 14, "y": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 16.75, "y": 2.25}, + {"matrix": [2, 16], "x": 17.75, "y": 2.25}, + {"matrix": [2, 17], "x": 18.75, "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, "w": 1.25}, + + {"matrix": [3, 7], "x": 8, "y": 3.25, "w": 1.25}, + {"matrix": [3, 8], "x": 9.25, "y": 3.25}, + {"matrix": [3, 9], "x": 10.25, "y": 3.25}, + {"matrix": [3, 10], "x": 11.25, "y": 3.25}, + {"matrix": [3, 11], "x": 12.25, "y": 3.25}, + {"matrix": [3, 12], "x": 13.25, "y": 3.25}, + {"matrix": [3, 14], "x": 14.25, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4.25}, + {"matrix": [4, 2], "x": 3, "y": 4.25}, + {"matrix": [4, 3], "x": 4, "y": 4.25}, + {"matrix": [4, 4], "x": 5, "y": 4.25}, + {"matrix": [4, 5], "x": 6, "y": 4.25}, + + {"matrix": [4, 7], "x": 8, "y": 4.25, "w": 1.5}, + {"matrix": [4, 8], "x": 9.5, "y": 4.25}, + {"matrix": [4, 9], "x": 10.5, "y": 4.25}, + {"matrix": [4, 10], "x": 11.5, "y": 4.25}, + {"matrix": [4, 11], "x": 12.5, "y": 4.25}, + {"matrix": [4, 14], "x": 13.5, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 17.75, "y": 3.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.75, "y": 5.25, "w": 1.5}, + {"matrix": [5, 4], "x": 4.25, "y": 5.25, "w": 2.75}, + + {"matrix": [5, 7], "x": 8, "y": 5.25, "w": 2.75}, + {"matrix": [5, 9], "x": 10.75, "y": 5.25, "w": 1.5}, + {"matrix": [5, 11], "x": 12.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 13.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 14], "x": 15, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 16.75, "y": 4.75}, + {"matrix": [5, 16], "x": 17.75, "y": 4.75}, + {"matrix": [5, 17], "x": 18.75, "y": 4.75} ] } } diff --git a/keyboards/nek_type_a/nek_type_a.h b/keyboards/nek_type_a/nek_type_a.h index 78f019c0fd6f..dda9e2bddee6 100644 --- a/keyboards/nek_type_a/nek_type_a.h +++ b/keyboards/nek_type_a/nek_type_a.h @@ -38,21 +38,3 @@ extern uint8_t expander_input_pin_mask; extern bool i2c_initialized; void init_expander(void); - -#define XXX KC_NO - -#define LAYOUT( \ - L12, L14, L15, L16, L17, R11, R12, R13, R14, R15, R16, R17, R18, R19, R1A, R1B, \ - L21, L22, L23, L24, L25, L26, L27, R21, R22, R23, R24, R25, R26, R28, R29, R2A, R2B, \ - L31, L32, L33, L34, L35, L36, R31, R32, R33, R34, R35, R36, R37, R38, R39, R3A, R3B, \ - L41, L42, L43, L44, L45, L46, R41, R42, R43, R44, R45, R46, R48, \ - L51, L52, L53, L54, L55, L56, R51, R52, R53, R54, R55, R58, R5A, \ - L61, L62, L63, L65, R61, R63, R65, R66, R68, R69, R6A, R6B \ -) { \ - { XXX, L12, XXX, L14, L15, L16, L17, R11, R12, R13, R14, R15, R16, R17, R18, R19, R1A, R1B }, \ - { L21, L22, L23, L24, L25, L26, L27, R21, R22, R23, R24, R25, R26, XXX, R28, R29, R2A, R2B }, \ - { L31, L32, L33, L34, L35, L36, XXX, R31, R32, R33, R34, R35, R36, R37, R38, R39, R3A, R3B }, \ - { L41, L42, L43, L44, L45, L46, XXX, R41, R42, R43, R44, R45, R46, XXX, R48, XXX, XXX, XXX }, \ - { L51, L52, L53, L54, L55, L56, XXX, R51, R52, R53, R54, R55, XXX, XXX, R58, XXX, R5A, XXX }, \ - { L61, L62, L63, XXX, L65, XXX, XXX, R61, XXX, R63, XXX, R65, R66, XXX, R68, R69, R6A, R6B } \ -} diff --git a/keyboards/nemui/info.json b/keyboards/nemui/info.json index 933961ade7ff..867512a8f574 100644 --- a/keyboards/nemui/info.json +++ b/keyboards/nemui/info.json @@ -16,289 +16,81 @@ "processor": "STM32F072", "bootloader": "stm32-dfu", "layouts": { - "LAYOUT": { - "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": 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, - "w": 2.25 - }, - { - "x": 15, - "y": 2 - }, - { - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "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 - } - ] -} -} + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] + } + } } diff --git a/keyboards/nemui/nemui.h b/keyboards/nemui/nemui.h deleted file mode 100644 index 87c9626ed379..000000000000 --- a/keyboards/nemui/nemui.h +++ /dev/null @@ -1,34 +0,0 @@ - /* Copyright 2020 Bachoo - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, \ - k40, k41, k42, k45, k49, k4a, k4b, k4c, k4e \ -){ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, k3e }, \ - { k40, k41, k42, ___, ___, k45, ___, ___, ___, k49, k4a, k4b, k4c, ___, k4e } \ -} diff --git a/keyboards/nightly_boards/alter_lite/alter_lite.h b/keyboards/nightly_boards/alter_lite/alter_lite.h deleted file mode 100644 index a268512daef3..000000000000 --- a/keyboards/nightly_boards/alter_lite/alter_lite.h +++ /dev/null @@ -1,41 +0,0 @@ - /* Copyright 2020 DeskDaily - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \ - K10, K11, K12, K13, K14, K15, K16, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K21, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K31, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, \ - K41, K44, K45, K46, K48, K4B, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F }, \ - { K10, K11, K12, K13, K14, K15, K16, KC_NO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, K21, KC_NO, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, KC_NO, K2F }, \ - { KC_NO, K31, KC_NO, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F }, \ - { KC_NO, K41, KC_NO, KC_NO, K44, K45, K46, KC_NO, K48, KC_NO, KC_NO, K4B, KC_NO, KC_NO, K4E, KC_NO }, \ -} diff --git a/keyboards/nightly_boards/alter_lite/info.json b/keyboards/nightly_boards/alter_lite/info.json index 10f3c038434e..4fe29568a01a 100644 --- a/keyboards/nightly_boards/alter_lite/info.json +++ b/keyboards/nightly_boards/alter_lite/info.json @@ -24,76 +24,84 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.5, "y":0}, - {"x":1.75, "y":0.1}, - {"x":2.75, "y":0.1}, - {"x":3.75, "y":0.1}, - {"x":4.75, "y":0.1}, - {"x":5.75, "y":0.1}, - {"x":6.75, "y":0.1}, - {"x":7.75, "y":0.1}, - {"x":11.25, "y":0.1}, - {"x":12.25, "y":0.1}, - {"x":13.25, "y":0.1}, - {"x":14.25, "y":0.1}, - {"x":15.25, "y":0.1}, - {"x":16.25, "y":0.1}, - {"x":17.25, "y":0.1}, - {"x":18.25, "y":0.1}, + {"label": "K00", "matrix": [0, 0], "x": 0.5, "y": 0}, - {"x":0.25, "y":1}, - {"x":1.5, "y":1.1, "w":1.5}, - {"x":3, "y":1.1}, - {"x":4.25, "y":1.1}, - {"x":5.25, "y":1.1}, - {"x":6.25, "y":1.1}, - {"x":7.25, "y":1.1}, - {"x":10.75, "y":1.1}, - {"x":11.75, "y":1.1}, - {"x":12.75, "y":1.1}, - {"x":13.75, "y":1.1}, - {"x":15, "y":1.1}, - {"x":16, "y":1.1}, - {"x":17, "y":1.1}, - {"x":18, "y":1.1, "w":1.5}, + {"label": "K01", "matrix": [0, 1], "x": 1.75, "y": 0.1}, + {"label": "K02", "matrix": [0, 2], "x": 2.75, "y": 0.1}, + {"label": "K03", "matrix": [0, 3], "x": 3.75, "y": 0.1}, + {"label": "K04", "matrix": [0, 4], "x": 4.75, "y": 0.1}, + {"label": "K05", "matrix": [0, 5], "x": 5.75, "y": 0.1}, + {"label": "K06", "matrix": [0, 6], "x": 6.75, "y": 0.1}, + {"label": "K07", "matrix": [0, 7], "x": 7.75, "y": 0.1}, - {"x":0, "y":2}, - {"x":1.25, "y":2.1, "w":1.75}, - {"x":3, "y":2.1}, - {"x":4.5, "y":2.1}, - {"x":5.5, "y":2.1}, - {"x":6.5, "y":2.1}, - {"x":7.5, "y":2.1}, - {"x":11, "y":2.1}, - {"x":12, "y":2.1}, - {"x":13, "y":2.1}, - {"x":14, "y":2.1}, - {"x":15.5, "y":2.1}, - {"x":16.5, "y":2.1}, - {"x":17.5, "y":2.1, "w":2.25}, + {"label": "K08", "matrix": [0, 8], "x": 11.25, "y": 0.1}, + {"label": "K09", "matrix": [0, 9], "x": 12.25, "y": 0.1}, + {"label": "K0A", "matrix": [0, 10], "x": 13.25, "y": 0.1}, + {"label": "K0B", "matrix": [0, 11], "x": 14.25, "y": 0.1}, + {"label": "K0C", "matrix": [0, 12], "x": 15.25, "y": 0.1}, + {"label": "K0D", "matrix": [0, 13], "x": 16.25, "y": 0.1}, + {"label": "K0E", "matrix": [0, 14], "x": 17.25, "y": 0.1}, + {"label": "K0F", "matrix": [0, 15], "x": 18.25, "y": 0.1}, - {"x":1, "y":3.1, "w":2.25}, - {"x":3.25, "y":3.1}, - {"x":5, "y":3.1}, - {"x":6, "y":3.1}, - {"x":7, "y":3.1}, - {"x":8, "y":3.1}, - {"x":10.5, "y":3.1}, - {"x":11.5, "y":3.1}, - {"x":12.5, "y":3.1}, - {"x":13.5, "y":3.1}, - {"x":15.25, "y":3.1}, - {"x":16.25, "y":3.1}, - {"x":17.25, "y":3.1, "w":1.75}, - {"x":19, "y":3.1}, + {"label": "K10", "matrix": [1, 0], "x": 0.25, "y": 1}, - {"x":1, "y":4.1, "w":1.5}, - {"x":4.75, "y":4.1, "w":1.5}, - {"x":6.25, "y":4.1, "w":2}, - {"x":8.25, "y":4.1, "w":1.25}, - {"x":10.5, "y":4.1, "w":2.75}, - {"x":13.25, "y":4.1, "w":1.5}, - {"x":18.25, "y":4.1, "w":1.5} + {"label": "K11", "matrix": [1, 1], "x": 1.5, "y": 1.1, "w": 1.5}, + {"label": "K12", "matrix": [1, 2], "x": 3, "y": 1.1}, + {"label": "K13", "matrix": [1, 3], "x": 4.25, "y": 1.1}, + {"label": "K14", "matrix": [1, 4], "x": 5.25, "y": 1.1}, + {"label": "K15", "matrix": [1, 5], "x": 6.25, "y": 1.1}, + {"label": "K16", "matrix": [1, 6], "x": 7.25, "y": 1.1}, + + {"label": "K18", "matrix": [1, 8], "x": 10.75, "y": 1.1}, + {"label": "K19", "matrix": [1, 9], "x": 11.75, "y": 1.1}, + {"label": "K1A", "matrix": [1, 10], "x": 12.75, "y": 1.1}, + {"label": "K1B", "matrix": [1, 11], "x": 13.75, "y": 1.1}, + {"label": "K1C", "matrix": [1, 12], "x": 15, "y": 1.1}, + {"label": "K1D", "matrix": [1, 13], "x": 16, "y": 1.1}, + {"label": "K1E", "matrix": [1, 14], "x": 17, "y": 1.1}, + {"label": "K1F", "matrix": [1, 15], "x": 18, "y": 1.1, "w": 1.5}, + + {"label": "K20", "matrix": [2, 0], "x": 0, "y": 2}, + + {"label": "K21", "matrix": [2, 1], "x": 1.25, "y": 2.1, "w": 1.75}, + {"label": "K23", "matrix": [2, 3], "x": 3, "y": 2.1}, + {"label": "K24", "matrix": [2, 4], "x": 4.5, "y": 2.1}, + {"label": "K25", "matrix": [2, 5], "x": 5.5, "y": 2.1}, + {"label": "K26", "matrix": [2, 6], "x": 6.5, "y": 2.1}, + {"label": "K27", "matrix": [2, 7], "x": 7.5, "y": 2.1}, + + {"label": "K28", "matrix": [2, 8], "x": 11, "y": 2.1}, + {"label": "K29", "matrix": [2, 9], "x": 12, "y": 2.1}, + {"label": "K2A", "matrix": [2, 10], "x": 13, "y": 2.1}, + {"label": "K2B", "matrix": [2, 11], "x": 14, "y": 2.1}, + {"label": "K2C", "matrix": [2, 12], "x": 15.5, "y": 2.1}, + {"label": "K2D", "matrix": [2, 13], "x": 16.5, "y": 2.1}, + {"label": "K2F", "matrix": [2, 15], "x": 17.5, "y": 2.1, "w": 2.25}, + + {"label": "K31", "matrix": [3, 1], "x": 1, "y": 3.1, "w": 2.25}, + {"label": "K33", "matrix": [3, 3], "x": 3.25, "y": 3.1}, + {"label": "K34", "matrix": [3, 4], "x": 5, "y": 3.1}, + {"label": "K35", "matrix": [3, 5], "x": 6, "y": 3.1}, + {"label": "K36", "matrix": [3, 6], "x": 7, "y": 3.1}, + {"label": "K37", "matrix": [3, 7], "x": 8, "y": 3.1}, + + {"label": "K38", "matrix": [3, 8], "x": 10.5, "y": 3.1}, + {"label": "K39", "matrix": [3, 9], "x": 11.5, "y": 3.1}, + {"label": "K3A", "matrix": [3, 10], "x": 12.5, "y": 3.1}, + {"label": "K3B", "matrix": [3, 11], "x": 13.5, "y": 3.1}, + {"label": "K3C", "matrix": [3, 12], "x": 15.25, "y": 3.1}, + {"label": "K3D", "matrix": [3, 13], "x": 16.25, "y": 3.1}, + {"label": "K3E", "matrix": [3, 14], "x": 17.25, "y": 3.1, "w": 1.75}, + {"label": "K3F", "matrix": [3, 15], "x": 19, "y": 3.1}, + + {"label": "K41", "matrix": [4, 1], "x": 1, "y": 4.1, "w": 1.5}, + {"label": "K44", "matrix": [4, 4], "x": 4.75, "y": 4.1, "w": 1.5}, + {"label": "K45", "matrix": [4, 5], "x": 6.25, "y": 4.1, "w": 2}, + {"label": "K46", "matrix": [4, 6], "x": 8.25, "y": 4.1, "w": 1.25}, + + {"label": "K48", "matrix": [4, 8], "x": 10.5, "y": 4.1, "w": 2.75}, + {"label": "K4B", "matrix": [4, 11], "x": 13.25, "y": 4.1, "w": 1.5}, + {"label": "K4E", "matrix": [4, 14], "x": 18.25, "y": 4.1, "w": 1.5} ] } } diff --git a/keyboards/nightly_boards/conde60/conde60.h b/keyboards/nightly_boards/conde60/conde60.h deleted file mode 100644 index e660946a77ff..000000000000 --- a/keyboards/nightly_boards/conde60/conde60.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2022 DeskDaily - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K44, K46, K47, K49, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D }, \ - { K40, K41, K42, KC_NO, K44, KC_NO, K46, K47, KC_NO, K49, KC_NO, K4B, K4C, K4D }, \ -} diff --git a/keyboards/nightly_boards/conde60/info.json b/keyboards/nightly_boards/conde60/info.json index 3fda17eb2c99..9688c39ff0e7 100644 --- a/keyboards/nightly_boards/conde60/info.json +++ b/keyboards/nightly_boards/conde60/info.json @@ -21,76 +21,77 @@ "layouts": { "LAYOUT": { "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":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":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, "w":2.25}, - - {"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":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":2.25}, - {"x":6.25, "y":4}, - {"x":7.25, "y":4}, - {"x":8.25, "y":4, "w":2.75}, - {"x":11, "y":4, "w":1.5}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4, "w":1.5}] + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [1, 13], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [2, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6.25, "y": 4}, + {"matrix": [4, 7], "x": 7.25, "y": 4}, + {"matrix": [4, 9], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} + ] } } } \ No newline at end of file diff --git a/keyboards/nightly_boards/jisoo/info.json b/keyboards/nightly_boards/jisoo/info.json index 9c2ea8545330..d155c918b5c7 100644 --- a/keyboards/nightly_boards/jisoo/info.json +++ b/keyboards/nightly_boards/jisoo/info.json @@ -17,93 +17,104 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0}, - {"x":15, "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}, - {"x":14, "y":1.25}, - {"x":15, "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, "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, "y":3.25}, - {"x":0, "y":4.25, "w":1.25}, - {"x":1.25, "y":4.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, "y":4.25}, - {"x":15, "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":2}, - {"x":5.75, "y":5.25}, - {"x":6.75, "y":5.25}, - {"x":7.75, "y":5.25, "w":2.25}, - {"x":10, "y":5.25, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":13, "y":5.25}, - {"x":14, "y":5.25}, - {"x":15, "y":5.25} - ] + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + + {"matrix": [0, 6], "x": 6, "y": 0}, + {"matrix": [0, 7], "x": 7, "y": 0}, + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + + {"matrix": [0, 15], "x": 15, "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}, + {"matrix": [1, 14], "x": 14, "y": 1.25}, + {"matrix": [1, 15], "x": 15, "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, 15], "x": 15, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3.25}, + {"matrix": [3, 7], "x": 6.75, "y": 3.25}, + {"matrix": [3, 8], "x": 7.75, "y": 3.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3.25}, + {"matrix": [3, 12], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [3, 15], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": 1.75}, + {"matrix": [4, 14], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 15, "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, 4], "x": 3.75, "y": 5.25, "w": 2}, + {"matrix": [5, 6], "x": 5.75, "y": 5.25}, + {"matrix": [5, 7], "x": 6.75, "y": 5.25}, + {"matrix": [5, 9], "x": 7.75, "y": 5.25, "w": 2.25}, + {"matrix": [5, 10], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 11.25, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 13], "x": 13, "y": 5.25}, + {"matrix": [5, 14], "x": 14, "y": 5.25}, + {"matrix": [5, 15], "x": 15, "y": 5.25} + ] } } + } \ No newline at end of file diff --git a/keyboards/nightly_boards/jisoo/jisoo.h b/keyboards/nightly_boards/jisoo/jisoo.h deleted file mode 100644 index 6d822bb42f6e..000000000000 --- a/keyboards/nightly_boards/jisoo/jisoo.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2022 DeskDaily - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4D, K4E, K4F, \ - K50, K51, K52, K54, K56, K57, K59, K5A, K5C, K5D, K5E, K5F \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, 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, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, KC_NO, K4D, K4E, K4F }, \ - { K50, K51, K52, KC_NO, K54, KC_NO, K56, K57, KC_NO, K59, K5A, KC_NO, K5C, K5D, K5E, K5F }, \ -} diff --git a/keyboards/nightly_boards/ph_arisu/info.json b/keyboards/nightly_boards/ph_arisu/info.json index 640760fd10fa..43cd5ad1a0c6 100644 --- a/keyboards/nightly_boards/ph_arisu/info.json +++ b/keyboards/nightly_boards/ph_arisu/info.json @@ -17,7 +17,89 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":8.5, "y":0}, {"label":"0,4", "x":9.5, "y":0}, {"label":"1,4", "x":10.5, "y":0}, {"label":"0,5", "x":11.5, "y":0}, {"label":"1,5", "x":12.5, "y":0}, {"label":"0,6", "x":13.5, "y":0}, {"label":"1,6", "x":14.5, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"2,7", "x":16.8, "y":0}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":8, "y":1}, {"label":"3,3", "x":9, "y":1}, {"label":"2,4", "x":10, "y":1}, {"label":"3,4", "x":11, "y":1}, {"label":"2,5", "x":12, "y":1}, {"label":"3,5", "x":13, "y":1}, {"label":"2,6", "x":14, "y":1}, {"label":"3,6", "x":15, "y":1, "w":1.5}, {"label":"4,7", "x":16.8, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"5,0", "x":1.75, "y":2}, {"label":"4,1", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":8.25, "y":2}, {"label":"5,3", "x":9.25, "y":2}, {"label":"4,4", "x":10.25, "y":2}, {"label":"5,4", "x":11.25, "y":2}, {"label":"4,5", "x":12.25, "y":2}, {"label":"5,5", "x":13.25, "y":2}, {"label":"4,6", "x":14.25, "y":2, "w":2.25}, {"label":"6,7", "x":16.8, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"7,0", "x":2.25, "y":3}, {"label":"6,1", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":8.75, "y":3}, {"label":"7,3", "x":9.75, "y":3}, {"label":"6,4", "x":10.75, "y":3}, {"label":"7,4", "x":11.75, "y":3}, {"label":"6,5", "x":12.75, "y":3}, {"label":"7,5", "x":13.75, "y":3, "w":1.75}, {"label":"7,6", "x":15.75, "y":3.25}, {"label":"8,0", "x":0, "y":4, "w":1.5}, {"label":"8,1", "x":2.75, "y":4, "w":1.5}, {"label":"8,2", "x":4.25, "y":4, "w":2}, {"label":"9,2", "x":6.25, "y":4, "w":1.25}, {"label":"9,3", "x":8.25, "y":4, "w":2.75}, {"label":"9,4", "x":11, "y":4, "w":1.5}, {"label":"8,6", "x":14.75, "y":4.25}, {"label":"9,6", "x":15.75, "y":4.25}, {"label":"8,7", "x":16.75, "y":4.25}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + + {"matrix": [1, 3], "x": 8.5, "y": 0}, + {"matrix": [0, 4], "x": 9.5, "y": 0}, + {"matrix": [1, 4], "x": 10.5, "y": 0}, + {"matrix": [0, 5], "x": 11.5, "y": 0}, + {"matrix": [1, 5], "x": 12.5, "y": 0}, + {"matrix": [0, 6], "x": 13.5, "y": 0}, + {"matrix": [1, 6], "x": 14.5, "y": 0}, + {"matrix": [0, 7], "x": 15.5, "y": 0}, + + {"matrix": [2, 7], "x": 16.8, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + + {"matrix": [2, 3], "x": 8, "y": 1}, + {"matrix": [3, 3], "x": 9, "y": 1}, + {"matrix": [2, 4], "x": 10, "y": 1}, + {"matrix": [3, 4], "x": 11, "y": 1}, + {"matrix": [2, 5], "x": 12, "y": 1}, + {"matrix": [3, 5], "x": 13, "y": 1}, + {"matrix": [2, 6], "x": 14, "y": 1}, + {"matrix": [3, 6], "x": 15, "y": 1, "w": 1.5}, + + {"matrix": [4, 7], "x": 16.8, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + + {"matrix": [4, 3], "x": 8.25, "y": 2}, + {"matrix": [5, 3], "x": 9.25, "y": 2}, + {"matrix": [4, 4], "x": 10.25, "y": 2}, + {"matrix": [5, 4], "x": 11.25, "y": 2}, + {"matrix": [4, 5], "x": 12.25, "y": 2}, + {"matrix": [5, 5], "x": 13.25, "y": 2}, + {"matrix": [4, 6], "x": 14.25, "y": 2, "w": 2.25}, + + {"matrix": [6, 7], "x": 16.8, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + + {"matrix": [6, 3], "x": 8.75, "y": 3}, + {"matrix": [7, 3], "x": 9.75, "y": 3}, + {"matrix": [6, 4], "x": 10.75, "y": 3}, + {"matrix": [7, 4], "x": 11.75, "y": 3}, + {"matrix": [6, 5], "x": 12.75, "y": 3}, + {"matrix": [7, 5], "x": 13.75, "y": 3, "w": 1.75}, + + {"matrix": [7, 6], "x": 15.75, "y": 3.25}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [8, 1], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4, "w": 2}, + {"matrix": [9, 2], "x": 6.25, "y": 4, "w": 1.25}, + + {"matrix": [9, 3], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [9, 4], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [8, 6], "x": 14.75, "y": 4.25}, + {"matrix": [9, 6], "x": 15.75, "y": 4.25}, + {"matrix": [8, 7], "x": 16.75, "y": 4.25} + ] } } } diff --git a/keyboards/nightly_boards/ph_arisu/ph_arisu.h b/keyboards/nightly_boards/ph_arisu/ph_arisu.h deleted file mode 100644 index 85e5a9381065..000000000000 --- a/keyboards/nightly_boards/ph_arisu/ph_arisu.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K010, K001, K011, K002, K012, K003, K013, K004, K014, K005, K015, K006, K016, K007, K027, \ - K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K047, \ - K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K067, \ - K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K076, \ - K080, K081, K082, K092, K093, K094, K086, K096, K087 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007 }, \ - { K010, K011, K012, K013, K014, K015, K016, KC_NO }, \ - { K020, K021, K022, K023, K024, K025, K026, K027 }, \ - { K030, K031, K032, K033, K034, K035, K036, KC_NO }, \ - { K040, K041, K042, K043, K044, K045, K046, K047 }, \ - { K050, K051, K052, K053, K054, K055, KC_NO, KC_NO }, \ - { K060, K061, K062, K063, K064, K065, KC_NO, K067 }, \ - { K070, K071, K072, K073, K074, K075, K076, KC_NO }, \ - { K080, K081, K082, KC_NO, KC_NO, KC_NO, K086, K087 }, \ - { KC_NO, KC_NO, K092, K093, K094, KC_NO, K096, KC_NO } \ -} diff --git a/keyboards/nix_studio/n60_a/info.json b/keyboards/nix_studio/n60_a/info.json index 7d8f44b432d5..dc04bfca6a5a 100644 --- a/keyboards/nix_studio/n60_a/info.json +++ b/keyboards/nix_studio/n60_a/info.json @@ -18,69 +18,73 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "K00 (E6,F6)", "x": 0, "y": 0 }, - { "label": "K01 (E6,B0)", "x": 1, "y": 0 }, - { "label": "K02 (E6,F1)", "x": 2, "y": 0 }, - { "label": "K03 (E6,C7)", "x": 3, "y": 0 }, - { "label": "K04 (E6,C6)", "x": 4, "y": 0 }, - { "label": "K05 (E6,B6)", "x": 5, "y": 0 }, - { "label": "K06 (E6,B5)", "x": 6, "y": 0 }, - { "label": "K07 (E6,B4)", "x": 7, "y": 0 }, - { "label": "K08 (E6,D7)", "x": 8, "y": 0 }, - { "label": "K09 (E6,D6)", "x": 9, "y": 0 }, - { "label": "K0A (E6,D4)", "x": 10, "y": 0 }, - { "label": "K0B (E6,D5)", "x": 11, "y": 0 }, - { "label": "K0C (E6,D3)", "x": 12, "y": 0 }, - { "label": "K0D (E6,D2)", "x": 13, "y": 0 }, - { "label": "K0E (E6,D1)", "x": 14, "y": 0 }, - { "label": "K10 (B7,F6)", "x": 0, "y": 1, "w": 1.5 }, - { "label": "K11 (B7,B0)", "x": 1.5, "y": 1 }, - { "label": "K12 (B7,F1)", "x": 2.5, "y": 1 }, - { "label": "K13 (B7,C7)", "x": 3.5, "y": 1 }, - { "label": "K14 (B7,C6)", "x": 4.5, "y": 1 }, - { "label": "K15 (B7,B6)", "x": 5.5, "y": 1 }, - { "label": "K16 (B7,B5)", "x": 6.5, "y": 1 }, - { "label": "K17 (B7,B4)", "x": 7.5, "y": 1 }, - { "label": "K18 (B7,D7)", "x": 8.5, "y": 1 }, - { "label": "K19 (B7,D6)", "x": 9.5, "y": 1 }, - { "label": "K1A (B7,D4)", "x": 10.5, "y": 1 }, - { "label": "K1B (B7,D5)", "x": 11.5, "y": 1 }, - { "label": "K1C (B7,D3)", "x": 12.5, "y": 1 }, - { "label": "K1D (B7,D2)", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "K20 (F7,F6)", "x": 0, "y": 2, "w": 1.75 }, - { "label": "K21 (F7,B0)", "x": 1.75, "y": 2 }, - { "label": "K22 (F7,F1)", "x": 2.75, "y": 2 }, - { "label": "K23 (F7,C7)", "x": 3.75, "y": 2 }, - { "label": "K24 (F7,C6)", "x": 4.75, "y": 2 }, - { "label": "K25 (F7,B6)", "x": 5.75, "y": 2 }, - { "label": "K26 (F7,B5)", "x": 6.75, "y": 2 }, - { "label": "K27 (F7,B4)", "x": 7.75, "y": 2 }, - { "label": "K28 (F7,D7)", "x": 8.75, "y": 2 }, - { "label": "K29 (F7,D6)", "x": 9.75, "y": 2 }, - { "label": "K2A (F7,D4)", "x": 10.75, "y": 2 }, - { "label": "K2B (F7,D5)", "x": 11.75, "y": 2 }, - { "label": "K2D (F7,D2)", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "K30 (F4,F6)", "x": 0, "y": 3, "w": 2.25 }, - { "label": "K32 (F4,F1)", "x": 2.25, "y": 3 }, - { "label": "K33 (F4,C7)", "x": 3.25, "y": 3 }, - { "label": "K34 (F4,C6)", "x": 4.25, "y": 3 }, - { "label": "K35 (F4,B6)", "x": 5.25, "y": 3 }, - { "label": "K36 (F4,B5)", "x": 6.25, "y": 3 }, - { "label": "K37 (F4,B4)", "x": 7.25, "y": 3 }, - { "label": "K38 (F4,D7)", "x": 8.25, "y": 3 }, - { "label": "K39 (F4,D6)", "x": 9.25, "y": 3 }, - { "label": "K3A (F4,D4)", "x": 10.25, "y": 3 }, - { "label": "K3B (F4,D5)", "x": 11.25, "y": 3 }, - { "label": "K3C (F4,D3)", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "K3D (F4,D2)", "x": 14, "y": 3 }, - { "label": "K40 (F5,F6)", "x": 0, "y": 4, "w": 1.25 }, - { "label": "K41 (F5,B0)", "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "K42 (F5,F1)", "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "K46 (F5,B5)", "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "K4A (F5,D4)", "x": 10, "y": 4, "w": 1.25 }, - { "label": "K4B (F5,D5)", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "K4C (F5,D3)", "x": 12.5, "y": 4, "w": 1.25 }, - { "label": "K4D (F5,D2)", "x": 13.75, "y": 4, "w": 1.25 } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/nix_studio/n60_a/n60_a.h b/keyboards/nix_studio/n60_a/n60_a.h deleted file mode 100644 index 0f5e03747a64..000000000000 --- a/keyboards/nix_studio/n60_a/n60_a.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright Nix Studio & Valdiieee - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K46, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, XXX }, \ - { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, XXX }, \ - { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, XXX, K4A, K4B, K4C, K4D, XXX }, \ -} diff --git a/keyboards/nopunin10did/railroad/rev0/info.json b/keyboards/nopunin10did/railroad/rev0/info.json index 752078f2f645..04c3f7e5e9ee 100644 --- a/keyboards/nopunin10did/railroad/rev0/info.json +++ b/keyboards/nopunin10did/railroad/rev0/info.json @@ -18,114 +18,103 @@ "layouts": { "LAYOUT": { "layout": [ - {"y":0, "x":0, "label":"Scroll"}, - {"y":0, "x":1, "label":"Pause"}, - {"y":0, "x":2, "label":"Esc"}, - {"y":0, "x":3, "label":"`"}, - {"y":0, "x":4, "label":"1"}, - {"y":0, "x":5, "label":"2"}, - {"y":0, "x":6, "label":"3"}, - {"y":0, "x":7, "label":"4"}, - {"y":0, "x":8, "label":"5"}, - {"y":0, "x":9, "label":"-"}, - - {"y":1, "x":0, "label":"Print"}, - {"y":1, "x":1, "label":"Backspace", "w":1.5}, - {"y":1, "x":2.5, "label":"Tab", "w":1.5}, - {"y":1, "x":4, "label":"Q"}, - {"y":1, "x":5, "label":"W"}, - {"y":1, "x":6, "label":"E"}, - {"y":1, "x":7, "label":"R"}, - {"y":1, "x":8, "label":"T"}, - {"y":1, "x":9, "label":"["}, - - {"y":2, "x":0, "label":"Caps", "w":1.25}, - {"y":2, "x":1.75, "label":"Control", "w":2.25}, - {"y":2, "x":4, "label":"A"}, - {"y":2, "x":5, "label":"S"}, - {"y":2, "x":6, "label":"D"}, - {"y":2, "x":7, "label":"F"}, - {"y":2, "x":8, "label":"G"}, - {"y":2, "x":9, "label":"PgUp"}, - - {"y":3.25, "x":0, "label":"Cut"}, - {"y":3, "x":1.25, "label":"Shift", "w":2.75}, - {"y":3, "x":4, "label":"Z"}, - {"y":3, "x":5, "label":"X"}, - {"y":3, "x":6, "label":"C"}, - {"y":3, "x":7, "label":"V"}, - {"y":3, "x":8, "label":"B"}, - {"y":3, "x":9, "label":"PgDn"}, - - {"y":4.25, "x":0, "label":"Copy"}, - {"y":4.25, "x":1, "label":"Paste"}, - {"y":4, "x":2.25, "label":"Control", "w":1.5}, - {"y":4, "x":3.75, "label":"Super", "w":1.25}, - {"y":4, "x":5, "label":"Alt", "w":1.25}, - {"y":4.25, "x":6.5, "label":"UK \\|"}, - {"y":4.25, "x":7.5, "label":"Space", "w":1.75}, - {"y":4.25, "x":9.25, "label":"Shift / Del", "w":2.75}, - - {"y":0, "x":10.25, "label":"F1"}, - {"y":0, "x":11.25, "label":"F5"}, - {"y":0, "x":12.25, "label":"F9"}, - {"y":1, "x":10.25, "label":"F2"}, - {"y":1, "x":11.25, "label":"F6"}, - {"y":1, "x":12.25, "label":"F10"}, - {"y":2, "x":10.25, "label":"F3"}, - {"y":2, "x":11.25, "label":"F7"}, - {"y":2, "x":12.25, "label":"F11"}, - {"y":3, "x":10.25, "label":"F4"}, - {"y":3, "x":11.25, "label":"F8"}, - {"y":3, "x":12.25, "label":"F12"}, - - {"y":0, "x":13.5, "label":"="}, - {"y":0, "x":14.5, "label":"6"}, - {"y":0, "x":15.5, "label":"7"}, - {"y":0, "x":16.5, "label":"8"}, - {"y":0, "x":17.5, "label":"9"}, - {"y":0, "x":18.5, "label":"0"}, - {"y":0, "x":19.5, "label":"Backspace", "w":2}, - {"y":0, "x":21.5, "label":"Ins"}, - {"y":0, "x":22.5, "label":"Esc"}, - - {"y":1, "x":13.5, "label":"]"}, - {"y":1, "x":14.5, "label":"Y"}, - {"y":1, "x":15.5, "label":"U"}, - {"y":1, "x":16.5, "label":"I"}, - {"y":1, "x":17.5, "label":"O"}, - {"y":1, "x":18.5, "label":"P"}, - {"y":1, "x":19.5, "label":"\\", "w":1.5}, - {"y":1, "x":21, "label":"Del"}, - - {"y":2, "x":13.5, "label":"Home"}, - {"y":2, "x":14.5, "label":"H"}, - {"y":2, "x":15.5, "label":"J"}, - {"y":2, "x":16.5, "label":"K"}, - {"y":2, "x":17.5, "label":"L"}, - {"y":2, "x":18.5, "label":";"}, - {"y":2, "x":19.5, "label":"'"}, - {"y":2, "x":20.5, "label":"Return", "w":1.75}, - - {"y":1, "x":22.25, "label":"ISO Enter", "h":2, "w":1.25}, - - {"y":3, "x":13.5, "label":"End"}, - {"y":3, "x":14.5, "label":"N"}, - {"y":3, "x":15.5, "label":"M"}, - {"y":3, "x":16.5, "label":","}, - {"y":3, "x":17.5, "label":"."}, - {"y":3, "x":18.5, "label":"/"}, - {"y":3, "x":19.5, "label":"Shift", "w":1.75}, - {"y":3.25, "x":21.5, "label":"Up"}, - - {"y":4.25, "x":12, "label":"LShftAlt / Calc", "w":2.25}, - {"y":4.25, "x":14.25, "label":"Space", "w":1.75}, - {"y":4.25, "x":16, "label":"UK #~"}, - {"y":4, "x":17.25, "label":"AltGr / Home", "w":1.5}, - {"y":4, "x":18.75, "label":"Ctrl / End", "w":1.5}, - {"y":4.25, "x":20.5, "label":"Left"}, - {"y":4.25, "x":21.5, "label":"Down"}, - {"y":4.25, "x":22.5, "label":"Right"} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [5, 0], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [2, 1], "x": 2.5, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 4, "y": 1}, + {"matrix": [2, 2], "x": 5, "y": 1}, + {"matrix": [3, 2], "x": 6, "y": 1}, + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [4, 1], "x": 1.75, "y": 2, "w": 2.25}, + {"matrix": [5, 1], "x": 4, "y": 2}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [6, 0], "x": 0, "y": 3.25}, + {"matrix": [6, 1], "x": 1.25, "y": 3, "w": 2.75}, + {"matrix": [7, 1], "x": 4, "y": 3}, + {"matrix": [6, 2], "x": 5, "y": 3}, + {"matrix": [7, 2], "x": 6, "y": 3}, + {"matrix": [6, 3], "x": 7, "y": 3}, + {"matrix": [7, 3], "x": 8, "y": 3}, + {"matrix": [6, 4], "x": 9, "y": 3}, + {"matrix": [8, 0], "x": 0, "y": 4.25}, + {"matrix": [9, 0], "x": 1, "y": 4.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [9, 1], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [8, 2], "x": 5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 6.5, "y": 4.25}, + {"matrix": [9, 3], "x": 7.5, "y": 4.25, "w": 1.75}, + {"matrix": [9, 4], "x": 9.25, "y": 4.25, "w": 2.75}, + {"matrix": [1, 4], "x": 10.25, "y": 0}, + {"matrix": [0, 5], "x": 11.25, "y": 0}, + {"matrix": [1, 5], "x": 12.25, "y": 0}, + {"matrix": [3, 4], "x": 10.25, "y": 1}, + {"matrix": [2, 5], "x": 11.25, "y": 1}, + {"matrix": [3, 5], "x": 12.25, "y": 1}, + {"matrix": [5, 4], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [6, 5], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3}, + {"matrix": [0, 6], "x": 13.5, "y": 0}, + {"matrix": [1, 6], "x": 14.5, "y": 0}, + {"matrix": [0, 7], "x": 15.5, "y": 0}, + {"matrix": [1, 7], "x": 16.5, "y": 0}, + {"matrix": [0, 8], "x": 17.5, "y": 0}, + {"matrix": [1, 8], "x": 18.5, "y": 0}, + {"matrix": [0, 9], "x": 19.5, "y": 0, "w": 2}, + {"matrix": [1, 9], "x": 21.5, "y": 0}, + {"matrix": [0, 10], "x": 22.5, "y": 0}, + {"matrix": [2, 6], "x": 13.5, "y": 1}, + {"matrix": [3, 6], "x": 14.5, "y": 1}, + {"matrix": [2, 7], "x": 15.5, "y": 1}, + {"matrix": [3, 7], "x": 16.5, "y": 1}, + {"matrix": [2, 8], "x": 17.5, "y": 1}, + {"matrix": [3, 8], "x": 18.5, "y": 1}, + {"matrix": [2, 9], "x": 19.5, "y": 1, "w": 1.5}, + {"matrix": [3, 9], "x": 21, "y": 1}, + {"matrix": [4, 6], "x": 13.5, "y": 2}, + {"matrix": [5, 6], "x": 14.5, "y": 2}, + {"matrix": [4, 7], "x": 15.5, "y": 2}, + {"matrix": [5, 7], "x": 16.5, "y": 2}, + {"matrix": [4, 8], "x": 17.5, "y": 2}, + {"matrix": [5, 8], "x": 18.5, "y": 2}, + {"matrix": [4, 9], "x": 19.5, "y": 2}, + {"matrix": [5, 9], "x": 20.5, "y": 2, "w": 1.75}, + {"matrix": [4, 10], "x": 22.25, "y": 1, "w": 1.25, "h": 2}, + {"matrix": [6, 6], "x": 13.5, "y": 3}, + {"matrix": [7, 6], "x": 14.5, "y": 3}, + {"matrix": [6, 7], "x": 15.5, "y": 3}, + {"matrix": [7, 7], "x": 16.5, "y": 3}, + {"matrix": [6, 8], "x": 17.5, "y": 3}, + {"matrix": [7, 8], "x": 18.5, "y": 3}, + {"matrix": [6, 9], "x": 19.5, "y": 3, "w": 1.75}, + {"matrix": [7, 9], "x": 21.5, "y": 3.25}, + {"matrix": [9, 5], "x": 12, "y": 4.25, "w": 2.25}, + {"matrix": [9, 6], "x": 14.25, "y": 4.25, "w": 1.75}, + {"matrix": [9, 7], "x": 16, "y": 4.25}, + {"matrix": [8, 8], "x": 17.25, "y": 4, "w": 1.5}, + {"matrix": [9, 8], "x": 18.75, "y": 4, "w": 1.5}, + {"matrix": [8, 9], "x": 20.5, "y": 4.25}, + {"matrix": [9, 9], "x": 21.5, "y": 4.25}, + {"matrix": [8, 10], "x": 22.5, "y": 4.25} ] } } diff --git a/keyboards/nopunin10did/railroad/rev0/rev0.h b/keyboards/nopunin10did/railroad/rev0/rev0.h deleted file mode 100644 index ff7c31524ea3..000000000000 --- a/keyboards/nopunin10did/railroad/rev0/rev0.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@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 . - */ - -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ -\ - K0000, K0500, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, \ - K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, \ - K0400, K0401, K0501, K0402, K0502, K0403, K0503, K0404, \ - K0600, K0601, K0701, K0602, K0702, K0603, K0703, K0604, \ - K0800, K0900, K0801, K0901, K0802, K0902, K0903, K0904,\ -\ - K0104, K0005, K0105, \ - K0304, K0205, K0305, \ - K0504, K0405, K0505, \ - K0704, K0605, K0705, \ -\ - K0006, K0106, K0007, K0107, K0008, K0108, K0009, K0109, K0010, \ - K0206, K0306, K0207, K0307, K0208, K0308, K0209, K0309, \ - K0406, K0506, K0407, K0507, K0408, K0508, K0409, K0509, K0410, \ - K0606, K0706, K0607, K0707, K0608, K0708, K0609, K0709, \ - K0905, K0906, K0907, K0808, K0908, K0809, K0909, K0810 \ -) \ -{ \ - { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0010 }, \ - { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, KC_NO }, \ - { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, KC_NO }, \ - { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, KC_NO }, \ - { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, K0410 }, \ - { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509, KC_NO }, \ - { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, K0609, KC_NO }, \ - { KC_NO, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, K0709, KC_NO }, \ - { K0800, K0801, K0802, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0808, K0809, K0810 }, \ - { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908, K0909, KC_NO } \ -} diff --git a/keyboards/noxary/280/280.c b/keyboards/noxary/280/280.c index 1743ebc0d587..8bece8dee18c 100644 --- a/keyboards/noxary/280/280.c +++ b/keyboards/noxary/280/280.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "280.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/noxary/280/280.h b/keyboards/noxary/280/280.h deleted file mode 100644 index 1a93c8c6be7c..000000000000 --- a/keyboards/noxary/280/280.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2019 MechMerlin - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - K000, K002, K103, K004, K105, K006, K107, K008, K109, K111, K012, K113, K014, K115, K016, K117, \ - K200, K301, K202, K303, K204, K305, K206, K307, K208, K309, K210, K311, K212, K313, K214, K315, K216, K317, \ - K400, K501, K402, K503, K404, K505, K406, K507, K408, K509, K410, K511, K412, K414, K515, K416, K517, \ - K600, K701, K602, K703, K604, K705, K606, K707, K608, K709, K610, K711, K612, K614, \ - K800, K901, K802, K903, K804, K905, K806, K907, K808, K909, K810, K911, K812, K814, K816, \ - K1000,K1101,K1002, K1006, K1010,K1111,K1012, K1014,K1115,K1016,K1117\ -) { \ - { K000, K002, K004, K006, K008, KC_NO, K012, K014, K016 },\ - { KC_NO, K103, K105, K107, K109, K111, K113, K115, K117 },\ - { K200, K202, K204, K206, K208, K210, K212, K214, K216 },\ - { K301, K303, K305, K307, K309, K311, K313, K315, K317 },\ - { K400, K402, K404, K406, K408, K410, K412, K414, K416 },\ - { K501, K503, K505, K507, K509, K511, KC_NO, K515, K517 },\ - { K600, K602, K604, K606, K608, K610, K612, K614, KC_NO },\ - { K701, K703, K705, K707, K709, K711, KC_NO, KC_NO, KC_NO },\ - { K800, K802, K804, K806, K808, K810, K812, K814, K816 },\ - { K901, K903, K905, K907, K909, K911, KC_NO, KC_NO, KC_NO },\ - { K1000, K1002, KC_NO, K1006, KC_NO, K1010, K1012, K1014, K1016 },\ - { K1101, KC_NO, KC_NO, KC_NO, KC_NO, K1111, KC_NO, K1115, K1117 }\ -} diff --git a/keyboards/noxary/280/info.json b/keyboards/noxary/280/info.json index bb5ac51819ca..c170e987f5ea 100644 --- a/keyboards/noxary/280/info.json +++ b/keyboards/noxary/280/info.json @@ -21,7 +21,112 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"x":13.75, "y":3.5, "w":1.25}, {"x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [0, 3], "x": 6.5, "y": 0}, + {"matrix": [1, 3], "x": 7.5, "y": 0}, + {"matrix": [0, 4], "x": 8.5, "y": 0}, + {"matrix": [1, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [1, 7], "x": 15.25, "y": 0}, + {"matrix": [0, 8], "x": 16.25, "y": 0}, + {"matrix": [1, 8], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5}, + {"matrix": [2, 7], "x": 14, "y": 1.5}, + + {"matrix": [3, 7], "x": 15.25, "y": 1.5}, + {"matrix": [2, 8], "x": 16.25, "y": 1.5}, + {"matrix": [3, 8], "x": 17.25, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 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": [5, 7], "x": 15.25, "y": 2.5}, + {"matrix": [4, 8], "x": 16.25, "y": 2.5}, + {"matrix": [5, 8], "x": 17.25, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [6, 6], "x": 12.75, "y": 3.5}, + {"matrix": [6, 7], "x": 13.75, "y": 3.5, "w": 1.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4.5}, + {"matrix": [8, 1], "x": 2.25, "y": 4.5}, + {"matrix": [9, 1], "x": 3.25, "y": 4.5}, + {"matrix": [8, 2], "x": 4.25, "y": 4.5}, + {"matrix": [9, 2], "x": 5.25, "y": 4.5}, + {"matrix": [8, 3], "x": 6.25, "y": 4.5}, + {"matrix": [9, 3], "x": 7.25, "y": 4.5}, + {"matrix": [8, 4], "x": 8.25, "y": 4.5}, + {"matrix": [9, 4], "x": 9.25, "y": 4.5}, + {"matrix": [8, 5], "x": 10.25, "y": 4.5}, + {"matrix": [9, 5], "x": 11.25, "y": 4.5}, + {"matrix": [8, 6], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [8, 7], "x": 14, "y": 4.5}, + + {"matrix": [8, 8], "x": 16.25, "y": 4.5}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 3], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [10, 7], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 7], "x": 15.25, "y": 5.5}, + {"matrix": [10, 8], "x": 16.25, "y": 5.5}, + {"matrix": [11, 8], "x": 17.25, "y": 5.5} + ] } } } diff --git a/keyboards/noxary/vulcan/info.json b/keyboards/noxary/vulcan/info.json index 94ba75dad91e..87e37de6b178 100644 --- a/keyboards/noxary/vulcan/info.json +++ b/keyboards/noxary/vulcan/info.json @@ -18,68 +18,72 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Back Space", "x":13, "y":0}, - {"label":"Delete", "x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Fn", "x":14, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4}, - {"label":"Alt", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":7}, - {"label":"Alt", "x":11, "y":4, "w":1.5}, - {"label":"Win", "x":12.5, "y":4}, - {"label":"Ctrl", "x":13.5, "y":4, "w":1.5} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 12], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 12.5, "y": 4}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/noxary/vulcan/vulcan.h b/keyboards/noxary/vulcan/vulcan.h deleted file mode 100644 index 97ac40ff3b0f..000000000000 --- a/keyboards/noxary/vulcan/vulcan.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Ryota Goto - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K410, K411, K412, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413 } \ -} diff --git a/keyboards/noxary/x268/info.json b/keyboards/noxary/x268/info.json index 3b47943e977a..1bfcf109f442 100644 --- a/keyboards/noxary/x268/info.json +++ b/keyboards/noxary/x268/info.json @@ -24,77 +24,81 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"MINUS", "x":11, "y":0}, - {"label":"EQUAL", "x":12, "y":0}, - {"label":"BACKSLASH", "x":13, "y":0}, - {"label":"BACKSPACE", "x":14, "y":0}, - {"label":"GRAVE", "x":15, "y":0}, - {"label":"TAB", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"LBRACKET", "x":11.5, "y":1}, - {"label":"RBRACKET", "x":12.5, "y":1}, - {"label":"BACKSLASH", "x":13.5, "y":1, "w":1.5}, - {"label":"DELETE", "x":15, "y":1}, - {"label":"CAPS LOCK", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":"SEMICOLON", "x":10.75, "y":2}, - {"label":"QUOTE", "x":11.75, "y":2}, - {"label":"ISO HASH", "x":12.75, "y":2}, - {"label":"ENTER", "x":13.75, "y":2, "w":1.25}, - {"label":"PAGE UP", "x":15, "y":2}, - {"label":"LSHIFT", "x":0, "y":3, "w":1.25}, - {"label":"ISO BACKSLASH", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"COMMA", "x":9.25, "y":3}, - {"label":"PERIOD", "x":10.25, "y":3}, - {"label":"SLASH", "x":11.25, "y":3}, - {"label":"RSHIFT", "x":12.25, "y":3, "w":1.75}, - {"label":"UP", "x":14, "y":3}, - {"label":"PAGE DOWN", "x":15, "y":3}, - {"label":"LCTRL", "x":0, "y":4, "w":1.25}, - {"label":"LGUI", "x":1.25, "y":4, "w":1.25}, - {"label":"LALT", "x":2.5, "y":4, "w":1.25}, - {"label":"SPACE", "x":3.75, "y":4, "w":6.25}, - {"label":"LALT", "x":10, "y":4}, - {"label":"FN", "x":11, "y":4}, - {"label":"RCTRL", "x":12, "y":4}, - {"label":"LEFT", "x":13, "y":4}, - {"label":"DOWN", "x":14, "y":4}, - {"label":"RIGHT", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/noxary/x268/x268.c b/keyboards/noxary/x268/x268.c index 589d59deff8b..54c37b2079c5 100644 --- a/keyboards/noxary/x268/x268.c +++ b/keyboards/noxary/x268/x268.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "x268.h" +#include "quantum.h" // Optional override functions below. // You can leave any or all of these undefined. diff --git a/keyboards/noxary/x268/x268.h b/keyboards/noxary/x268/x268.h deleted file mode 100644 index d2f63dc919e6..000000000000 --- a/keyboards/noxary/x268/x268.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2018 Rozakiin - * - * 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 XXX KC_NO - -#define LAYOUT( \ - 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, k1E, k1F, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2E, k2F, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E, k3F, \ - k40, k41, k42, k46, k49, k4A, k4B, k4C, k4E, k4F \ -) { \ - { 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, XXX, k1E, k1F }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, k3F }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4A, k4B, k4C, XXX, k4E, k4F } \ -} diff --git a/keyboards/nullbitsco/tidbit/info.json b/keyboards/nullbitsco/tidbit/info.json index e2e060aef053..0ed0a5e7b856 100644 --- a/keyboards/nullbitsco/tidbit/info.json +++ b/keyboards/nullbitsco/tidbit/info.json @@ -28,11 +28,42 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"/", "x":3.25, "y":0}, {"label":"*", "x":4.25, "y":0}, {"label":"-", "x":5.25, "y":0}, - {"label":"Enc 1", "x":0, "y":1}, {"label":"Enc 1", "x":1, "y":1}, {"label":"7", "x":2.25, "y":1}, {"label":"8", "x":3.25, "y":1}, {"label":"9", "x":4.25, "y":1}, {"label":"+", "x":5.25, "y":1}, - {"label":"Enc 2", "x":0, "y":2}, {"label":"Enc 2", "x":1, "y":2}, {"label":"4", "x":2.25, "y":2}, {"label":"5", "x":3.25, "y":2}, {"label":"6", "x":4.25, "y":2}, {"label":"+", "x":5.25, "y":2}, - {"label":"Enc 3", "x":0, "y":3}, {"label":"Enc 3", "x":1, "y":3}, {"label":"1", "x":2.25, "y":3}, {"label":"2", "x":3.25, "y":3}, {"label":"3", "x":4.25, "y":3}, {"label":"Enter", "x":5.25, "y":3}, - {"label":"Enc 4", "x":0, "y":4}, {"label":"Enc 4", "x":1, "y":4}, {"label":"0", "x":2.25, "y":4}, {"label":"0", "x":3.25, "y":4}, {"label":".", "x":4.25, "y":4}, {"label":"Enter", "x":5.25, "y":4}] + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4} + ] } } } diff --git a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c index 995aff8d6919..6cd9f48c94df 100644 --- a/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c +++ b/keyboards/nullbitsco/tidbit/keymaps/default/keymap.c @@ -31,10 +31,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNC] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c index 3fbfb638ecd0..255502653419 100644 --- a/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c +++ b/keyboards/nullbitsco/tidbit/keymaps/oled/keymap.c @@ -33,26 +33,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_VIA1] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_VIA2] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_VIA3] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c index cfe97e30a371..32306ef9d6cf 100644 --- a/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c +++ b/keyboards/nullbitsco/tidbit/keymaps/snailmap_lite/keymap.c @@ -33,27 +33,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LAY1] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_LAY2] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_LAY3] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c index ad3e18075cc0..895b02c2925c 100644 --- a/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c +++ b/keyboards/nullbitsco/tidbit/keymaps/via/keymap.c @@ -33,27 +33,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_VIA1] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_VIA2] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), [_VIA3] = LAYOUT( - ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___, - ___, ___, ___, ___, ___, ___ + _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/nullbitsco/tidbit/tidbit.c b/keyboards/nullbitsco/tidbit/tidbit.c index d07ba12651f6..eea5a5d54c0a 100644 --- a/keyboards/nullbitsco/tidbit/tidbit.c +++ b/keyboards/nullbitsco/tidbit/tidbit.c @@ -14,7 +14,9 @@ * along with this program. If not, see . */ -#include "tidbit.h" +#include "quantum.h" +#include "common/remote_kb.h" +#include "common/bitc_led.h" typedef struct PACKED { uint8_t r; diff --git a/keyboards/nullbitsco/tidbit/tidbit.h b/keyboards/nullbitsco/tidbit/tidbit.h deleted file mode 100644 index e4e80107e3ce..000000000000 --- a/keyboards/nullbitsco/tidbit/tidbit.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Jay Greco - * - * 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 - -#define ___ KC_NO - -#include "quantum.h" -#include "common/remote_kb.h" -#include "common/bitc_led.h" - -#define LAYOUT( \ - K01, K02, K03, \ - E1CCW, E1CW, K10, K11, K12, K13, \ - E2CCW, E2CW, K20, K21, K22, K23, \ - E3CCW, E3CW, K30, K31, K32, K33, \ - E4CCW, E4CW, K40, K41, K42, K43 \ -) \ -{ \ - { ___, ___, ___, K01, K02, K03 }, \ - { E1CCW, E1CW, K10, K11, K12, K13 }, \ - { E2CCW, E2CW, K20, K21, K22, K23 }, \ - { E3CCW, E3CW, K30, K31, K32, K33 }, \ - { E4CCW, E4CW, K40, K41, K42, K43 } \ -} diff --git a/keyboards/numatreus/info.json b/keyboards/numatreus/info.json index c7e31c6c61e1..92e067d043ed 100644 --- a/keyboards/numatreus/info.json +++ b/keyboards/numatreus/info.json @@ -20,7 +20,57 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0.6}, {"x":1, "y":0.35}, {"x":2, "y":0}, {"x":3, "y":0.35}, {"x":4, "y":0.7}, {"x":8, "y":0.7}, {"x":9, "y":0.35}, {"x":10, "y":0}, {"x":11, "y":0.35}, {"x":12, "y":0.6}, {"x":0, "y":1.6}, {"x":1, "y":1.35}, {"x":2, "y":1}, {"x":3, "y":1.35}, {"x":4, "y":1.7}, {"x":8, "y":1.7}, {"x":9, "y":1.35}, {"x":10, "y":1}, {"x":11, "y":1.35}, {"x":12, "y":1.6}, {"x":0, "y":2.6}, {"x":1, "y":2.35}, {"x":2, "y":2}, {"x":3, "y":2.35}, {"x":4, "y":2.7}, {"x":8, "y":2.7}, {"x":9, "y":2.35}, {"x":10, "y":2}, {"x":11, "y":2.35}, {"x":12, "y":2.6}, {"x":0, "y":3.6}, {"x":1, "y":3.35}, {"x":2, "y":3}, {"x":3, "y":3.35}, {"x":4, "y":3.7}, {"x":5, "y":2.95, "h":1.5}, {"x":7, "y":2.95, "h":1.5}, {"x":8, "y":3.7}, {"x":9, "y":3.35}, {"x":10, "y":3}, {"x":11, "y":3.35}, {"x":12, "y":3.6}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0.35}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.35}, + {"matrix": [0, 4], "x": 4, "y": 0.7}, + + {"matrix": [0, 6], "x": 8, "y": 0.7}, + {"matrix": [0, 7], "x": 9, "y": 0.35}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.35}, + {"matrix": [0, 10], "x": 12, "y": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 1.6}, + {"matrix": [1, 1], "x": 1, "y": 1.35}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.35}, + {"matrix": [1, 4], "x": 4, "y": 1.7}, + + {"matrix": [1, 6], "x": 8, "y": 1.7}, + {"matrix": [1, 7], "x": 9, "y": 1.35}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.35}, + {"matrix": [1, 10], "x": 12, "y": 1.6}, + + {"matrix": [2, 0], "x": 0, "y": 2.6}, + {"matrix": [2, 1], "x": 1, "y": 2.35}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.35}, + {"matrix": [2, 4], "x": 4, "y": 2.7}, + + {"matrix": [2, 6], "x": 8, "y": 2.7}, + {"matrix": [2, 7], "x": 9, "y": 2.35}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.35}, + {"matrix": [2, 10], "x": 12, "y": 2.6}, + + {"matrix": [3, 0], "x": 0, "y": 3.6}, + {"matrix": [3, 1], "x": 1, "y": 3.35}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.35}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [2, 5], "x": 5, "y": 2.95, "h": 1.5}, + + {"matrix": [3, 5], "x": 7, "y": 2.95, "h": 1.5}, + {"matrix": [3, 6], "x": 8, "y": 3.7}, + {"matrix": [3, 7], "x": 9, "y": 3.35}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 9], "x": 11, "y": 3.35}, + {"matrix": [3, 10], "x": 12, "y": 3.6} + ] } } } diff --git a/keyboards/numatreus/numatreus.h b/keyboards/numatreus/numatreus.h deleted file mode 100644 index 6ec56504ab74..000000000000 --- a/keyboards/numatreus/numatreus.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \ -) \ -{ \ - { k00, k01, k02, k03, k04, KC_NO, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, KC_NO, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k35, k25, k26, k27, k28, k29 }, \ - { k30, k31, k32, k33, k34, k36, k37, k38, k39, k3a, k3b } \ -} diff --git a/keyboards/ocean/addon/addon.h b/keyboards/ocean/addon/addon.h deleted file mode 100644 index 82bc2eee279a..000000000000 --- a/keyboards/ocean/addon/addon.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 Ocean - * - * 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 XXX KC_NO - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, \ - K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, K26, \ - K30, K31, K32, K33, K34, K35, K36, \ - K40, K41, K42, K43, K44, K45, K46 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, K33, K34, K35, K36 }, \ - { K40, K41, K42, K43, K44, K45, K46 } \ -} diff --git a/keyboards/ocean/addon/info.json b/keyboards/ocean/addon/info.json index df9313dd49db..013f8b6ab76e 100644 --- a/keyboards/ocean/addon/info.json +++ b/keyboards/ocean/addon/info.json @@ -18,41 +18,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3.25, "y":0}, - {"x":4.25, "y":0}, - {"x":5.25, "y":0}, - {"x":6.25, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3.25, "y":3}, - {"x":4.25, "y":3}, - {"x":5.25, "y":3}, - {"x":6.25, "y":3}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3.25, "y":4}, - {"x":4.25, "y":4}, - {"x":5.25, "y":4}, - {"x":6.25, "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.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 4.25, "y": 4}, + {"matrix": [4, 5], "x": 5.25, "y": 4}, + {"matrix": [4, 6], "x": 6.25, "y": 4} + ] } } } \ No newline at end of file diff --git a/keyboards/ocean/gin_v2/gin_v2.h b/keyboards/ocean/gin_v2/gin_v2.h deleted file mode 100644 index dd457dcc926f..000000000000 --- a/keyboards/ocean/gin_v2/gin_v2.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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 XXX KC_NO - -#define LAYOUT(\ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K27, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K47, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K67, \ - K60, K70, K61, K71, K62, K72, K63, K74, K65, K75, K66, K76 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, XXX }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, XXX }, \ - { K40, K41, K42, K43, K44, K45, K46, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, XXX }, \ - { K60, K61, K62, K63, XXX, K65, K66, K67 }, \ - { K70, K71, K72, XXX, K74, K75, K76, XXX } \ -} diff --git a/keyboards/ocean/gin_v2/info.json b/keyboards/ocean/gin_v2/info.json index 5f1b1c6ce64e..b5e7cdddd7d0 100644 --- a/keyboards/ocean/gin_v2/info.json +++ b/keyboards/ocean/gin_v2/info.json @@ -18,67 +18,71 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0}, - {"x": 6.25, "y": 0}, - {"x": 7.25, "y": 0}, - {"x": 8.25, "y": 0}, - {"x": 9.25, "y": 0}, - {"x": 10.25, "y": 0}, - {"x": 11.25, "y": 0}, - {"x": 12.25, "y": 0}, - {"x": 13.25, "y": 0}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, - {"x": 0, "y": 1}, - {"x": 1, "y": 1}, - {"x": 2, "y": 1}, - {"x": 3.25, "y": 1, "w": 1.25}, - {"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}, - {"x": 14.5, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 3.25, "y": 0}, + {"matrix": [0, 2], "x": 4.25, "y": 0}, + {"matrix": [1, 2], "x": 5.25, "y": 0}, + {"matrix": [0, 3], "x": 6.25, "y": 0}, + {"matrix": [1, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [1, 4], "x": 9.25, "y": 0}, + {"matrix": [0, 5], "x": 10.25, "y": 0}, + {"matrix": [1, 5], "x": 11.25, "y": 0}, + {"matrix": [0, 6], "x": 12.25, "y": 0}, + {"matrix": [1, 6], "x": 13.25, "y": 0}, + {"matrix": [0, 7], "x": 14.25, "y": 0}, + {"matrix": [2, 7], "x": 15.25, "y": 0}, - {"x": 0, "y": 2}, - {"x": 1, "y": 2}, - {"x": 2, "y": 2}, - {"x": 3.25, "y": 2, "w": 1.75}, - {"x": 5, "y": 2}, - {"x": 6, "y": 2}, - {"x": 7, "y": 2}, - {"x": 8, "y": 2}, - {"x": 9, "y": 2}, - {"x": 10, "y": 2}, - {"x": 11, "y": 2}, - {"x": 12, "y": 2}, - {"x": 13, "y": 2}, - {"x": 14, "y": 2}, - {"x": 15, "y": 2, "w": 1.25}, + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, - {"x": 0, "y": 3}, - {"x": 1, "y": 3}, - {"x": 2, "y": 3}, - {"x": 3.25, "y": 3, "w": 1.25}, - {"x": 4.5, "y": 3, "w": 1.25}, - {"x": 5.75, "y": 3, "w": 1.25}, - {"x": 7, "y": 3, "w": 2.25}, - {"x": 9.25, "y": 3, "w": 2.75}, - {"x": 12, "y": 3, "w": 1.25}, - {"x": 13.25, "y": 3}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3} + {"matrix": [3, 1], "x": 3.25, "y": 1, "w": 1.25}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1}, + {"matrix": [4, 7], "x": 14.5, "y": 1, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + + {"matrix": [5, 1], "x": 3.25, "y": 2, "w": 1.75}, + {"matrix": [4, 2], "x": 5, "y": 2}, + {"matrix": [5, 2], "x": 6, "y": 2}, + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + {"matrix": [5, 5], "x": 12, "y": 2}, + {"matrix": [4, 6], "x": 13, "y": 2}, + {"matrix": [5, 6], "x": 14, "y": 2}, + {"matrix": [6, 7], "x": 15, "y": 2, "w": 1.25}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + + {"matrix": [7, 1], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [6, 2], "x": 4.5, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3, "w": 1.25}, + {"matrix": [6, 3], "x": 7, "y": 3, "w": 2.25}, + {"matrix": [7, 4], "x": 9.25, "y": 3, "w": 2.75}, + {"matrix": [6, 5], "x": 12, "y": 3, "w": 1.25}, + {"matrix": [7, 5], "x": 13.25, "y": 3}, + {"matrix": [6, 6], "x": 14.25, "y": 3}, + {"matrix": [7, 6], "x": 15.25, "y": 3} ] } } diff --git a/keyboards/ocean/slamz/info.json b/keyboards/ocean/slamz/info.json index f03ee04361f5..f919adba2bdf 100644 --- a/keyboards/ocean/slamz/info.json +++ b/keyboards/ocean/slamz/info.json @@ -17,7 +17,55 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}] + "layout": [ + {"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": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [2, 5], "x": 7, "y": 2}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + + {"matrix": [3, 5], "x": 7, "y": 3}, + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 9, "y": 3}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 9], "x": 11, "y": 3} + ] } } } diff --git a/keyboards/ocean/slamz/slamz.h b/keyboards/ocean/slamz/slamz.h deleted file mode 100644 index da990b0f56d1..000000000000 --- a/keyboards/ocean/slamz/slamz.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39 } \ -} diff --git a/keyboards/ocean/wang_v2/info.json b/keyboards/ocean/wang_v2/info.json index ef44989c5a17..b4747221a2c6 100644 --- a/keyboards/ocean/wang_v2/info.json +++ b/keyboards/ocean/wang_v2/info.json @@ -17,7 +17,58 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"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":0.75, "y":1, "w":1.25}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1, "w":1.75}, {"x":0.25, "y":2, "w":1.75}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.25}, {"x":5, "y":3, "w":2}, {"x":7, "y":3, "w":2}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 1, "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, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0.75, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"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": [2, 11], "x": 12, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 7, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3} + ] } } } diff --git a/keyboards/ocean/wang_v2/wang_v2.h b/keyboards/ocean/wang_v2/wang_v2.h deleted file mode 100644 index bcac9dd690cc..000000000000 --- a/keyboards/ocean/wang_v2/wang_v2.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Ocean - * - * 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(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - 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, K35, K36, K38, K39, K3A, K3B \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO }, \ - { K30, K31, K32, K33, KC_NO, K35, K36, KC_NO, K38, K39, K3A, K3B, KC_NO }, \ -} diff --git a/keyboards/ocean/yuri/info.json b/keyboards/ocean/yuri/info.json index 9bd45534c9ef..9b12250fb6b5 100644 --- a/keyboards/ocean/yuri/info.json +++ b/keyboards/ocean/yuri/info.json @@ -17,55 +17,66 @@ "bootloader": "caterina", "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.25, "y":0}, - {"x":6.25, "y":0}, - {"x":9.25, "y":0}, - {"x":10.25, "y":0}, - {"x":11.25, "y":0}, - {"x":12.25, "y":0}, - {"x":13.25, "y":0}, - {"x":14.25, "y":0}, - {"x":15.25, "y":0}, - {"x":0, "y":1}, - {"x":1.25, "y":1, "w":1.25}, - {"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":9.5, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1, "w":1.75}, - {"x":0, "y":2}, - {"x":1.25, "y":2, "w":1.75}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2, "w":1.25}, - {"x":1.25, "y":3, "w":1.5}, - {"x":2.75, "y":3, "w":1.25}, - {"x":4, "y":3, "w":1.5}, - {"x":5.5, "y":3, "w":2.25}, - {"x":9.5, "y":3, "w":2.75}, - {"x":12.25, "y":3, "w":1.25}, - {"x":13.5, "y":3, "w":1.25}, - {"x":14.75, "y":3, "w":1.5} + "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + + {"matrix": [0, 7], "x": 9.25, "y": 0}, + {"matrix": [0, 8], "x": 10.25, "y": 0}, + {"matrix": [0, 9], "x": 11.25, "y": 0}, + {"matrix": [0, 10], "x": 12.25, "y": 0}, + {"matrix": [0, 11], "x": 13.25, "y": 0}, + {"matrix": [0, 12], "x": 14.25, "y": 0}, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1}, + {"matrix": [1, 12], "x": 14.5, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + {"matrix": [2, 12], "x": 14, "y": 2}, + {"matrix": [2, 13], "x": 15, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 4, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 5.5, "y": 3, "w": 2.25}, + + {"matrix": [3, 4], "x": 9.5, "y": 3, "w": 2.75}, + {"matrix": [3, 5], "x": 12.25, "y": 3, "w": 1.25}, + {"matrix": [3, 6], "x": 13.5, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 14.75, "y": 3, "w": 1.5} ] } } diff --git a/keyboards/ocean/yuri/yuri.h b/keyboards/ocean/yuri/yuri.h deleted file mode 100644 index 3f8c2b17da3a..000000000000 --- a/keyboards/ocean/yuri/yuri.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2022 Ocean - * - * 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(\ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K31, K32, K33, K35, K38, K3A, K3C, K3D \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K31, K32, K33, K35, K38, K3A, K3C, K3D }, \ -} diff --git a/keyboards/oddball/info.json b/keyboards/oddball/info.json index 2eaca18e6551..8e21be5d6905 100644 --- a/keyboards/oddball/info.json +++ b/keyboards/oddball/info.json @@ -12,14 +12,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"sw1", "x":0, "y":0.37}, {"label":"sw2", "x":1, "y":0.37}, {"label":"sw3", "x":2, "y":0.12}, {"label":"sw4", "x":3, "y":0}, {"label":"sw5", "x":4, "y":0.12}, {"label":"sw6", "x":5, "y":0.25}, - {"label":"sw6", "x":8 , "y":0.25}, {"label":"sw5", "x":9 , "y":0.12}, {"label":"sw4", "x":10, "y":0}, {"label":"sw3", "x":11, "y":0.12}, {"label":"sw2", "x":12, "y":0.37}, {"label":"sw1", "x":13, "y":0.37}, - {"label":"sw7", "x":0, "y":1.37}, {"label":"sw8", "x":1, "y":1.37}, {"label":"sw9", "x":2, "y":1.12}, {"label":"sw10", "x":3, "y":1}, {"label":"sw11", "x":4, "y":1.12}, {"label":"sw12", "x":5, "y":1.25}, - {"label":"sw12", "x":8, "y":1.25}, {"label":"sw11", "x":9, "y":1.12}, {"label":"sw10", "x":10, "y":1}, {"label":"sw9", "x":11, "y":1.12}, {"label":"sw8", "x":12, "y":1.37}, {"label":"sw7", "x":13, "y":1.37}, - {"label":"sw13", "x":0, "y":2.37}, {"label":"sw14", "x":1, "y":2.37}, {"label":"sw15", "x":2, "y":2.12}, {"label":"sw16", "x":3, "y":2}, {"label":"sw17", "x":4, "y":2.12}, {"label":"sw18", "x":5, "y":2.25}, - {"label":"sw18", "x":8, "y":2.25}, {"label":"sw17", "x":9, "y":2.12}, {"label":"sw16", "x":10, "y":2}, {"label":"sw15", "x":11, "y":2.12}, {"label":"sw14", "x":12, "y":2.37}, {"label":"sw13", "x":13, "y":2.37}, - {"label":"sw19", "x":4.5, "y":3.5, "h":1.25}, {"label":"sw20", "x":5.5, "y":3.5, "h":1.25}, - {"label":"sw20", "x":7.5, "y":3.5, "h":1.25}, {"label":"sw19", "x":8.5, "y":3.5, "h":1.25} + {"matrix": [0, 0], "x": 0, "y": 0.37}, + {"matrix": [0, 1], "x": 1, "y": 0.37}, + {"matrix": [0, 2], "x": 2, "y": 0.12}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.12}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [4, 5], "x": 8, "y": 0.25}, + {"matrix": [4, 4], "x": 9, "y": 0.12}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0.12}, + {"matrix": [4, 1], "x": 12, "y": 0.37}, + {"matrix": [4, 0], "x": 13, "y": 0.37}, + + {"matrix": [1, 0], "x": 0, "y": 1.37}, + {"matrix": [1, 1], "x": 1, "y": 1.37}, + {"matrix": [1, 2], "x": 2, "y": 1.12}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.12}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [5, 5], "x": 8, "y": 1.25}, + {"matrix": [5, 4], "x": 9, "y": 1.12}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1.12}, + {"matrix": [5, 1], "x": 12, "y": 1.37}, + {"matrix": [5, 0], "x": 13, "y": 1.37}, + + {"matrix": [2, 0], "x": 0, "y": 2.37}, + {"matrix": [2, 1], "x": 1, "y": 2.37}, + {"matrix": [2, 2], "x": 2, "y": 2.12}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.12}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [6, 5], "x": 8, "y": 2.25}, + {"matrix": [6, 4], "x": 9, "y": 2.12}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2.12}, + {"matrix": [6, 1], "x": 12, "y": 2.37}, + {"matrix": [6, 0], "x": 13, "y": 2.37}, + + {"matrix": [3, 4], "x": 4.5, "y": 3.5, "h": 1.25}, + {"matrix": [3, 5], "x": 5.5, "y": 3.5, "h": 1.25}, + + {"matrix": [7, 5], "x": 7.5, "y": 3.5, "h": 1.25}, + {"matrix": [7, 4], "x": 8.5, "y": 3.5, "h": 1.25} ] } } diff --git a/keyboards/oddball/oddball.h b/keyboards/oddball/oddball.h index 2a8e2fd92dc7..7897621e2dea 100644 --- a/keyboards/oddball/oddball.h +++ b/keyboards/oddball/oddball.h @@ -18,23 +18,6 @@ #include "quantum.h" -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - LT1, LT2, RT1, RT2 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, LT1, LT2 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, RT2, RT1 } \ - } - enum custom_keycodes { KC_SCROLL = QK_KB_0, KC_CPI_1, diff --git a/keyboards/oddforge/vea/info.json b/keyboards/oddforge/vea/info.json index 713ea5186e24..d6586a09e8d0 100644 --- a/keyboards/oddforge/vea/info.json +++ b/keyboards/oddforge/vea/info.json @@ -23,7 +23,120 @@ "bootloader": "bootloadhid", "layouts": { "LAYOUT": { - "layout": [{"label":"5,0", "x":2.25, "y":0}, {"label":"5,1", "x":3.25, "y":0}, {"label":"5,2", "x":4.25, "y":0}, {"label":"5,3", "x":5.25, "y":0}, {"label":"5,4", "x":6.25, "y":0}, {"label":"5,5", "x":7.25, "y":0}, {"label":"5,6", "x":8.25, "y":0}, {"label":"5,8", "x":10.75, "y":0}, {"label":"5,9", "x":11.75, "y":0}, {"label":"5,10", "x":12.75, "y":0}, {"label":"5,11", "x":13.75, "y":0}, {"label":"5,12", "x":14.75, "y":0}, {"label":"5,13", "x":15.75, "y":0}, {"label":"6,11", "x":16.75, "y":0}, {"label":"7,11", "x":17.75, "y":0}, {"label":"6,13", "x":18.75, "y":0}, {"label":"6,1", "x":0, "y":1}, {"label":"7,1", "x":1, "y":1}, {"label":"4,0", "x":2.25, "y":1}, {"label":"4,1", "x":3.25, "y":1}, {"label":"4,2", "x":4.25, "y":1}, {"label":"4,3", "x":5.25, "y":1}, {"label":"4,4", "x":6.25, "y":1}, {"label":"4,5", "x":7.25, "y":1}, {"label":"4,6", "x":8.25, "y":1}, {"label":"4,8", "x":10.75, "y":1}, {"label":"4,9", "x":11.75, "y":1}, {"label":"4,10", "x":12.75, "y":1}, {"label":"4,11", "x":13.75, "y":1}, {"label":"4,12", "x":14.75, "y":1}, {"label":"4,13", "x":15.75, "y":1}, {"label":"4,14", "x":16.75, "y":1, "w":2}, {"label":"6,10", "x":18.75, "y":1}, {"label":"6,2", "x":0, "y":2}, {"label":"7,2", "x":1, "y":2}, {"label":"3,0", "x":2.25, "y":2, "w":1.5}, {"label":"3,1", "x":3.75, "y":2}, {"label":"3,2", "x":4.75, "y":2}, {"label":"3,3", "x":5.75, "y":2}, {"label":"3,4", "x":6.75, "y":2}, {"label":"3,5", "x":7.75, "y":2}, {"label":"1,8", "x":10.25, "y":2}, {"label":"1,9", "x":11.25, "y":2}, {"label":"1,10", "x":12.25, "y":2}, {"label":"1,11", "x":13.25, "y":2}, {"label":"1,12", "x":14.25, "y":2}, {"label":"1,13", "x":15.25, "y":2}, {"label":"1,14", "x":16.25, "y":2}, {"label":"2,14", "x":17.25, "y":2, "w":1.5}, {"label":"7,10", "x":18.75, "y":2}, {"label":"6,3", "x":0, "y":3}, {"label":"7,3", "x":1, "y":3}, {"label":"2,0", "x":2.25, "y":3, "w":1.75}, {"label":"2,1", "x":4, "y":3}, {"label":"2,2", "x":5, "y":3}, {"label":"2,3", "x":6, "y":3}, {"label":"2,4", "x":7, "y":3}, {"label":"2,5", "x":8, "y":3}, {"label":"2,8", "x":10.5, "y":3}, {"label":"2,9", "x":11.5, "y":3}, {"label":"2,10", "x":12.5, "y":3}, {"label":"2,11", "x":13.5, "y":3}, {"label":"2,12", "x":14.5, "y":3}, {"label":"2,13", "x":15.5, "y":3}, {"label":"3,13", "x":16.5, "y":3, "w":2.25}, {"label":"6,12", "x":18.75, "y":3}, {"label":"6,4", "x":0, "y":4}, {"label":"7,4", "x":1, "y":4}, {"label":"1,0", "x":2.25, "y":4, "w":2.25}, {"label":"1,1", "x":4.5, "y":4}, {"label":"1,2", "x":5.5, "y":4}, {"label":"1,3", "x":6.5, "y":4}, {"label":"1,4", "x":7.5, "y":4}, {"label":"1,5", "x":8.5, "y":4}, {"label":"3,8", "x":11, "y":4}, {"label":"3,9", "x":12, "y":4}, {"label":"3,10", "x":13, "y":4}, {"label":"3,11", "x":14, "y":4}, {"label":"3,12", "x":15, "y":4}, {"label":"3,14", "x":16, "y":4, "w":1.75}, {"label":"6,8", "x":17.75, "y":4}, {"label":"7,12", "x":18.75, "y":4}, {"label":"6,5", "x":0, "y":5}, {"label":"7,5", "x":1, "y":5}, {"label":"0,0", "x":2.25, "y":5, "w":1.25}, {"label":"0,1", "x":3.5, "y":5, "w":1.25}, {"label":"0,2", "x":4.75, "y":5, "w":1.25}, {"label":"7,7", "x":6, "y":5, "w":2}, {"label":"6,6", "x":8, "y":5}, {"label":"6,14", "x":10.5, "y":5, "w":2.75}, {"label":"0,10", "x":13.25, "y":5, "w":1.25}, {"label":"0,9", "x":14.5, "y":5}, {"label":"0,8", "x":15.5, "y":5, "w":1.25}, {"label":"7,8", "x":16.75, "y":5}, {"label":"6,9", "x":17.75, "y":5}, {"label":"7,9", "x":18.75, "y":5}] + "layout": [ + {"matrix": [5, 0], "x": 2.25, "y": 0}, + {"matrix": [5, 1], "x": 3.25, "y": 0}, + {"matrix": [5, 2], "x": 4.25, "y": 0}, + {"matrix": [5, 3], "x": 5.25, "y": 0}, + {"matrix": [5, 4], "x": 6.25, "y": 0}, + {"matrix": [5, 5], "x": 7.25, "y": 0}, + {"matrix": [5, 6], "x": 8.25, "y": 0}, + + {"matrix": [5, 8], "x": 10.75, "y": 0}, + {"matrix": [5, 9], "x": 11.75, "y": 0}, + {"matrix": [5, 10], "x": 12.75, "y": 0}, + {"matrix": [5, 11], "x": 13.75, "y": 0}, + {"matrix": [5, 12], "x": 14.75, "y": 0}, + {"matrix": [5, 13], "x": 15.75, "y": 0}, + {"matrix": [6, 11], "x": 16.75, "y": 0}, + {"matrix": [7, 11], "x": 17.75, "y": 0}, + {"matrix": [6, 13], "x": 18.75, "y": 0}, + + {"matrix": [6, 1], "x": 0, "y": 1}, + {"matrix": [7, 1], "x": 1, "y": 1}, + + {"matrix": [4, 0], "x": 2.25, "y": 1}, + {"matrix": [4, 1], "x": 3.25, "y": 1}, + {"matrix": [4, 2], "x": 4.25, "y": 1}, + {"matrix": [4, 3], "x": 5.25, "y": 1}, + {"matrix": [4, 4], "x": 6.25, "y": 1}, + {"matrix": [4, 5], "x": 7.25, "y": 1}, + {"matrix": [4, 6], "x": 8.25, "y": 1}, + + {"matrix": [4, 8], "x": 10.75, "y": 1}, + {"matrix": [4, 9], "x": 11.75, "y": 1}, + {"matrix": [4, 10], "x": 12.75, "y": 1}, + {"matrix": [4, 11], "x": 13.75, "y": 1}, + {"matrix": [4, 12], "x": 14.75, "y": 1}, + {"matrix": [4, 13], "x": 15.75, "y": 1}, + {"matrix": [4, 14], "x": 16.75, "y": 1, "w": 2}, + {"matrix": [6, 10], "x": 18.75, "y": 1}, + + {"matrix": [6, 2], "x": 0, "y": 2}, + {"matrix": [7, 2], "x": 1, "y": 2}, + + {"matrix": [3, 0], "x": 2.25, "y": 2, "w": 1.5}, + {"matrix": [3, 1], "x": 3.75, "y": 2}, + {"matrix": [3, 2], "x": 4.75, "y": 2}, + {"matrix": [3, 3], "x": 5.75, "y": 2}, + {"matrix": [3, 4], "x": 6.75, "y": 2}, + {"matrix": [3, 5], "x": 7.75, "y": 2}, + + {"matrix": [1, 8], "x": 10.25, "y": 2}, + {"matrix": [1, 9], "x": 11.25, "y": 2}, + {"matrix": [1, 10], "x": 12.25, "y": 2}, + {"matrix": [1, 11], "x": 13.25, "y": 2}, + {"matrix": [1, 12], "x": 14.25, "y": 2}, + {"matrix": [1, 13], "x": 15.25, "y": 2}, + {"matrix": [1, 14], "x": 16.25, "y": 2}, + {"matrix": [2, 14], "x": 17.25, "y": 2, "w": 1.5}, + {"matrix": [7, 10], "x": 18.75, "y": 2}, + + {"matrix": [6, 3], "x": 0, "y": 3}, + {"matrix": [7, 3], "x": 1, "y": 3}, + + {"matrix": [2, 0], "x": 2.25, "y": 3, "w": 1.75}, + {"matrix": [2, 1], "x": 4, "y": 3}, + {"matrix": [2, 2], "x": 5, "y": 3}, + {"matrix": [2, 3], "x": 6, "y": 3}, + {"matrix": [2, 4], "x": 7, "y": 3}, + {"matrix": [2, 5], "x": 8, "y": 3}, + + {"matrix": [2, 8], "x": 10.5, "y": 3}, + {"matrix": [2, 9], "x": 11.5, "y": 3}, + {"matrix": [2, 10], "x": 12.5, "y": 3}, + {"matrix": [2, 11], "x": 13.5, "y": 3}, + {"matrix": [2, 12], "x": 14.5, "y": 3}, + {"matrix": [2, 13], "x": 15.5, "y": 3}, + {"matrix": [3, 13], "x": 16.5, "y": 3, "w": 2.25}, + {"matrix": [6, 12], "x": 18.75, "y": 3}, + + {"matrix": [6, 4], "x": 0, "y": 4}, + {"matrix": [7, 4], "x": 1, "y": 4}, + + {"matrix": [1, 0], "x": 2.25, "y": 4, "w": 2.25}, + {"matrix": [1, 1], "x": 4.5, "y": 4}, + {"matrix": [1, 2], "x": 5.5, "y": 4}, + {"matrix": [1, 3], "x": 6.5, "y": 4}, + {"matrix": [1, 4], "x": 7.5, "y": 4}, + {"matrix": [1, 5], "x": 8.5, "y": 4}, + + {"matrix": [3, 8], "x": 11, "y": 4}, + {"matrix": [3, 9], "x": 12, "y": 4}, + {"matrix": [3, 10], "x": 13, "y": 4}, + {"matrix": [3, 11], "x": 14, "y": 4}, + {"matrix": [3, 12], "x": 15, "y": 4}, + {"matrix": [3, 14], "x": 16, "y": 4, "w": 1.75}, + {"matrix": [6, 8], "x": 17.75, "y": 4}, + {"matrix": [7, 12], "x": 18.75, "y": 4}, + + {"matrix": [6, 5], "x": 0, "y": 5}, + {"matrix": [7, 5], "x": 1, "y": 5}, + + {"matrix": [0, 0], "x": 2.25, "y": 5, "w": 1.25}, + {"matrix": [0, 1], "x": 3.5, "y": 5, "w": 1.25}, + {"matrix": [0, 2], "x": 4.75, "y": 5, "w": 1.25}, + {"matrix": [7, 7], "x": 6, "y": 5, "w": 2}, + {"matrix": [6, 6], "x": 8, "y": 5}, + + {"matrix": [6, 14], "x": 10.5, "y": 5, "w": 2.75}, + {"matrix": [0, 10], "x": 13.25, "y": 5, "w": 1.25}, + {"matrix": [0, 9], "x": 14.5, "y": 5}, + {"matrix": [0, 8], "x": 15.5, "y": 5, "w": 1.25}, + {"matrix": [7, 8], "x": 16.75, "y": 5}, + {"matrix": [6, 9], "x": 17.75, "y": 5}, + {"matrix": [7, 9], "x": 18.75, "y": 5} + ] } } } diff --git a/keyboards/oddforge/vea/matrix.c b/keyboards/oddforge/vea/matrix.c index 118d3e8aed7b..8b054ccbe04d 100644 --- a/keyboards/oddforge/vea/matrix.c +++ b/keyboards/oddforge/vea/matrix.c @@ -19,7 +19,6 @@ along with this program. If not, see . #include #include "quantum.h" #include "i2c_master.h" -#include "vea.h" #define RIGHT_HALF diff --git a/keyboards/oddforge/vea/vea.h b/keyboards/oddforge/vea/vea.h deleted file mode 100644 index 158b82d9444d..000000000000 --- a/keyboards/oddforge/vea/vea.h +++ /dev/null @@ -1,57 +0,0 @@ -/* -Copyright 2021 MajorKoos - -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" - -/* -LEFT - .5,0. .5,1. .5,2. .5,3. .5,4. .5,5. .5,6. -.6,1. .7,1. .4,0. .4,1. .4,2. .4,3. .4,4. .4,5. .4,6. -.6,2. .7,2. .3,0. .3,1. .3,2. .3,3. .3,4. .3,5. -.6,3. .7,3. .2,0. .2,1. .2,2. .2,3. .2,4. .2,5. -.6,4. .7,4. .1,0. .1,1. .1,2. .1,3. .1,4. .1,5. -.6,5. .7,5. .0,0. .0,1. .0,2. .7,7. .6,6. - -RIGHT -.5,8. .5,9. .5,10. .5,11. .5,12. .5,13. .6,11. .7,11. .6,13. -.4,8. .4,9. .4,10. .4,11. .4,12. .4,13. .4,14. .6,10. -.1,8. .1,9. .1,10. .1,11. .1,12. .1,13. .1,14. .2,14. .7,10. -.2,8. .2,9. .2,10. .2,11. .2,12. .2,13. .3,13. .6,12. -.3,8. .3,9. .3,10. .3,11. .3,12. .3,14. .6,8. .7,12. -.6,14. .0,10. .0,9. .0,8. .7,8. .6,9. .7,9. - -*/ - -#define LAYOUT( \ - K50, K51, K52, K53, K54, K55, K56, K58, K59, K5A, K5B, K5C, K5D, K6B, K7B, K6D, \ -K61, K71, K40, K41, K42, K43, K44, K45, K46, K48, K49, K4A, K4B, K4C, K4D, K4E, K6A, \ -K62, K72, K30, K31, K32, K33, K34, K35, K18, K19, K1A, K1B, K1C, K1D, K1E, K2E, K7A, \ -K63, K73, K20, K21, K22, K23, K24, K25, K28, K29, K2A, K2B, K2C, K2D, K3D, K6C, \ -K64, K74, K10, K11, K12, K13, K14, K15, K38, K39, K3A, K3B, K3C, K3E, K68, K7C, \ -K65, K75, K00, K01, K02, K77, K66, K6E, K0A, K09, K08, K78, K69, K79 \ -){ \ -{ K00, K01, K02, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K08, K09, K0A, KC_NO, KC_NO, KC_NO, KC_NO }, \ -{ K10, K11, K12, K13, K14, K15, KC_NO, KC_NO, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, KC_NO, KC_NO, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ -{ K30, K31, K32, K33, K34, K35, KC_NO, KC_NO, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ -{ K40, K41, K42, K43, K44, K45, K46, KC_NO, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ -{ K50, K51, K52, K53, K54, K55, K56, KC_NO, K58, K59, K5A, K5B, K5C, K5D, KC_NO }, \ -{ KC_NO, K61, K62, K63, K64, K65, K66, KC_NO, K68, K69, K6A, K6B, K6C, K6D, K6E }, \ -{ KC_NO, K71, K72, K73, K74, K75, KC_NO, K77, K78, K79, K7A, K7B, K7C, KC_NO, KC_NO } \ -} diff --git a/keyboards/ogre/ergo_single/ergo_single.h b/keyboards/ogre/ergo_single/ergo_single.h deleted file mode 100644 index f8f9ddf65f72..000000000000 --- a/keyboards/ogre/ergo_single/ergo_single.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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( \ - k63, k00, k10, k20, k30, k40, k50, k60, k65, k55, k45, k35, k25, k15, k05, k68, \ - k01, k11, k21, k31, k41, k51, k61, k66, k56, k46, k36, k26, k16, k06, \ - k02, k12, k22, k32, k42, k52, k62, k67, k57, k47, k37, k27, k17, k07, \ - k03, k13, k23, k33, k43, k53, k58, k48, k38, k28, k18, k08, \ - k04, k14, k24, k34, k44, k54, k64, k69, k59, k49, k39, k29, k19, k09 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60 }, \ - { k01, k11, k21, k31, k41, k51, k61 }, \ - { k02, k12, k22, k32, k42, k52, k62 }, \ - { k03, k13, k23, k33, k43, k53, k63 }, \ - { k04, k14, k24, k34, k44, k54, k64 }, \ - { k05, k15, k25, k35, k45, k55, k65 }, \ - { k06, k16, k26, k36, k46, k56, k66 }, \ - { k07, k17, k27, k37, k47, k57, k67 }, \ - { k08, k18, k28, k38, k48, k58, k68 }, \ - { k09, k19, k29, k39, k49, k59, k69 }, \ -} diff --git a/keyboards/ogre/ergo_single/info.json b/keyboards/ogre/ergo_single/info.json index b2f4493362e7..4a5b96b8add4 100644 --- a/keyboards/ogre/ergo_single/info.json +++ b/keyboards/ogre/ergo_single/info.json @@ -21,87 +21,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.25, "y": 0.5}, - {"x": 1.25, "y": 0.5}, - {"x": 2.25, "y": 0.5}, - {"x": 3.25, "y": 0.25}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0.25}, - {"x": 6.25, "y": 0.5}, - {"x": 7.25, "y": 0.5}, + {"matrix": [3, 6], "x": 0.25, "y": 0.5}, + {"matrix": [0, 0], "x": 1.25, "y": 0.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0.5}, + {"matrix": [0, 2], "x": 3.25, "y": 0.25}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0.5}, + {"matrix": [0, 6], "x": 7.25, "y": 0.5}, - {"x": 11.25, "y": 0.5}, - {"x": 12.25, "y": 0.5}, - {"x": 13.25, "y": 0.25}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0.25}, - {"x": 16.25, "y": 0.5}, - {"x": 17.25, "y": 0.5}, - {"x": 18.25, "y": 0.5}, + {"matrix": [5, 6], "x": 11.25, "y": 0.5}, + {"matrix": [5, 5], "x": 12.25, "y": 0.5}, + {"matrix": [5, 4], "x": 13.25, "y": 0.25}, + {"matrix": [5, 3], "x": 14.25, "y": 0}, + {"matrix": [5, 2], "x": 15.25, "y": 0.25}, + {"matrix": [5, 1], "x": 16.25, "y": 0.5}, + {"matrix": [5, 0], "x": 17.25, "y": 0.5}, + {"matrix": [8, 6], "x": 18.25, "y": 0.5}, - {"x": 0.75, "y": 1.5, "w": 1.5}, - {"x": 2.25, "y": 1.5}, - {"x": 3.25, "y": 1.25}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1.25}, - {"x": 6.25, "y": 1.5}, - {"x": 7.25, "y": 1.5}, + {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 2.25, "y": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.5}, + {"matrix": [1, 6], "x": 7.25, "y": 1.5}, - {"x": 11.25, "y": 1.5}, - {"x": 12.25, "y": 1.5}, - {"x": 13.25, "y": 1.25}, - {"x": 14.25, "y": 1}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5, "w": 1.5}, + {"matrix": [6, 6], "x": 11.25, "y": 1.5}, + {"matrix": [6, 5], "x": 12.25, "y": 1.5}, + {"matrix": [6, 4], "x": 13.25, "y": 1.25}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.25}, + {"matrix": [6, 1], "x": 16.25, "y": 1.5}, + {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5}, - {"x": 0.5, "y": 2.5, "w": 1.75}, - {"x": 2.25, "y": 2.5}, - {"x": 3.25, "y": 2.25}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2.25}, - {"x": 6.25, "y": 2.5}, - {"x": 7.25, "y": 2.5}, + {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75}, + {"matrix": [2, 1], "x": 2.25, "y": 2.5}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2.5}, + {"matrix": [2, 6], "x": 7.25, "y": 2.5}, - {"x": 11.25, "y": 2.5}, - {"x": 12.25, "y": 2.5}, - {"x": 13.25, "y": 2.25}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5, "w": 1.75}, + {"matrix": [7, 6], "x": 11.25, "y": 2.5}, + {"matrix": [7, 5], "x": 12.25, "y": 2.5}, + {"matrix": [7, 4], "x": 13.25, "y": 2.25}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.25}, + {"matrix": [7, 1], "x": 16.25, "y": 2.5}, + {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75}, - {"x": 0, "y": 3.5, "w": 2.25}, - {"x": 2.25, "y": 3.5}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3.25}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, + {"matrix": [8, 5], "x": 12.25, "y": 3.5}, + {"matrix": [8, 4], "x": 13.25, "y": 3.25}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.25}, + {"matrix": [8, 1], "x": 16.25, "y": 3.5}, + {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25}, - {"x": 1, "y": 4.5, "w": 1.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4}, + {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25}, + {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75}, + {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2}, - {"x": 6.25, "y": 5.5, "w": 1.25}, - {"x": 7.5, "y": 3.75, "h": 2.75}, - {"x": 8.5, "y": 4.5, "h": 2}, - - {"x": 10, "y": 5, "h": 1.5}, - {"x": 11, "y": 4.5, "h": 2}, - {"x": 12, "y": 5.5, "w": 1.25}, - - {"x": 14.25, "y": 4}, - {"x": 15.25, "y": 4.25}, - {"x": 16.25, "y": 4.5}, - {"x": 17.25, "y": 4.5, "w": 1.25} + {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5}, + {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2}, + {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.25}, + {"matrix": [9, 1], "x": 16.25, "y": 4.5}, + {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25} ] } } diff --git a/keyboards/ogre/ergo_split/ergo_split.h b/keyboards/ogre/ergo_split/ergo_split.h deleted file mode 100644 index f8f9ddf65f72..000000000000 --- a/keyboards/ogre/ergo_split/ergo_split.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2020 ctrlshiftba - * - * 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( \ - k63, k00, k10, k20, k30, k40, k50, k60, k65, k55, k45, k35, k25, k15, k05, k68, \ - k01, k11, k21, k31, k41, k51, k61, k66, k56, k46, k36, k26, k16, k06, \ - k02, k12, k22, k32, k42, k52, k62, k67, k57, k47, k37, k27, k17, k07, \ - k03, k13, k23, k33, k43, k53, k58, k48, k38, k28, k18, k08, \ - k04, k14, k24, k34, k44, k54, k64, k69, k59, k49, k39, k29, k19, k09 \ -) \ -{ \ - { k00, k10, k20, k30, k40, k50, k60 }, \ - { k01, k11, k21, k31, k41, k51, k61 }, \ - { k02, k12, k22, k32, k42, k52, k62 }, \ - { k03, k13, k23, k33, k43, k53, k63 }, \ - { k04, k14, k24, k34, k44, k54, k64 }, \ - { k05, k15, k25, k35, k45, k55, k65 }, \ - { k06, k16, k26, k36, k46, k56, k66 }, \ - { k07, k17, k27, k37, k47, k57, k67 }, \ - { k08, k18, k28, k38, k48, k58, k68 }, \ - { k09, k19, k29, k39, k49, k59, k69 }, \ -} diff --git a/keyboards/ogre/ergo_split/info.json b/keyboards/ogre/ergo_split/info.json index 84452270de8f..2a1bbbdcd650 100644 --- a/keyboards/ogre/ergo_split/info.json +++ b/keyboards/ogre/ergo_split/info.json @@ -24,87 +24,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0.25, "y": 0.5}, - {"x": 1.25, "y": 0.5}, - {"x": 2.25, "y": 0.5}, - {"x": 3.25, "y": 0.25}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0.25}, - {"x": 6.25, "y": 0.5}, - {"x": 7.25, "y": 0.5}, + {"matrix": [3, 6], "x": 0.25, "y": 0.5}, + {"matrix": [0, 0], "x": 1.25, "y": 0.5}, + {"matrix": [0, 1], "x": 2.25, "y": 0.5}, + {"matrix": [0, 2], "x": 3.25, "y": 0.25}, + {"matrix": [0, 3], "x": 4.25, "y": 0}, + {"matrix": [0, 4], "x": 5.25, "y": 0.25}, + {"matrix": [0, 5], "x": 6.25, "y": 0.5}, + {"matrix": [0, 6], "x": 7.25, "y": 0.5}, - {"x": 11.25, "y": 0.5}, - {"x": 12.25, "y": 0.5}, - {"x": 13.25, "y": 0.25}, - {"x": 14.25, "y": 0}, - {"x": 15.25, "y": 0.25}, - {"x": 16.25, "y": 0.5}, - {"x": 17.25, "y": 0.5}, - {"x": 18.25, "y": 0.5}, + {"matrix": [5, 6], "x": 11.25, "y": 0.5}, + {"matrix": [5, 5], "x": 12.25, "y": 0.5}, + {"matrix": [5, 4], "x": 13.25, "y": 0.25}, + {"matrix": [5, 3], "x": 14.25, "y": 0}, + {"matrix": [5, 2], "x": 15.25, "y": 0.25}, + {"matrix": [5, 1], "x": 16.25, "y": 0.5}, + {"matrix": [5, 0], "x": 17.25, "y": 0.5}, + {"matrix": [8, 6], "x": 18.25, "y": 0.5}, - {"x": 0.75, "y": 1.5, "w": 1.5}, - {"x": 2.25, "y": 1.5}, - {"x": 3.25, "y": 1.25}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1.25}, - {"x": 6.25, "y": 1.5}, - {"x": 7.25, "y": 1.5}, + {"matrix": [1, 0], "x": 0.75, "y": 1.5, "w": 1.5}, + {"matrix": [1, 1], "x": 2.25, "y": 1.5}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.5}, + {"matrix": [1, 6], "x": 7.25, "y": 1.5}, - {"x": 11.25, "y": 1.5}, - {"x": 12.25, "y": 1.5}, - {"x": 13.25, "y": 1.25}, - {"x": 14.25, "y": 1}, - {"x": 15.25, "y": 1.25}, - {"x": 16.25, "y": 1.5}, - {"x": 17.25, "y": 1.5, "w": 1.5}, + {"matrix": [6, 6], "x": 11.25, "y": 1.5}, + {"matrix": [6, 5], "x": 12.25, "y": 1.5}, + {"matrix": [6, 4], "x": 13.25, "y": 1.25}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.25}, + {"matrix": [6, 1], "x": 16.25, "y": 1.5}, + {"matrix": [6, 0], "x": 17.25, "y": 1.5, "w": 1.5}, - {"x": 0.5, "y": 2.5, "w": 1.75}, - {"x": 2.25, "y": 2.5}, - {"x": 3.25, "y": 2.25}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2.25}, - {"x": 6.25, "y": 2.5}, - {"x": 7.25, "y": 2.5}, + {"matrix": [2, 0], "x": 0.5, "y": 2.5, "w": 1.75}, + {"matrix": [2, 1], "x": 2.25, "y": 2.5}, + {"matrix": [2, 2], "x": 3.25, "y": 2.25}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2.25}, + {"matrix": [2, 5], "x": 6.25, "y": 2.5}, + {"matrix": [2, 6], "x": 7.25, "y": 2.5}, - {"x": 11.25, "y": 2.5}, - {"x": 12.25, "y": 2.5}, - {"x": 13.25, "y": 2.25}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2.25}, - {"x": 16.25, "y": 2.5}, - {"x": 17.25, "y": 2.5, "w": 1.75}, + {"matrix": [7, 6], "x": 11.25, "y": 2.5}, + {"matrix": [7, 5], "x": 12.25, "y": 2.5}, + {"matrix": [7, 4], "x": 13.25, "y": 2.25}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.25}, + {"matrix": [7, 1], "x": 16.25, "y": 2.5}, + {"matrix": [7, 0], "x": 17.25, "y": 2.5, "w": 1.75}, - {"x": 0, "y": 3.5, "w": 2.25}, - {"x": 2.25, "y": 3.5}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3}, - {"x": 5.25, "y": 3.25}, - {"x": 6.25, "y": 3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.5}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, - {"x": 12.25, "y": 3.5}, - {"x": 13.25, "y": 3.25}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3.25}, - {"x": 16.25, "y": 3.5}, - {"x": 17.25, "y": 3.5, "w": 2.25}, + {"matrix": [8, 5], "x": 12.25, "y": 3.5}, + {"matrix": [8, 4], "x": 13.25, "y": 3.25}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.25}, + {"matrix": [8, 1], "x": 16.25, "y": 3.5}, + {"matrix": [8, 0], "x": 17.25, "y": 3.5, "w": 2.25}, - {"x": 1, "y": 4.5, "w": 1.25}, - {"x": 2.25, "y": 4.5}, - {"x": 3.25, "y": 4.25}, - {"x": 4.25, "y": 4}, + {"matrix": [4, 0], "x": 1, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 6.25, "y": 5.5, "w": 1.25}, + {"matrix": [4, 5], "x": 7.5, "y": 3.75, "h": 2.75}, + {"matrix": [4, 6], "x": 8.5, "y": 4.5, "h": 2}, - {"x": 6.25, "y": 5.5, "w": 1.25}, - {"x": 7.5, "y": 3.75, "h": 2.75}, - {"x": 8.5, "y": 4.5, "h": 2}, - - {"x": 10, "y": 5, "h": 1.5}, - {"x": 11, "y": 4.5, "h": 2}, - {"x": 12, "y": 5.5, "w": 1.25}, - - {"x": 14.25, "y": 4}, - {"x": 15.25, "y": 4.25}, - {"x": 16.25, "y": 4.5}, - {"x": 17.25, "y": 4.5, "w": 1.25} + {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.5}, + {"matrix": [9, 5], "x": 11, "y": 4.5, "h": 2}, + {"matrix": [9, 4], "x": 12, "y": 5.5, "w": 1.25}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.25}, + {"matrix": [9, 1], "x": 16.25, "y": 4.5}, + {"matrix": [9, 0], "x": 17.25, "y": 4.5, "w": 1.25} ] } } diff --git a/keyboards/om60/info.json b/keyboards/om60/info.json index 8eefadbb3c3a..08b4b0f68356 100644 --- a/keyboards/om60/info.json +++ b/keyboards/om60/info.json @@ -19,8 +19,86 @@ "processor": "atmega32u4", "bootloader": "caterina", "layouts": { - "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"4,0", "x":1.5, "y":0}, {"label":"4,1", "x":2.5, "y":0}, {"label":"4,2", "x":3.5, "y":0}, {"label":"4,3", "x":4.5, "y":0}, {"label":"4,4", "x":5.5, "y":0}, {"label":"4,5", "x":6.5, "y":0}, {"label":"4,6", "x":7.5, "y":0}, {"label":"4,7", "x":8.5, "y":0}, {"label":"9,0", "x":9.5, "y":0}, {"label":"9,1", "x":10.5, "y":0}, {"label":"9,2", "x":11.5, "y":0}, {"label":"9,3", "x":12.5, "y":0}, {"label":"9,4", "x":13.5, "y":0}, {"label":"0,1", "x":1.5, "y":1}, {"label":"0,2", "x":2.5, "y":1}, {"label":"0,3", "x":3.5, "y":1}, {"label":"0,4", "x":4.5, "y":1}, {"label":"0,5", "x":5.5, "y":1}, {"label":"0,6", "x":6.5, "y":1}, {"label":"0,7", "x":7.5, "y":1}, {"label":"5,0", "x":8.5, "y":1}, {"label":"5,1", "x":9.5, "y":1}, {"label":"5,2", "x":10.5, "y":1}, {"label":"5,3", "x":11.5, "y":1}, {"label":"5,4", "x":12.5, "y":1}, {"label":"5,5", "x":13.5, "y":1}, {"label":"1,0", "x":0, "y":2}, {"label":"1,1", "x":1.5, "y":2}, {"label":"1,2", "x":2.5, "y":2}, {"label":"1,3", "x":3.5, "y":2}, {"label":"1,4", "x":4.5, "y":2}, {"label":"1,5", "x":5.5, "y":2}, {"label":"1,6", "x":6.5, "y":2}, {"label":"1,7", "x":7.5, "y":2}, {"label":"6,0", "x":8.5, "y":2}, {"label":"6,1", "x":9.5, "y":2}, {"label":"6,2", "x":10.5, "y":2}, {"label":"6,3", "x":11.5, "y":2}, {"label":"6,4", "x":12.5, "y":2}, {"label":"6,5", "x":13.5, "y":2}, {"label":"2,0", "x":0, "y":3}, {"label":"2,1", "x":1.5, "y":3}, {"label":"2,2", "x":2.5, "y":3}, {"label":"2,3", "x":3.5, "y":3}, {"label":"2,4", "x":4.5, "y":3}, {"label":"2,5", "x":5.5, "y":3}, {"label":"2,6", "x":6.5, "y":3}, {"label":"2,7", "x":7.5, "y":3}, {"label":"7,0", "x":8.5, "y":3}, {"label":"7,1", "x":9.5, "y":3}, {"label":"7,2", "x":10.5, "y":3}, {"label":"7,3", "x":11.5, "y":3}, {"label":"7,4", "x":12.5, "y":3}, {"label":"7,5", "x":13.5, "y":3}, {"label":"3,0", "x":0, "y":4}, {"label":"3,1", "x":1.5, "y":4}, {"label":"3,2", "x":2.5, "y":4}, {"label":"3,3", "x":3.5, "y":4}, {"label":"3,4", "x":4.5, "y":4}, {"label":"3,5", "x":5.5, "y":4}, {"label":"3,6", "x":6.5, "y":4}, {"label":"3,7", "x":7.5, "y":4}, {"label":"8,0", "x":8.5, "y":4}, {"label":"8,1", "x":9.5, "y":4}, {"label":"8,2", "x":10.5, "y":4}, {"label":"8,3", "x":11.5, "y":4}, {"label":"8,4", "x":12.5, "y":4}, {"label":"8,5", "x":13.5, "y":4}] - } + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [4, 0], "x": 1.5, "y": 0}, + {"matrix": [4, 1], "x": 2.5, "y": 0}, + {"matrix": [4, 2], "x": 3.5, "y": 0}, + {"matrix": [4, 3], "x": 4.5, "y": 0}, + {"matrix": [4, 4], "x": 5.5, "y": 0}, + {"matrix": [4, 5], "x": 6.5, "y": 0}, + {"matrix": [4, 6], "x": 7.5, "y": 0}, + {"matrix": [4, 7], "x": 8.5, "y": 0}, + {"matrix": [9, 0], "x": 9.5, "y": 0}, + {"matrix": [9, 1], "x": 10.5, "y": 0}, + {"matrix": [9, 2], "x": 11.5, "y": 0}, + {"matrix": [9, 3], "x": 12.5, "y": 0}, + {"matrix": [9, 4], "x": 13.5, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 1}, + {"matrix": [0, 2], "x": 2.5, "y": 1}, + {"matrix": [0, 3], "x": 3.5, "y": 1}, + {"matrix": [0, 4], "x": 4.5, "y": 1}, + {"matrix": [0, 5], "x": 5.5, "y": 1}, + {"matrix": [0, 6], "x": 6.5, "y": 1}, + {"matrix": [0, 7], "x": 7.5, "y": 1}, + {"matrix": [5, 0], "x": 8.5, "y": 1}, + {"matrix": [5, 1], "x": 9.5, "y": 1}, + {"matrix": [5, 2], "x": 10.5, "y": 1}, + {"matrix": [5, 3], "x": 11.5, "y": 1}, + {"matrix": [5, 4], "x": 12.5, "y": 1}, + {"matrix": [5, 5], "x": 13.5, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + + {"matrix": [1, 1], "x": 1.5, "y": 2}, + {"matrix": [1, 2], "x": 2.5, "y": 2}, + {"matrix": [1, 3], "x": 3.5, "y": 2}, + {"matrix": [1, 4], "x": 4.5, "y": 2}, + {"matrix": [1, 5], "x": 5.5, "y": 2}, + {"matrix": [1, 6], "x": 6.5, "y": 2}, + {"matrix": [1, 7], "x": 7.5, "y": 2}, + {"matrix": [6, 0], "x": 8.5, "y": 2}, + {"matrix": [6, 1], "x": 9.5, "y": 2}, + {"matrix": [6, 2], "x": 10.5, "y": 2}, + {"matrix": [6, 3], "x": 11.5, "y": 2}, + {"matrix": [6, 4], "x": 12.5, "y": 2}, + {"matrix": [6, 5], "x": 13.5, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + + {"matrix": [2, 1], "x": 1.5, "y": 3}, + {"matrix": [2, 2], "x": 2.5, "y": 3}, + {"matrix": [2, 3], "x": 3.5, "y": 3}, + {"matrix": [2, 4], "x": 4.5, "y": 3}, + {"matrix": [2, 5], "x": 5.5, "y": 3}, + {"matrix": [2, 6], "x": 6.5, "y": 3}, + {"matrix": [2, 7], "x": 7.5, "y": 3}, + {"matrix": [7, 0], "x": 8.5, "y": 3}, + {"matrix": [7, 1], "x": 9.5, "y": 3}, + {"matrix": [7, 2], "x": 10.5, "y": 3}, + {"matrix": [7, 3], "x": 11.5, "y": 3}, + {"matrix": [7, 4], "x": 12.5, "y": 3}, + {"matrix": [7, 5], "x": 13.5, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + + {"matrix": [3, 1], "x": 1.5, "y": 4}, + {"matrix": [3, 2], "x": 2.5, "y": 4}, + {"matrix": [3, 3], "x": 3.5, "y": 4}, + {"matrix": [3, 4], "x": 4.5, "y": 4}, + {"matrix": [3, 5], "x": 5.5, "y": 4}, + {"matrix": [3, 6], "x": 6.5, "y": 4}, + {"matrix": [3, 7], "x": 7.5, "y": 4}, + {"matrix": [8, 0], "x": 8.5, "y": 4}, + {"matrix": [8, 1], "x": 9.5, "y": 4}, + {"matrix": [8, 2], "x": 10.5, "y": 4}, + {"matrix": [8, 3], "x": 11.5, "y": 4}, + {"matrix": [8, 4], "x": 12.5, "y": 4}, + {"matrix": [8, 5], "x": 13.5, "y": 4} + ] + } } } \ No newline at end of file diff --git a/keyboards/om60/om60.h b/keyboards/om60/om60.h deleted file mode 100644 index 669a610031a6..000000000000 --- a/keyboards/om60/om60.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid -Copyright 2022 jun10000 - -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( \ - L01, L05, L10, L15, L20, L25, L30, L35, L40, R45, R50, R55, R60, R65, \ - L06, L11, L16, L21, L26, L31, L36, R41, R46, R51, R56, R61, R66, \ - L02, L07, L12, L17, L22, L27, L32, L37, R42, R47, R52, R57, R62, R67, \ - L03, L08, L13, L18, L23, L28, L33, L38, R43, R48, R53, R58, R63, R68, \ - L04, L09, L14, L19, L24, L29, L34, L39, R44, R49, R54, R59, R64, R69 \ - ) \ - { \ - { L01, L06, L11, L16, L21, L26, L31, L36 }, \ - { L02, L07, L12, L17, L22, L27, L32, L37 }, \ - { L03, L08, L13, L18, L23, L28, L33, L38 }, \ - { L04, L09, L14, L19, L24, L29, L34, L39 }, \ - { L05, L10, L15, L20, L25, L30, L35, L40 }, \ - { R41, R46, R51, R56, R61, R66, KC_NO, KC_NO }, \ - { R42, R47, R52, R57, R62, R67, KC_NO, KC_NO }, \ - { R43, R48, R53, R58, R63, R68, KC_NO, KC_NO }, \ - { R44, R49, R54, R59, R64, R69, KC_NO, KC_NO }, \ - { R45, R50, R55, R60, R65, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/omkbd/runner3680/3x6/3x6.h b/keyboards/omkbd/runner3680/3x6/3x6.h deleted file mode 100644 index 3d9fd779d8d6..000000000000 --- a/keyboards/omkbd/runner3680/3x6/3x6.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/omkbd/runner3680/3x6/info.json b/keyboards/omkbd/runner3680/3x6/info.json index 4cd318a2ef5e..9cb57ec106f1 100644 --- a/keyboards/omkbd/runner3680/3x6/info.json +++ b/keyboards/omkbd/runner3680/3x6/info.json @@ -19,47 +19,50 @@ "ws2812": { "pin": "D3" }, - "layouts": { + "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [3, 5], "x": 7, "y": 0}, + {"matrix": [3, 4], "x": 8, "y": 0}, + {"matrix": [3, 3], "x": 9, "y": 0}, + {"matrix": [3, 2], "x": 10, "y": 0}, + {"matrix": [3, 1], "x": 11, "y": 0}, + {"matrix": [3, 0], "x": 12, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [4, 5], "x": 7, "y": 1}, + {"matrix": [4, 4], "x": 8, "y": 1}, + {"matrix": [4, 3], "x": 9, "y": 1}, + {"matrix": [4, 2], "x": 10, "y": 1}, + {"matrix": [4, 1], "x": 11, "y": 1}, + {"matrix": [4, 0], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [5, 5], "x": 7, "y": 2}, + {"matrix": [5, 4], "x": 8, "y": 2}, + {"matrix": [5, 3], "x": 9, "y": 2}, + {"matrix": [5, 2], "x": 10, "y": 2}, + {"matrix": [5, 1], "x": 11, "y": 2}, + {"matrix": [5, 0], "x": 12, "y": 2} ] } } diff --git a/keyboards/omkbd/runner3680/3x7/3x7.h b/keyboards/omkbd/runner3680/3x7/3x7.h deleted file mode 100644 index db11b19c5286..000000000000 --- a/keyboards/omkbd/runner3680/3x7/3x7.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/omkbd/runner3680/3x7/info.json b/keyboards/omkbd/runner3680/3x7/info.json index aec7fbcbef1a..a3cde77a45dc 100644 --- a/keyboards/omkbd/runner3680/3x7/info.json +++ b/keyboards/omkbd/runner3680/3x7/info.json @@ -22,50 +22,53 @@ "layouts": { "LAYOUT": { "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":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}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [3, 6], "x": 8, "y": 0}, + {"matrix": [3, 5], "x": 9, "y": 0}, + {"matrix": [3, 4], "x": 10, "y": 0}, + {"matrix": [3, 3], "x": 11, "y": 0}, + {"matrix": [3, 2], "x": 12, "y": 0}, + {"matrix": [3, 1], "x": 13, "y": 0}, + {"matrix": [3, 0], "x": 14, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [4, 6], "x": 8, "y": 1}, + {"matrix": [4, 5], "x": 9, "y": 1}, + {"matrix": [4, 4], "x": 10, "y": 1}, + {"matrix": [4, 3], "x": 11, "y": 1}, + {"matrix": [4, 2], "x": 12, "y": 1}, + {"matrix": [4, 1], "x": 13, "y": 1}, + {"matrix": [4, 0], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [5, 6], "x": 8, "y": 2}, + {"matrix": [5, 5], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 3], "x": 11, "y": 2}, + {"matrix": [5, 2], "x": 12, "y": 2}, + {"matrix": [5, 1], "x": 13, "y": 2}, + {"matrix": [5, 0], "x": 14, "y": 2} ] } } diff --git a/keyboards/omkbd/runner3680/3x8/3x8.h b/keyboards/omkbd/runner3680/3x8/3x8.h deleted file mode 100644 index cd3b81d97374..000000000000 --- a/keyboards/omkbd/runner3680/3x8/3x8.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/omkbd/runner3680/3x8/info.json b/keyboards/omkbd/runner3680/3x8/info.json index ccf59c180bde..4c816a400c5c 100644 --- a/keyboards/omkbd/runner3680/3x8/info.json +++ b/keyboards/omkbd/runner3680/3x8/info.json @@ -22,56 +22,59 @@ "layouts": { "LAYOUT": { "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":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":16, "y":0}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [3, 7], "x": 9, "y": 0}, + {"matrix": [3, 6], "x": 10, "y": 0}, + {"matrix": [3, 5], "x": 11, "y": 0}, + {"matrix": [3, 4], "x": 12, "y": 0}, + {"matrix": [3, 3], "x": 13, "y": 0}, + {"matrix": [3, 2], "x": 14, "y": 0}, + {"matrix": [3, 1], "x": 15, "y": 0}, + {"matrix": [3, 0], "x": 16, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + + {"matrix": [4, 7], "x": 9, "y": 1}, + {"matrix": [4, 6], "x": 10, "y": 1}, + {"matrix": [4, 5], "x": 11, "y": 1}, + {"matrix": [4, 4], "x": 12, "y": 1}, + {"matrix": [4, 3], "x": 13, "y": 1}, + {"matrix": [4, 2], "x": 14, "y": 1}, + {"matrix": [4, 1], "x": 15, "y": 1}, + {"matrix": [4, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + + {"matrix": [5, 7], "x": 9, "y": 2}, + {"matrix": [5, 6], "x": 10, "y": 2}, + {"matrix": [5, 5], "x": 11, "y": 2}, + {"matrix": [5, 4], "x": 12, "y": 2}, + {"matrix": [5, 3], "x": 13, "y": 2}, + {"matrix": [5, 2], "x": 14, "y": 2}, + {"matrix": [5, 1], "x": 15, "y": 2}, + {"matrix": [5, 0], "x": 16, "y": 2} ] } } diff --git a/keyboards/omkbd/runner3680/4x6/4x6.h b/keyboards/omkbd/runner3680/4x6/4x6.h deleted file mode 100644 index 26bcca6de590..000000000000 --- a/keyboards/omkbd/runner3680/4x6/4x6.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/omkbd/runner3680/4x6/info.json b/keyboards/omkbd/runner3680/4x6/info.json index f2433c99b668..05785c52dd75 100644 --- a/keyboards/omkbd/runner3680/4x6/info.json +++ b/keyboards/omkbd/runner3680/4x6/info.json @@ -22,57 +22,61 @@ "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [4, 5], "x": 7, "y": 0}, + {"matrix": [4, 4], "x": 8, "y": 0}, + {"matrix": [4, 3], "x": 9, "y": 0}, + {"matrix": [4, 2], "x": 10, "y": 0}, + {"matrix": [4, 1], "x": 11, "y": 0}, + {"matrix": [4, 0], "x": 12, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3} + {"matrix": [5, 5], "x": 7, "y": 1}, + {"matrix": [5, 4], "x": 8, "y": 1}, + {"matrix": [5, 3], "x": 9, "y": 1}, + {"matrix": [5, 2], "x": 10, "y": 1}, + {"matrix": [5, 1], "x": 11, "y": 1}, + {"matrix": [5, 0], "x": 12, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [6, 5], "x": 7, "y": 2}, + {"matrix": [6, 4], "x": 8, "y": 2}, + {"matrix": [6, 3], "x": 9, "y": 2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 1], "x": 11, "y": 2}, + {"matrix": [6, 0], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [7, 5], "x": 7, "y": 3}, + {"matrix": [7, 4], "x": 8, "y": 3}, + {"matrix": [7, 3], "x": 9, "y": 3}, + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 12, "y": 3} ] } } diff --git a/keyboards/omkbd/runner3680/4x7/4x7.h b/keyboards/omkbd/runner3680/4x7/4x7.h deleted file mode 100644 index 50fbe3a5ceed..000000000000 --- a/keyboards/omkbd/runner3680/4x7/4x7.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/omkbd/runner3680/4x7/info.json b/keyboards/omkbd/runner3680/4x7/info.json index 17af0b601e32..548cb8752fd0 100644 --- a/keyboards/omkbd/runner3680/4x7/info.json +++ b/keyboards/omkbd/runner3680/4x7/info.json @@ -22,65 +22,69 @@ "layouts": { "LAYOUT": { "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":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}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [4, 6], "x": 8, "y": 0}, + {"matrix": [4, 5], "x": 9, "y": 0}, + {"matrix": [4, 4], "x": 10, "y": 0}, + {"matrix": [4, 3], "x": 11, "y": 0}, + {"matrix": [4, 2], "x": 12, "y": 0}, + {"matrix": [4, 1], "x": 13, "y": 0}, + {"matrix": [4, 0], "x": 14, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3} + {"matrix": [5, 6], "x": 8, "y": 1}, + {"matrix": [5, 5], "x": 9, "y": 1}, + {"matrix": [5, 4], "x": 10, "y": 1}, + {"matrix": [5, 3], "x": 11, "y": 1}, + {"matrix": [5, 2], "x": 12, "y": 1}, + {"matrix": [5, 1], "x": 13, "y": 1}, + {"matrix": [5, 0], "x": 14, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [6, 6], "x": 8, "y": 2}, + {"matrix": [6, 5], "x": 9, "y": 2}, + {"matrix": [6, 4], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 2], "x": 12, "y": 2}, + {"matrix": [6, 1], "x": 13, "y": 2}, + {"matrix": [6, 0], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [7, 6], "x": 8, "y": 3}, + {"matrix": [7, 5], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [7, 3], "x": 11, "y": 3}, + {"matrix": [7, 2], "x": 12, "y": 3}, + {"matrix": [7, 1], "x": 13, "y": 3}, + {"matrix": [7, 0], "x": 14, "y": 3} ] } } diff --git a/keyboards/omkbd/runner3680/4x8/4x8.h b/keyboards/omkbd/runner3680/4x8/4x8.h deleted file mode 100644 index 08fed12164b5..000000000000 --- a/keyboards/omkbd/runner3680/4x8/4x8.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/omkbd/runner3680/4x8/info.json b/keyboards/omkbd/runner3680/4x8/info.json index f8fb9fa02c2e..e492360e6a84 100644 --- a/keyboards/omkbd/runner3680/4x8/info.json +++ b/keyboards/omkbd/runner3680/4x8/info.json @@ -22,73 +22,77 @@ "layouts": { "LAYOUT": { "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":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":16, "y":0}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [4, 7], "x": 9, "y": 0}, + {"matrix": [4, 6], "x": 10, "y": 0}, + {"matrix": [4, 5], "x": 11, "y": 0}, + {"matrix": [4, 4], "x": 12, "y": 0}, + {"matrix": [4, 3], "x": 13, "y": 0}, + {"matrix": [4, 2], "x": 14, "y": 0}, + {"matrix": [4, 1], "x": 15, "y": 0}, + {"matrix": [4, 0], "x": 16, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - {"x":15, "y":3}, - {"x":16, "y":3} + {"matrix": [5, 7], "x": 9, "y": 1}, + {"matrix": [5, 6], "x": 10, "y": 1}, + {"matrix": [5, 5], "x": 11, "y": 1}, + {"matrix": [5, 4], "x": 12, "y": 1}, + {"matrix": [5, 3], "x": 13, "y": 1}, + {"matrix": [5, 2], "x": 14, "y": 1}, + {"matrix": [5, 1], "x": 15, "y": 1}, + {"matrix": [5, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + + {"matrix": [6, 7], "x": 9, "y": 2}, + {"matrix": [6, 6], "x": 10, "y": 2}, + {"matrix": [6, 5], "x": 11, "y": 2}, + {"matrix": [6, 4], "x": 12, "y": 2}, + {"matrix": [6, 3], "x": 13, "y": 2}, + {"matrix": [6, 2], "x": 14, "y": 2}, + {"matrix": [6, 1], "x": 15, "y": 2}, + {"matrix": [6, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [7, 7], "x": 9, "y": 3}, + {"matrix": [7, 6], "x": 10, "y": 3}, + {"matrix": [7, 5], "x": 11, "y": 3}, + {"matrix": [7, 4], "x": 12, "y": 3}, + {"matrix": [7, 3], "x": 13, "y": 3}, + {"matrix": [7, 2], "x": 14, "y": 3}, + {"matrix": [7, 1], "x": 15, "y": 3}, + {"matrix": [7, 0], "x": 16, "y": 3} ] } } diff --git a/keyboards/omkbd/runner3680/5x6/5x6.h b/keyboards/omkbd/runner3680/5x6/5x6.h deleted file mode 100644 index 8047894606f3..000000000000 --- a/keyboards/omkbd/runner3680/5x6/5x6.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x6/info.json b/keyboards/omkbd/runner3680/5x6/info.json index dc9aa6f7f985..2ed37dd414bf 100644 --- a/keyboards/omkbd/runner3680/5x6/info.json +++ b/keyboards/omkbd/runner3680/5x6/info.json @@ -22,70 +22,75 @@ "layouts": { "LAYOUT": { "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":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, + {"matrix": [5, 5], "x": 7, "y": 0}, + {"matrix": [5, 4], "x": 8, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 0], "x": 12, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, + {"matrix": [6, 5], "x": 7, "y": 1}, + {"matrix": [6, 4], "x": 8, "y": 1}, + {"matrix": [6, 3], "x": 9, "y": 1}, + {"matrix": [6, 2], "x": 10, "y": 1}, + {"matrix": [6, 1], "x": 11, "y": 1}, + {"matrix": [6, 0], "x": 12, "y": 1}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 7, "y": 2}, + {"matrix": [7, 4], "x": 8, "y": 2}, + {"matrix": [7, 3], "x": 9, "y": 2}, + {"matrix": [7, 2], "x": 10, "y": 2}, + {"matrix": [7, 1], "x": 11, "y": 2}, + {"matrix": [7, 0], "x": 12, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [8, 5], "x": 7, "y": 3}, + {"matrix": [8, 4], "x": 8, "y": 3}, + {"matrix": [8, 3], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 1], "x": 11, "y": 3}, + {"matrix": [8, 0], "x": 12, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4}, + + {"matrix": [9, 5], "x": 7, "y": 4}, + {"matrix": [9, 4], "x": 8, "y": 4}, + {"matrix": [9, 3], "x": 9, "y": 4}, + {"matrix": [9, 2], "x": 10, "y": 4}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 0], "x": 12, "y": 4} ] } } diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c index 62597d00601b..3fda3103641b 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c +++ b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "5x6_5x8.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h b/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h deleted file mode 100644 index 756f90db4b60..000000000000 --- a/keyboards/omkbd/runner3680/5x6_5x8/5x6_5x8.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 omkbd - * - * 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( \ - L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \ - ) \ - { \ - { KC_NO, KC_NO, L02, L03, L04, L05, L06, L07 }, \ - { KC_NO, KC_NO, L12, L13, L14, L15, L16, L17 }, \ - { KC_NO, KC_NO, L22, L23, L24, L25, L26, L27 }, \ - { KC_NO, KC_NO, L32, L33, L34, L35, L36, L37 }, \ - { KC_NO, KC_NO, L42, L43, L44, L45, L46, L47 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { R47, R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x6_5x8/info.json b/keyboards/omkbd/runner3680/5x6_5x8/info.json index fa4f30bd7e88..b597d80a12ac 100644 --- a/keyboards/omkbd/runner3680/5x6_5x8/info.json +++ b/keyboards/omkbd/runner3680/5x6_5x8/info.json @@ -25,80 +25,85 @@ "layouts": { "LAYOUT": { "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":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}, + {"matrix": [0, 2], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 4], "x": 2, "y": 0}, + {"matrix": [0, 5], "x": 3, "y": 0}, + {"matrix": [0, 6], "x": 4, "y": 0}, + {"matrix": [0, 7], "x": 5, "y": 0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [5, 7], "x": 7, "y": 0}, + {"matrix": [5, 6], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"matrix": [1, 2], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 5], "x": 3, "y": 1}, + {"matrix": [1, 6], "x": 4, "y": 1}, + {"matrix": [1, 7], "x": 5, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [6, 7], "x": 7, "y": 1}, + {"matrix": [6, 6], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":7, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [2, 2], "x": 0, "y": 2}, + {"matrix": [2, 3], "x": 1, "y": 2}, + {"matrix": [2, 4], "x": 2, "y": 2}, + {"matrix": [2, 5], "x": 3, "y": 2}, + {"matrix": [2, 6], "x": 4, "y": 2}, + {"matrix": [2, 7], "x": 5, "y": 2}, + + {"matrix": [7, 7], "x": 7, "y": 2}, + {"matrix": [7, 6], "x": 8, "y": 2}, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 2], "x": 0, "y": 3}, + {"matrix": [3, 3], "x": 1, "y": 3}, + {"matrix": [3, 4], "x": 2, "y": 3}, + {"matrix": [3, 5], "x": 3, "y": 3}, + {"matrix": [3, 6], "x": 4, "y": 3}, + {"matrix": [3, 7], "x": 5, "y": 3}, + + {"matrix": [8, 7], "x": 7, "y": 3}, + {"matrix": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 2], "x": 0, "y": 4}, + {"matrix": [4, 3], "x": 1, "y": 4}, + {"matrix": [4, 4], "x": 2, "y": 4}, + {"matrix": [4, 5], "x": 3, "y": 4}, + {"matrix": [4, 6], "x": 4, "y": 4}, + {"matrix": [4, 7], "x": 5, "y": 4}, + + {"matrix": [9, 7], "x": 7, "y": 4}, + {"matrix": [9, 6], "x": 8, "y": 4}, + {"matrix": [9, 5], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/omkbd/runner3680/5x7/5x7.h b/keyboards/omkbd/runner3680/5x7/5x7.h deleted file mode 100644 index 1fe3397c9741..000000000000 --- a/keyboards/omkbd/runner3680/5x7/5x7.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x7/info.json b/keyboards/omkbd/runner3680/5x7/info.json index c7cc414c5deb..e9460d7d18cc 100644 --- a/keyboards/omkbd/runner3680/5x7/info.json +++ b/keyboards/omkbd/runner3680/5x7/info.json @@ -22,80 +22,85 @@ "layouts": { "LAYOUT": { "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":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}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, + {"matrix": [5, 6], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 12, "y": 0}, + {"matrix": [5, 1], "x": 13, "y": 0}, + {"matrix": [5, 0], "x": 14, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, + {"matrix": [6, 6], "x": 8, "y": 1}, + {"matrix": [6, 5], "x": 9, "y": 1}, + {"matrix": [6, 4], "x": 10, "y": 1}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 2], "x": 12, "y": 1}, + {"matrix": [6, 1], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":8, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [7, 6], "x": 8, "y": 2}, + {"matrix": [7, 5], "x": 9, "y": 2}, + {"matrix": [7, 4], "x": 10, "y": 2}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 2], "x": 12, "y": 2}, + {"matrix": [7, 1], "x": 13, "y": 2}, + {"matrix": [7, 0], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [8, 6], "x": 8, "y": 3}, + {"matrix": [8, 5], "x": 9, "y": 3}, + {"matrix": [8, 4], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 1], "x": 13, "y": 3}, + {"matrix": [8, 0], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [9, 6], "x": 8, "y": 4}, + {"matrix": [9, 5], "x": 9, "y": 4}, + {"matrix": [9, 4], "x": 10, "y": 4}, + {"matrix": [9, 3], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 1], "x": 13, "y": 4}, + {"matrix": [9, 0], "x": 14, "y": 4} ] } } diff --git a/keyboards/omkbd/runner3680/5x8/5x8.h b/keyboards/omkbd/runner3680/5x8/5x8.h deleted file mode 100644 index b21b14259d3c..000000000000 --- a/keyboards/omkbd/runner3680/5x8/5x8.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, L26, L27, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, L37, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06, L07 }, \ - { L10, L11, L12, L13, L14, L15, L16, L17 }, \ - { L20, L21, L22, L23, L24, L25, L26, L27 }, \ - { L30, L31, L32, L33, L34, L35, L36, L37 }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { R07, R06, R05, R04, R03, R02, R01, R00 }, \ - { R17, R16, R15, R14, R13, R12, R11, R10 }, \ - { R27, R26, R25, R24, R23, R22, R21, R20 }, \ - { R37, R36, R35, R34, R33, R32, R31, R30 }, \ - { R47, R46, R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/omkbd/runner3680/5x8/info.json b/keyboards/omkbd/runner3680/5x8/info.json index 5b4f3ad5cd07..e851ec39b4ee 100644 --- a/keyboards/omkbd/runner3680/5x8/info.json +++ b/keyboards/omkbd/runner3680/5x8/info.json @@ -22,90 +22,95 @@ "layouts": { "LAYOUT": { "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":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":16, "y":0}, + {"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}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1}, - {"x":16, "y":1}, + {"matrix": [5, 7], "x": 9, "y": 0}, + {"matrix": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0}, + {"matrix": [5, 1], "x": 15, "y": 0}, + {"matrix": [5, 0], "x": 16, "y": 0}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2}, - {"x":15, "y":2}, - {"x":16, "y":2}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3}, - {"x":6, "y":3}, - {"x":7, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3}, - {"x":13, "y":3}, - {"x":14, "y":3}, - {"x":15, "y":3}, - {"x":16, "y":3}, + {"matrix": [6, 7], "x": 9, "y": 1}, + {"matrix": [6, 6], "x": 10, "y": 1}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1}, + {"matrix": [6, 1], "x": 15, "y": 1}, + {"matrix": [6, 0], "x": 16, "y": 1}, - {"x":0, "y":4}, - {"x":1, "y":4}, - {"x":2, "y":4}, - {"x":3, "y":4}, - {"x":4, "y":4}, - {"x":5, "y":4}, - {"x":6, "y":4}, - {"x":7, "y":4}, - {"x":9, "y":4}, - {"x":10, "y":4}, - {"x":11, "y":4}, - {"x":12, "y":4}, - {"x":13, "y":4}, - {"x":14, "y":4}, - {"x":15, "y":4}, - {"x":16, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + + {"matrix": [7, 7], "x": 9, "y": 2}, + {"matrix": [7, 6], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2}, + {"matrix": [7, 1], "x": 15, "y": 2}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [8, 7], "x": 9, "y": 3}, + {"matrix": [8, 6], "x": 10, "y": 3}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3}, + {"matrix": [8, 1], "x": 15, "y": 3}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [9, 7], "x": 9, "y": 4}, + {"matrix": [9, 6], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [9, 4], "x": 12, "y": 4}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4}, + {"matrix": [9, 1], "x": 15, "y": 4}, + {"matrix": [9, 0], "x": 16, "y": 4} ] } } diff --git a/keyboards/orange75/info.json b/keyboards/orange75/info.json index dba6b2520826..59665c2cb0fa 100644 --- a/keyboards/orange75/info.json +++ b/keyboards/orange75/info.json @@ -21,88 +21,97 @@ "layouts": { "LAYOUT": { "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":"`", "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":"Delete", "x":13, "y":1.25}, - {"label":"Back Space", "x":14, "y":1.25}, - {"label":"Home", "x":15, "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":"End", "x":15, "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":"PgUp", "x":15, "y":3.25}, - {"label":"Shift", "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":"Shift", "x":12.25, "y":4.25, "w":1.75}, - {"label":"Up", "x":14, "y":4.25}, - {"label":"PgDn", "x":15, "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":"Left", "x":13, "y":5.25}, - {"label":"Down", "x":14, "y":5.25}, - {"label":"Right", "x":15, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [2, 0], "x": 2, "y": 0}, + {"matrix": [3, 0], "x": 3, "y": 0}, + {"matrix": [4, 0], "x": 4, "y": 0}, + {"matrix": [5, 0], "x": 5, "y": 0}, + + {"matrix": [6, 0], "x": 6.5, "y": 0}, + {"matrix": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [8, 0], "x": 8.5, "y": 0}, + {"matrix": [9, 0], "x": 9.5, "y": 0}, + + {"matrix": [10, 0], "x": 11, "y": 0}, + {"matrix": [11, 0], "x": 12, "y": 0}, + {"matrix": [12, 0], "x": 13, "y": 0}, + {"matrix": [13, 0], "x": 14, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [4, 1], "x": 4, "y": 1.25}, + {"matrix": [5, 1], "x": 5, "y": 1.25}, + {"matrix": [6, 1], "x": 6, "y": 1.25}, + {"matrix": [7, 1], "x": 7, "y": 1.25}, + {"matrix": [8, 1], "x": 8, "y": 1.25}, + {"matrix": [9, 1], "x": 9, "y": 1.25}, + {"matrix": [10, 1], "x": 10, "y": 1.25}, + {"matrix": [11, 1], "x": 11, "y": 1.25}, + {"matrix": [12, 1], "x": 12, "y": 1.25}, + {"matrix": [14, 0], "x": 13, "y": 1.25}, + {"matrix": [13, 1], "x": 14, "y": 1.25}, + {"matrix": [14, 1], "x": 15, "y": 1.25}, + + {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + {"matrix": [6, 2], "x": 6.5, "y": 2.25}, + {"matrix": [7, 2], "x": 7.5, "y": 2.25}, + {"matrix": [8, 2], "x": 8.5, "y": 2.25}, + {"matrix": [9, 2], "x": 9.5, "y": 2.25}, + {"matrix": [10, 2], "x": 10.5, "y": 2.25}, + {"matrix": [11, 2], "x": 11.5, "y": 2.25}, + {"matrix": [12, 2], "x": 12.5, "y": 2.25}, + {"matrix": [13, 2], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [14, 2], "x": 15, "y": 2.25}, + + {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 3], "x": 1.75, "y": 3.25}, + {"matrix": [2, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [4, 3], "x": 4.75, "y": 3.25}, + {"matrix": [5, 3], "x": 5.75, "y": 3.25}, + {"matrix": [6, 3], "x": 6.75, "y": 3.25}, + {"matrix": [7, 3], "x": 7.75, "y": 3.25}, + {"matrix": [8, 3], "x": 8.75, "y": 3.25}, + {"matrix": [9, 3], "x": 9.75, "y": 3.25}, + {"matrix": [10, 3], "x": 10.75, "y": 3.25}, + {"matrix": [11, 3], "x": 11.75, "y": 3.25}, + {"matrix": [12, 3], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [14, 3], "x": 15, "y": 3.25}, + + {"matrix": [0, 4], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [1, 4], "x": 1.25, "y": 4.25}, + {"matrix": [2, 4], "x": 2.25, "y": 4.25}, + {"matrix": [3, 4], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [5, 4], "x": 5.25, "y": 4.25}, + {"matrix": [6, 4], "x": 6.25, "y": 4.25}, + {"matrix": [7, 4], "x": 7.25, "y": 4.25}, + {"matrix": [8, 4], "x": 8.25, "y": 4.25}, + {"matrix": [9, 4], "x": 9.25, "y": 4.25}, + {"matrix": [10, 4], "x": 10.25, "y": 4.25}, + {"matrix": [11, 4], "x": 11.25, "y": 4.25}, + {"matrix": [12, 4], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [13, 4], "x": 14, "y": 4.25}, + {"matrix": [14, 4], "x": 15, "y": 4.25}, + + {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [10, 5], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.25, "w": 1.25}, + + {"matrix": [12, 5], "x": 13, "y": 5.25}, + {"matrix": [13, 5], "x": 14, "y": 5.25}, + {"matrix": [14, 5], "x": 15, "y": 5.25} ] } } diff --git a/keyboards/orange75/orange75.h b/keyboards/orange75/orange75.h deleted file mode 100644 index a7ddd5a06df4..000000000000 --- a/keyboards/orange75/orange75.h +++ /dev/null @@ -1,29 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K014, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, \ - K500, K501, K502, K506, K510, K511, K512, K513, K514 \ -) { \ - { K000, K100, K200, K300, K400, K500 }, \ - { KC_NO, K101, K201, K301, K401, K501 }, \ - { K002, K102, K202, K302, K402, K502 }, \ - { K003, K103, K203, K303, K403, KC_NO}, \ - { K004, K104, K204, K304, K404, KC_NO}, \ - { K005, K105, K205, K305, K405, KC_NO}, \ - { K006, K106, K206, K306, K406, K506 }, \ - { K007, K107, K207, K307, K407, KC_NO}, \ - { K008, K108, K208, K308, K408, KC_NO}, \ - { K009, K109, K209, K309, K409, KC_NO}, \ - { K010, K110, K210, K310, K410, K510 }, \ - { K011, K111, K211, K311, K411, K511 }, \ - { K012, K112, K212, K312, K412, K512 }, \ - { K013, K113, K213, KC_NO,K413, K513 }, \ - { K014, K114, K214, K314, K414, K514 } \ -} - diff --git a/keyboards/orthocode/info.json b/keyboards/orthocode/info.json index f01c75da91fc..144075fde15e 100644 --- a/keyboards/orthocode/info.json +++ b/keyboards/orthocode/info.json @@ -27,82 +27,92 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Mute", "x":0.5, "y":0}, + {"matrix": [3, 0], "x": 0.5, "y": 0}, - {"label":"RGB Tog", "x":0.5, "y":1}, - {"label":"Esc", "x":1.75, "y":1}, - {"label":"1", "x":3, "y":1}, - {"label":"2", "x":4, "y":1}, - {"label":"3", "x":5, "y":1}, - {"label":"4", "x":6, "y":1}, - {"label":"5", "x":7, "y":1}, - {"label":"6", "x":10.5, "y":1}, - {"label":"7", "x":11.5, "y":1}, - {"label":"8", "x":12.5, "y":1}, - {"label":"9", "x":13.5, "y":1}, - {"label":"0", "x":14.5, "y":1}, - {"label":"_", "x":15.5, "y":1}, - {"label":"+", "x":16.5, "y":1}, - {"label":"Home", "x":17.5, "y":1}, + {"matrix": [0, 0], "x": 0.5, "y": 1}, - {"label":"RGB Mode", "x":0.25, "y":2}, - {"label":"Tab", "x":1.5, "y":2, "w":1.5}, - {"label":"Q", "x":3, "y":2}, - {"label":"W", "x":4, "y":2}, - {"label":"E", "x":5, "y":2}, - {"label":"R", "x":6, "y":2}, - {"label":"T", "x":7, "y":2}, - {"label":"Y", "x":10.5, "y":2}, - {"label":"U", "x":11.5, "y":2}, - {"label":"I", "x":12.5, "y":2}, - {"label":"O", "x":13.5, "y":2}, - {"label":"P", "x":14.5, "y":2}, - {"label":"|", "x":15.5, "y":2, "w":1.5}, - {"label":"Delete", "x":17, "y":2}, - {"label":"End", "x":18, "y":2}, + {"matrix": [0, 1], "x": 1.75, "y": 1}, + {"matrix": [0, 2], "x": 3, "y": 1}, + {"matrix": [0, 3], "x": 4, "y": 1}, + {"matrix": [0, 4], "x": 5, "y": 1}, + {"matrix": [0, 5], "x": 6, "y": 1}, + {"matrix": [0, 6], "x": 7, "y": 1}, - {"label":"RGB RMode", "x":0, "y":3}, - {"label":"Caps", "x":1.25, "y":3, "w":1.75}, - {"label":"A", "x":3, "y":3}, - {"label":"S", "x":4, "y":3}, - {"label":"D", "x":5, "y":3}, - {"label":"F", "x":6, "y":3}, - {"label":"G", "x":7, "y":3}, - {"label":"H", "x":10.5, "y":3}, - {"label":"J", "x":11.5, "y":3}, - {"label":"K", "x":12.5, "y":3}, - {"label":"L", "x":13.5, "y":3}, - {"label":":", "x":14.5, "y":3}, - {"label":"\"", "x":15.5, "y":3}, - {"label":"Enter", "x":16.5, "y":3, "w":2.25}, + {"matrix": [0, 7], "x": 10.5, "y": 1}, + {"matrix": [0, 8], "x": 11.5, "y": 1}, + {"matrix": [0, 9], "x": 12.5, "y": 1}, + {"matrix": [0, 10], "x": 13.5, "y": 1}, + {"matrix": [0, 11], "x": 14.5, "y": 1}, + {"matrix": [0, 12], "x": 15.5, "y": 1}, + {"matrix": [0, 13], "x": 16.5, "y": 1}, + {"matrix": [0, 14], "x": 17.5, "y": 1}, - {"label":"Shift", "x":0.75, "y":4, "w":2.25}, - {"label":"Z", "x":3, "y":4}, - {"label":"X", "x":4, "y":4}, - {"label":"C", "x":5, "y":4}, - {"label":"V", "x":6, "y":4}, - {"label":"B", "x":7, "y":4}, - {"label":"N", "x":10.5, "y":4}, - {"label":"M", "x":11.5, "y":4}, - {"label":"<", "x":12.5, "y":4}, - {"label":">", "x":13.5, "y":4}, - {"label":"?", "x":14.5, "y":4}, - {"label":"\u2191", "x":17, "y":4}, + {"matrix": [1, 0], "x": 0.25, "y": 2}, - {"label":"Ctrl", "x":1.25, "y":5, "w":1.25}, - {"label":"Win", "x":2.5, "y":5, "w":1.25}, - {"label":"Alt", "x":3.75, "y":5, "w":1.25}, - {"label":"Fn", "x":5.5, "y":5, "w":1.25}, - {"label":"th1", "x":6.75, "y":5, "h":2.75}, - {"label":"th2", "x":7.75, "y":5.25, "h":2.25}, - {"label":"th3", "x":9.75, "y":5.25, "h":2.25}, - {"label":"th4", "x":10.75, "y":5, "h":2.75}, - {"label":"Fn", "x":11.75, "y":5, "w":1.25}, - {"label":"Alt", "x":13, "y":5, "w":1.25}, - {"label":"Ctrl", "x":14.25, "y":5, "w":1.25}, - {"label":"\u2190", "x":16, "y":5}, - {"label":"\u2193", "x":17, "y":5}, - {"label":"\u2192", "x":18, "y":5} + {"matrix": [1, 1], "x": 1.5, "y": 2, "w": 1.5}, + {"matrix": [1, 2], "x": 3, "y": 2}, + {"matrix": [1, 3], "x": 4, "y": 2}, + {"matrix": [1, 4], "x": 5, "y": 2}, + {"matrix": [1, 5], "x": 6, "y": 2}, + {"matrix": [1, 6], "x": 7, "y": 2}, + + {"matrix": [1, 7], "x": 10.5, "y": 2}, + {"matrix": [1, 8], "x": 11.5, "y": 2}, + {"matrix": [1, 9], "x": 12.5, "y": 2}, + {"matrix": [1, 10], "x": 13.5, "y": 2}, + {"matrix": [1, 11], "x": 14.5, "y": 2}, + {"matrix": [1, 12], "x": 15.5, "y": 2, "w": 1.5}, + {"matrix": [1, 13], "x": 17, "y": 2}, + {"matrix": [1, 14], "x": 18, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + + {"matrix": [2, 1], "x": 1.25, "y": 3, "w": 1.75}, + {"matrix": [2, 2], "x": 3, "y": 3}, + {"matrix": [2, 3], "x": 4, "y": 3}, + {"matrix": [2, 4], "x": 5, "y": 3}, + {"matrix": [2, 5], "x": 6, "y": 3}, + {"matrix": [2, 6], "x": 7, "y": 3}, + + {"matrix": [2, 7], "x": 10.5, "y": 3}, + {"matrix": [2, 8], "x": 11.5, "y": 3}, + {"matrix": [2, 9], "x": 12.5, "y": 3}, + {"matrix": [2, 10], "x": 13.5, "y": 3}, + {"matrix": [2, 11], "x": 14.5, "y": 3}, + {"matrix": [2, 12], "x": 15.5, "y": 3}, + {"matrix": [2, 13], "x": 16.5, "y": 3, "w": 2.25}, + + {"matrix": [3, 1], "x": 0.75, "y": 4, "w": 2.25}, + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + {"matrix": [3, 6], "x": 7, "y": 4}, + + {"matrix": [3, 7], "x": 10.5, "y": 4}, + {"matrix": [3, 8], "x": 11.5, "y": 4}, + {"matrix": [3, 9], "x": 12.5, "y": 4}, + {"matrix": [3, 10], "x": 13.5, "y": 4}, + {"matrix": [3, 11], "x": 14.5, "y": 4}, + + {"matrix": [3, 13], "x": 17, "y": 4}, + + {"matrix": [4, 1], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 5, "w": 1.25}, + {"matrix": [4, 4], "x": 5.5, "y": 5, "w": 1.25}, + {"matrix": [4, 5], "x": 6.75, "y": 5, "h": 2.75}, + {"matrix": [4, 6], "x": 7.75, "y": 5.25, "h": 2.25}, + + {"matrix": [4, 7], "x": 9.75, "y": 5.25, "h": 2.25}, + {"matrix": [4, 8], "x": 10.75, "y": 5, "h": 2.75}, + {"matrix": [4, 9], "x": 11.75, "y": 5, "w": 1.25}, + {"matrix": [4, 10], "x": 13, "y": 5, "w": 1.25}, + {"matrix": [4, 11], "x": 14.25, "y": 5, "w": 1.25}, + + {"matrix": [4, 12], "x": 16, "y": 5}, + {"matrix": [4, 13], "x": 17, "y": 5}, + {"matrix": [4, 14], "x": 18, "y": 5} ] } } diff --git a/keyboards/orthocode/orthocode.h b/keyboards/orthocode/orthocode.h index 5e87418706a6..e1edbbe04ded 100644 --- a/keyboards/orthocode/orthocode.h +++ b/keyboards/orthocode/orthocode.h @@ -16,26 +16,10 @@ #pragma once -#define _x_ KC_NO #define KC_SHSP SHIFTSPACE #include "quantum.h" -#define LAYOUT( \ - K30, \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ -{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ -{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ -{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, _x_ }, \ -{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, _x_, K3D, _x_ }, \ -{ _x_, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E} \ -} - enum custom_keycodes { SHIFTSPACE = QK_KB_0, }; diff --git a/keyboards/orthodox/rev1/info.json b/keyboards/orthodox/rev1/info.json index 0200ccdc5ced..042187b8bf0f 100644 --- a/keyboards/orthodox/rev1/info.json +++ b/keyboards/orthodox/rev1/info.json @@ -20,14 +20,61 @@ "layouts": { "LAYOUT": { "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":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, + {"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}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":2.75, "h":1.25}, {"x":8, "y":2.75, "h":1.25}, - {"x":10, "y":2.75, "h":1.25}, {"x":11, "y":2.75, "h":1.25}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, + {"matrix": [3, 5], "x": 13, "y": 0}, + {"matrix": [3, 4], "x": 14, "y": 0}, + {"matrix": [3, 3], "x": 15, "y": 0}, + {"matrix": [3, 2], "x": 16, "y": 0}, + {"matrix": [3, 1], "x": 17, "y": 0}, + {"matrix": [3, 0], "x": 18, "y": 0}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":3.75, "h":1.25}, {"x":7, "y":4}, {"x":8, "y":4}, - {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":3.75, "h":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 6], "x": 7, "y": 2.75, "h": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 2.75, "h": 1.25}, + + {"matrix": [4, 8], "x": 10, "y": 2.75, "h": 1.25}, + {"matrix": [4, 6], "x": 11, "y": 2.75, "h": 1.25}, + + {"matrix": [4, 5], "x": 13, "y": 1}, + {"matrix": [4, 4], "x": 14, "y": 1}, + {"matrix": [4, 3], "x": 15, "y": 1}, + {"matrix": [4, 2], "x": 16, "y": 1}, + {"matrix": [4, 1], "x": 17, "y": 1}, + {"matrix": [4, 0], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [2, 6], "x": 6, "y": 3.75, "h": 1.25}, + {"matrix": [2, 7], "x": 7, "y": 4}, + {"matrix": [2, 8], "x": 8, "y": 4}, + + {"matrix": [5, 8], "x": 10, "y": 4}, + {"matrix": [5, 7], "x": 11, "y": 4}, + {"matrix": [5, 6], "x": 12, "y": 3.75, "h": 1.25}, + + {"matrix": [5, 5], "x": 13, "y": 2}, + {"matrix": [5, 4], "x": 14, "y": 2}, + {"matrix": [5, 3], "x": 15, "y": 2}, + {"matrix": [5, 2], "x": 16, "y": 2}, + {"matrix": [5, 1], "x": 17, "y": 2}, + {"matrix": [5, 0], "x": 18, "y": 2} ] } } diff --git a/keyboards/orthodox/rev1/rev1.c b/keyboards/orthodox/rev1/rev1.c index 1101f4379be7..ecdae6b48d44 100644 --- a/keyboards/orthodox/rev1/rev1.c +++ b/keyboards/orthodox/rev1/rev1.c @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev1/rev1.h b/keyboards/orthodox/rev1/rev1.h deleted file mode 100644 index 328cb46cc1fc..000000000000 --- a/keyboards/orthodox/rev1/rev1.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -This is the header file for the subproject - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2017 Art Ortenburger - -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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO, L18}, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R18, R17, R16, R15, R14, R13, R12, KC_NO, R10 }, \ - { R28, R27, R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/orthodox/rev3/info.json b/keyboards/orthodox/rev3/info.json index 0681d736f93c..e2b3abd34d06 100644 --- a/keyboards/orthodox/rev3/info.json +++ b/keyboards/orthodox/rev3/info.json @@ -20,14 +20,61 @@ "layouts": { "LAYOUT": { "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":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, + {"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}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":2.75, "h":1.25}, {"x":8, "y":2.75, "h":1.25}, - {"x":10, "y":2.75, "h":1.25}, {"x":11, "y":2.75, "h":1.25}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, + {"matrix": [3, 5], "x": 13, "y": 0}, + {"matrix": [3, 4], "x": 14, "y": 0}, + {"matrix": [3, 3], "x": 15, "y": 0}, + {"matrix": [3, 2], "x": 16, "y": 0}, + {"matrix": [3, 1], "x": 17, "y": 0}, + {"matrix": [3, 0], "x": 18, "y": 0}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":3.75, "h":1.25}, {"x":7, "y":4}, {"x":8, "y":4}, - {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":3.75, "h":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 6], "x": 7, "y": 2.75, "h": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 2.75, "h": 1.25}, + + {"matrix": [4, 8], "x": 10, "y": 2.75, "h": 1.25}, + {"matrix": [4, 6], "x": 11, "y": 2.75, "h": 1.25}, + + {"matrix": [4, 5], "x": 13, "y": 1}, + {"matrix": [4, 4], "x": 14, "y": 1}, + {"matrix": [4, 3], "x": 15, "y": 1}, + {"matrix": [4, 2], "x": 16, "y": 1}, + {"matrix": [4, 1], "x": 17, "y": 1}, + {"matrix": [4, 0], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [2, 6], "x": 6, "y": 3.75, "h": 1.25}, + {"matrix": [2, 7], "x": 7, "y": 4}, + {"matrix": [2, 8], "x": 8, "y": 4}, + + {"matrix": [5, 8], "x": 10, "y": 4}, + {"matrix": [5, 7], "x": 11, "y": 4}, + {"matrix": [5, 6], "x": 12, "y": 3.75, "h": 1.25}, + + {"matrix": [5, 5], "x": 13, "y": 2}, + {"matrix": [5, 4], "x": 14, "y": 2}, + {"matrix": [5, 3], "x": 15, "y": 2}, + {"matrix": [5, 2], "x": 16, "y": 2}, + {"matrix": [5, 1], "x": 17, "y": 2}, + {"matrix": [5, 0], "x": 18, "y": 2} ] } } diff --git a/keyboards/orthodox/rev3/rev3.c b/keyboards/orthodox/rev3/rev3.c index 79af5cd668e8..ecdae6b48d44 100644 --- a/keyboards/orthodox/rev3/rev3.c +++ b/keyboards/orthodox/rev3/rev3.c @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "rev3.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev3/rev3.h b/keyboards/orthodox/rev3/rev3.h deleted file mode 100644 index 328cb46cc1fc..000000000000 --- a/keyboards/orthodox/rev3/rev3.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -This is the header file for the subproject - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2017 Art Ortenburger - -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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO, L18}, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R18, R17, R16, R15, R14, R13, R12, KC_NO, R10 }, \ - { R28, R27, R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/orthodox/rev3_teensy/info.json b/keyboards/orthodox/rev3_teensy/info.json index 9a292b0f74e6..345ff58145ea 100644 --- a/keyboards/orthodox/rev3_teensy/info.json +++ b/keyboards/orthodox/rev3_teensy/info.json @@ -16,18 +16,65 @@ "soft_serial_pin": "D0" }, "processor": "atmega32u4", - "bootloader": "halfkay", + "bootloader": "halfkay", "layouts": { "LAYOUT": { "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":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":16, "y":0}, {"x":17, "y":0}, {"x":18, "y":0}, + {"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}, - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":7, "y":2.75, "h":1.25}, {"x":8, "y":2.75, "h":1.25}, - {"x":10, "y":2.75, "h":1.25}, {"x":11, "y":2.75, "h":1.25}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":17, "y":1}, {"x":18, "y":1}, + {"matrix": [3, 5], "x": 13, "y": 0}, + {"matrix": [3, 4], "x": 14, "y": 0}, + {"matrix": [3, 3], "x": 15, "y": 0}, + {"matrix": [3, 2], "x": 16, "y": 0}, + {"matrix": [3, 1], "x": 17, "y": 0}, + {"matrix": [3, 0], "x": 18, "y": 0}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":3.75, "h":1.25}, {"x":7, "y":4}, {"x":8, "y":4}, - {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":3.75, "h":1.25}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":17, "y":2}, {"x":18, "y":2} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [1, 6], "x": 7, "y": 2.75, "h": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 2.75, "h": 1.25}, + + {"matrix": [4, 8], "x": 10, "y": 2.75, "h": 1.25}, + {"matrix": [4, 6], "x": 11, "y": 2.75, "h": 1.25}, + + {"matrix": [4, 5], "x": 13, "y": 1}, + {"matrix": [4, 4], "x": 14, "y": 1}, + {"matrix": [4, 3], "x": 15, "y": 1}, + {"matrix": [4, 2], "x": 16, "y": 1}, + {"matrix": [4, 1], "x": 17, "y": 1}, + {"matrix": [4, 0], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [2, 6], "x": 6, "y": 3.75, "h": 1.25}, + {"matrix": [2, 7], "x": 7, "y": 4}, + {"matrix": [2, 8], "x": 8, "y": 4}, + + {"matrix": [5, 8], "x": 10, "y": 4}, + {"matrix": [5, 7], "x": 11, "y": 4}, + {"matrix": [5, 6], "x": 12, "y": 3.75, "h": 1.25}, + + {"matrix": [5, 5], "x": 13, "y": 2}, + {"matrix": [5, 4], "x": 14, "y": 2}, + {"matrix": [5, 3], "x": 15, "y": 2}, + {"matrix": [5, 2], "x": 16, "y": 2}, + {"matrix": [5, 1], "x": 17, "y": 2}, + {"matrix": [5, 0], "x": 18, "y": 2} ] } } diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.c b/keyboards/orthodox/rev3_teensy/rev3_teensy.c index 9faf94fd9ae8..ecdae6b48d44 100644 --- a/keyboards/orthodox/rev3_teensy/rev3_teensy.c +++ b/keyboards/orthodox/rev3_teensy/rev3_teensy.c @@ -19,7 +19,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -#include "rev3_teensy.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE __attribute__ ((weak)) diff --git a/keyboards/orthodox/rev3_teensy/rev3_teensy.h b/keyboards/orthodox/rev3_teensy/rev3_teensy.h deleted file mode 100644 index 328cb46cc1fc..000000000000 --- a/keyboards/orthodox/rev3_teensy/rev3_teensy.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -This is the header file for the subproject - -Copyright 2012 Jun Wako -Copyright 2015 Jack Humbert -Copyright 2017 Art Ortenburger - -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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L16, L18, R10, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, R20, R21, R22, R23, R24, R25, R26, R27, R28 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15, L16, KC_NO, L18}, \ - { L20, L21, L22, L23, L24, L25, L26, L27, L28 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R18, R17, R16, R15, R14, R13, R12, KC_NO, R10 }, \ - { R28, R27, R26, R25, R24, R23, R22, R21, R20 } \ - } diff --git a/keyboards/owlab/jelly_epoch/hotswap/hotswap.h b/keyboards/owlab/jelly_epoch/hotswap/hotswap.h deleted file mode 100644 index c9ab3643a1cb..000000000000 --- a/keyboards/owlab/jelly_epoch/hotswap/hotswap.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2021 owlab - -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( \ - K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K313, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K512, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K511, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K510, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, \ - K500, K501, K502, K504, K506, K507, K508, K509, K513 \ -) { \ - { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \ - { K500, K501, K502, ____, K504, ____, K506, K507, K508, K509, K510, K511, K512, K513 } \ -} diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json index 63a884fc2c59..0c348d0cdc49 100644 --- a/keyboards/owlab/jelly_epoch/hotswap/info.json +++ b/keyboards/owlab/jelly_epoch/hotswap/info.json @@ -21,87 +21,97 @@ "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, "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, "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, "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, "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, "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, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":13, "y":5.25}, - {"x":14, "y":5.25}, - {"x":15, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 2], "x": 1.25, "y": 0}, + {"matrix": [0, 3], "x": 2.25, "y": 0}, + {"matrix": [0, 4], "x": 3.25, "y": 0}, + {"matrix": [0, 5], "x": 4.25, "y": 0}, + + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + + {"matrix": [0, 10], "x": 9.75, "y": 0}, + {"matrix": [0, 11], "x": 10.75, "y": 0}, + {"matrix": [0, 12], "x": 11.75, "y": 0}, + {"matrix": [0, 13], "x": 12.75, "y": 0}, + + {"matrix": [4, 12], "x": 14, "y": 0}, + {"matrix": [3, 13], "x": 15, "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": [5, 12], "x": 15, "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": [5, 11], "x": 15, "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": [5, 10], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "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, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 6], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 11.25, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 8], "x": 13, "y": 5.25}, + {"matrix": [5, 9], "x": 14, "y": 5.25}, + {"matrix": [5, 13], "x": 15, "y": 5.25} ] } } diff --git a/keyboards/owlab/spring/info.json b/keyboards/owlab/spring/info.json index c6d40526cf7c..1a01d11656bc 100644 --- a/keyboards/owlab/spring/info.json +++ b/keyboards/owlab/spring/info.json @@ -24,73 +24,81 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0.5, "y":0}, - {"x":1.75, "y":0}, - {"x":2.75, "y":0}, - {"x":3.75, "y":0}, - {"x":4.75, "y":0}, - {"x":5.75, "y":0}, - {"x":6.75, "y":0}, - {"x":7.75, "y":0}, - {"x":8.75, "y":0}, - {"x":9.75, "y":0}, - {"x":10.75, "y":0}, - {"x":11.75, "y":0}, - {"x":12.75, "y":0}, - {"x":13.75, "y":0}, - {"x":14.75, "y":0, "w":2}, - {"x":0.25, "y":1}, - {"x":1.5, "y":1, "w":1.5}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":13, "y":1}, - {"x":14, "y":1}, - {"x":15, "y":1, "w":1.5}, - {"x":0, "y":2}, - {"x":1.25, "y":2, "w":1.75}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":13, "y":2}, - {"x":14, "y":2, "w":2.25}, - {"x":1, "y":3, "w":2.25}, - {"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}, - {"x":13.25, "y":3}, - {"x":14.25, "y":3}, - {"x":15.25, "y":3, "w":1.75}, - {"x":1, "y":4, "w":1.25}, - {"x":2.25, "y":4, "w":1.25}, - {"x":4.75, "y":4, "w":1.25}, - {"x":6, "y":4, "w":2.25}, - {"x":8.25, "y":4, "w":2.75}, - {"x":11, "y":4, "w":1.25}, - {"x":13.25, "y":4}, - {"x":14.25, "y":4}, - {"x":15.25, "y":4} + {"matrix": [0, 0], "x": 0.5, "y": 0}, + + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 13.75, "y": 0}, + {"matrix": [0, 14], "x": 14.75, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + + {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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": [2, 11], "x": 12, "y": 2}, + {"matrix": [2, 12], "x": 13, "y": 2}, + {"matrix": [2, 13], "x": 14, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 1, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 3.25, "y": 3}, + {"matrix": [3, 2], "x": 4.25, "y": 3}, + {"matrix": [3, 3], "x": 5.25, "y": 3}, + {"matrix": [3, 4], "x": 6.25, "y": 3}, + {"matrix": [3, 5], "x": 7.25, "y": 3}, + {"matrix": [3, 6], "x": 8.25, "y": 3}, + {"matrix": [3, 7], "x": 9.25, "y": 3}, + {"matrix": [3, 8], "x": 10.25, "y": 3}, + {"matrix": [3, 9], "x": 11.25, "y": 3}, + {"matrix": [3, 10], "x": 12.25, "y": 3}, + {"matrix": [3, 11], "x": 13.25, "y": 3}, + {"matrix": [3, 12], "x": 14.25, "y": 3}, + {"matrix": [3, 13], "x": 15.25, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 4.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 6, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13.25, "y": 4}, + {"matrix": [4, 12], "x": 14.25, "y": 4}, + {"matrix": [4, 13], "x": 15.25, "y": 4} ] } } diff --git a/keyboards/owlab/spring/spring.c b/keyboards/owlab/spring/spring.c index 60982c1517d1..8088fb03c247 100644 --- a/keyboards/owlab/spring/spring.c +++ b/keyboards/owlab/spring/spring.c @@ -14,7 +14,7 @@ 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 . */ -#include "spring.h" +#include "quantum.h" enum caps_modes{ CAPS_MODE_UPPER = 0, //UPPER CASE diff --git a/keyboards/owlab/spring/spring.h b/keyboards/owlab/spring/spring.h deleted file mode 100644 index 24dc4e776214..000000000000 --- a/keyboards/owlab/spring/spring.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2021 OwLab - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K404, K405, K409, K411, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO }, \ - { K400, K401, K402, KC_NO, K404, K405, KC_NO, KC_NO, KC_NO, K409, KC_NO, K411, K412, K413, KC_NO } \ -} diff --git a/keyboards/pabile/p42/info.json b/keyboards/pabile/p42/info.json index 464b10b4ddd0..40037f126dfb 100644 --- a/keyboards/pabile/p42/info.json +++ b/keyboards/pabile/p42/info.json @@ -18,7 +18,54 @@ "layouts": { "LAYOUT": { "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"label":",", "x":7, "y":2}, {"label":".", "x":8, "y":2}, {"x":9, "y":2}, {"x":10.25, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10.25, "y":3}] + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [2, 10], "x": 10.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + + {"matrix": [3, 10], "x": 10.25, "y": 3} + ] } } } diff --git a/keyboards/pabile/p42/p42.h b/keyboards/pabile/p42/p42.h deleted file mode 100644 index 41aed042a20b..000000000000 --- a/keyboards/pabile/p42/p42.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2020 Pabile - -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( \ - 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, k210,\ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310 \ -) \ -{ \ - {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, KC_NO}, \ - {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, KC_NO}, \ - {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210}, \ - {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310} \ -} diff --git a/keyboards/papercranekeyboards/gerald65/gerald65.h b/keyboards/papercranekeyboards/gerald65/gerald65.h deleted file mode 100644 index b433051bb740..000000000000 --- a/keyboards/papercranekeyboards/gerald65/gerald65.h +++ /dev/null @@ -1,29 +0,0 @@ -// Copyright 2021 PaperCraneKeyboards (@PaperCraneKeyboards) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \ - k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, k43, \ - k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, \ - k58, k59, k60, k61, k62, k63, k64, k65, k66 \ -) { \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14}, \ - {k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42, KC_NO, k43}, \ - {k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, KC_NO, k56, k57}, \ - {k58, KC_NO, k59, k60, KC_NO, k61, k62, KC_NO, k63, KC_NO, KC_NO, KC_NO, k64, k65, k66} \ -} diff --git a/keyboards/papercranekeyboards/gerald65/info.json b/keyboards/papercranekeyboards/gerald65/info.json index 80b8f115b204..533c50a76c3c 100644 --- a/keyboards/papercranekeyboards/gerald65/info.json +++ b/keyboards/papercranekeyboards/gerald65/info.json @@ -18,73 +18,87 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":8.25, "y":0}, - {"label":"*", "x":9.25, "y":0}, - {"label":"(", "x":10.25, "y":0}, - {"label":")", "x":11.25, "y":0}, - {"label":"_", "x":12.25, "y":0}, - {"label":"+", "x":13.25, "y":0}, - {"label":"Backspace", "x":14.25, "y":0, "w":2}, - {"label":"Delete", "x":16.5, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.75, "y":1}, - {"label":"U", "x":8.75, "y":1}, - {"label":"I", "x":9.75, "y":1}, - {"label":"O", "x":10.75, "y":1}, - {"label":"P", "x":11.75, "y":1}, - {"label":"{", "x":12.75, "y":1}, - {"label":"}", "x":13.75, "y":1}, - {"label":"|", "x":14.75, "y":1, "w":1.5}, - {"label":"Page Up", "x":16.5, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":8, "y":2}, - {"label":"J", "x":9, "y":2}, - {"label":"K", "x":10, "y":2}, - {"label":"L", "x":11, "y":2}, - {"label":":", "x":12, "y":2}, - {"label":"\"", "x":13, "y":2}, - {"label":"Enter", "x":14, "y":2, "w":2.25}, - {"label":"Page Down", "x":16.5, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8.5, "y":3}, - {"label":"M", "x":9.5, "y":3}, - {"label":"<", "x":10.5, "y":3}, - {"label":">", "x":11.5, "y":3}, - {"label":"?", "x":12.5, "y":3}, - {"label":"Shift", "x":13.5, "y":3, "w":1.75}, - {"label":"up", "x":15.5, "y":3}, - {"label":"Home", "x":16.5, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Alt", "x":3.25, "y":4, "w":1.25}, - {"label":"space", "x":4.5, "y":4, "w":2}, - {"label":"space", "x":6.5, "y":4}, - {"label":"space", "x":8.25, "y":4, "w":2.75}, - {"label":"Win", "x":11, "y":4, "w":1.25}, - {"label":"left", "x":14.5, "y":4}, - {"label":"down", "x":15.5, "y":4}, - {"label":"right", "x":16.5, "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": 8.25, "y": 0}, + {"matrix": [0, 8], "x": 9.25, "y": 0}, + {"matrix": [0, 9], "x": 10.25, "y": 0}, + {"matrix": [0, 10], "x": 11.25, "y": 0}, + {"matrix": [0, 11], "x": 12.25, "y": 0}, + {"matrix": [0, 12], "x": 13.25, "y": 0}, + {"matrix": [0, 13], "x": 14.25, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 16.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + {"matrix": [1, 10], "x": 11.75, "y": 1}, + {"matrix": [1, 11], "x": 12.75, "y": 1}, + {"matrix": [1, 12], "x": 13.75, "y": 1}, + {"matrix": [1, 13], "x": 14.75, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 16.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + {"matrix": [2, 12], "x": 14, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 16.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 8.5, "y": 3}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3}, + {"matrix": [3, 9], "x": 11.5, "y": 3}, + {"matrix": [3, 10], "x": 12.5, "y": 3}, + {"matrix": [3, 11], "x": 13.5, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 15.5, "y": 3}, + {"matrix": [3, 14], "x": 16.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 6.5, "y": 4}, + + {"matrix": [4, 6], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 8], "x": 11, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 14.5, "y": 4}, + {"matrix": [4, 13], "x": 15.5, "y": 4}, + {"matrix": [4, 14], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/percent/skog/info.json b/keyboards/percent/skog/info.json index bc9543b95112..19e7f816036c 100644 --- a/keyboards/percent/skog/info.json +++ b/keyboards/percent/skog/info.json @@ -28,7 +28,110 @@ "bootloader": "bootloadhid", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.5}, {"x":1, "y":1.5}, {"x":2, "y":1.5}, {"x":3, "y":1.5}, {"x":4, "y":1.5}, {"x":5, "y":1.5}, {"x":6, "y":1.5}, {"x":7, "y":1.5}, {"x":8, "y":1.5}, {"x":9, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.5}, {"x":12, "y":1.5}, {"x":13, "y":1.5, "w":2}, {"x":15.25, "y":1.5}, {"x":16.25, "y":1.5}, {"x":17.25, "y":1.5}, {"x":0, "y":2.5, "w":1.5}, {"x":1.5, "y":2.5}, {"x":2.5, "y":2.5}, {"x":3.5, "y":2.5}, {"x":4.5, "y":2.5}, {"x":5.5, "y":2.5}, {"x":6.5, "y":2.5}, {"x":7.5, "y":2.5}, {"x":8.5, "y":2.5}, {"x":9.5, "y":2.5}, {"x":10.5, "y":2.5}, {"x":11.5, "y":2.5}, {"x":12.5, "y":2.5}, {"x":13.5, "y":2.5, "w":1.5}, {"x":15.25, "y":2.5}, {"x":16.25, "y":2.5}, {"x":17.25, "y":2.5}, {"x":0, "y":3.5, "w":1.75}, {"x":1.75, "y":3.5}, {"x":2.75, "y":3.5}, {"x":3.75, "y":3.5}, {"x":4.75, "y":3.5}, {"x":5.75, "y":3.5}, {"x":6.75, "y":3.5}, {"x":7.75, "y":3.5}, {"x":8.75, "y":3.5}, {"x":9.75, "y":3.5}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.5}, {"x":12.75, "y":3.5, "w":2.25}, {"x":0, "y":4.5, "w":2.25}, {"x":2.25, "y":4.5}, {"x":3.25, "y":4.5}, {"x":4.25, "y":4.5}, {"x":5.25, "y":4.5}, {"x":6.25, "y":4.5}, {"x":7.25, "y":4.5}, {"x":8.25, "y":4.5}, {"x":9.25, "y":4.5}, {"x":10.25, "y":4.5}, {"x":11.25, "y":4.5}, {"x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"x":16.25, "y":4.5}, {"x":0, "y":5.5, "w":1.25}, {"x":1.25, "y":5.5, "w":1.25}, {"x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"x":10, "y":5.5, "w":1.25}, {"x":11.25, "y":5.5, "w":1.25}, {"x":12.5, "y":5.5, "w":1.25}, {"x":13.75, "y":5.5, "w":1.25}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}, {"x":17.25, "y":5.5}] + "layout": [ + {"matrix": [1, 1], "x": 0, "y": 0}, + + {"matrix": [1, 3], "x": 2, "y": 0}, + {"matrix": [1, 4], "x": 3, "y": 0}, + {"matrix": [1, 5], "x": 4, "y": 0}, + {"matrix": [1, 6], "x": 5, "y": 0}, + + {"matrix": [1, 8], "x": 6.5, "y": 0}, + {"matrix": [1, 9], "x": 7.5, "y": 0}, + {"matrix": [1, 10], "x": 8.5, "y": 0}, + {"matrix": [1, 11], "x": 9.5, "y": 0}, + + {"matrix": [1, 12], "x": 11, "y": 0}, + {"matrix": [1, 0], "x": 12, "y": 0}, + {"matrix": [1, 13], "x": 13, "y": 0}, + {"matrix": [1, 2], "x": 14, "y": 0}, + + {"matrix": [0, 2], "x": 15.25, "y": 0}, + {"matrix": [0, 3], "x": 16.25, "y": 0}, + {"matrix": [0, 0], "x": 17.25, "y": 0}, + + {"matrix": [2, 1], "x": 0, "y": 1.5}, + {"matrix": [2, 2], "x": 1, "y": 1.5}, + {"matrix": [2, 3], "x": 2, "y": 1.5}, + {"matrix": [2, 4], "x": 3, "y": 1.5}, + {"matrix": [2, 5], "x": 4, "y": 1.5}, + {"matrix": [2, 6], "x": 5, "y": 1.5}, + {"matrix": [2, 7], "x": 6, "y": 1.5}, + {"matrix": [2, 8], "x": 7, "y": 1.5}, + {"matrix": [2, 9], "x": 8, "y": 1.5}, + {"matrix": [2, 10], "x": 9, "y": 1.5}, + {"matrix": [2, 11], "x": 10, "y": 1.5}, + {"matrix": [2, 12], "x": 11, "y": 1.5}, + {"matrix": [2, 0], "x": 12, "y": 1.5}, + {"matrix": [2, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [0, 7], "x": 15.25, "y": 1.5}, + {"matrix": [0, 6], "x": 16.25, "y": 1.5}, + {"matrix": [0, 5], "x": 17.25, "y": 1.5}, + + {"matrix": [3, 1], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [3, 2], "x": 1.5, "y": 2.5}, + {"matrix": [3, 3], "x": 2.5, "y": 2.5}, + {"matrix": [3, 4], "x": 3.5, "y": 2.5}, + {"matrix": [3, 5], "x": 4.5, "y": 2.5}, + {"matrix": [3, 6], "x": 5.5, "y": 2.5}, + {"matrix": [3, 7], "x": 6.5, "y": 2.5}, + {"matrix": [3, 8], "x": 7.5, "y": 2.5}, + {"matrix": [3, 9], "x": 8.5, "y": 2.5}, + {"matrix": [3, 10], "x": 9.5, "y": 2.5}, + {"matrix": [3, 11], "x": 10.5, "y": 2.5}, + {"matrix": [3, 12], "x": 11.5, "y": 2.5}, + {"matrix": [3, 0], "x": 12.5, "y": 2.5}, + {"matrix": [3, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [0, 13], "x": 15.25, "y": 2.5}, + {"matrix": [0, 9], "x": 16.25, "y": 2.5}, + {"matrix": [0, 8], "x": 17.25, "y": 2.5}, + + {"matrix": [4, 1], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [4, 2], "x": 1.75, "y": 3.5}, + {"matrix": [4, 3], "x": 2.75, "y": 3.5}, + {"matrix": [4, 4], "x": 3.75, "y": 3.5}, + {"matrix": [4, 5], "x": 4.75, "y": 3.5}, + {"matrix": [4, 6], "x": 5.75, "y": 3.5}, + {"matrix": [4, 7], "x": 6.75, "y": 3.5}, + {"matrix": [4, 8], "x": 7.75, "y": 3.5}, + {"matrix": [4, 9], "x": 8.75, "y": 3.5}, + {"matrix": [4, 10], "x": 9.75, "y": 3.5}, + {"matrix": [4, 11], "x": 10.75, "y": 3.5}, + {"matrix": [4, 12], "x": 11.75, "y": 3.5}, + {"matrix": [4, 0], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [5, 1], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [5, 2], "x": 2.25, "y": 4.5}, + {"matrix": [5, 3], "x": 3.25, "y": 4.5}, + {"matrix": [5, 4], "x": 4.25, "y": 4.5}, + {"matrix": [5, 5], "x": 5.25, "y": 4.5}, + {"matrix": [5, 6], "x": 6.25, "y": 4.5}, + {"matrix": [5, 7], "x": 7.25, "y": 4.5}, + {"matrix": [5, 8], "x": 8.25, "y": 4.5}, + {"matrix": [5, 9], "x": 9.25, "y": 4.5}, + {"matrix": [5, 10], "x": 10.25, "y": 4.5}, + {"matrix": [5, 11], "x": 11.25, "y": 4.5}, + {"matrix": [5, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [5, 0], "x": 14, "y": 4.5}, + + {"matrix": [5, 13], "x": 16.25, "y": 4.5}, + + {"matrix": [6, 1], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [6, 2], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [6, 10], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [6, 11], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [6, 12], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [6, 0], "x": 15.25, "y": 5.5}, + {"matrix": [6, 13], "x": 16.25, "y": 5.5}, + {"matrix": [6, 8], "x": 17.25, "y": 5.5} + ] } } } diff --git a/keyboards/percent/skog/skog.h b/keyboards/percent/skog/skog.h deleted file mode 100644 index c04a765b2e3e..000000000000 --- a/keyboards/percent/skog/skog.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2018 Jumail Mundekkat / MxBlue - -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( \ - K11, K31, K41, K51, K61, K81, K91, KA1, KB1, KC1, K01, KD1, K21, K20, K30, K00, \ - \ - K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC2, K02, KD2 , K70, K60, K50, \ - K13 , K23, K33, K43, K53, K63, K73, K83, K93, KA3, KB3, KC3, K03, KD3 , KD0, K90, K80, \ - K15 , K25, K35, K45, K55, K65, K75, K85, K95, KA5, KB5, KC5, K05 , \ - K16 , K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6 , K06, KD6, \ - K17 , K27 , K37 , K57 , K97 , KA7 , KB7 , KC7 , K07, KD7, K87 \ -){ \ - { K00, KC_NO, K20, K30, KC_NO, K50, K60, K70, K80, K90, KC_NO, KC_NO, KC_NO, KD0 }, \ - { K01, K11, K21, K31, K41, K51, K61, KC_NO, K81, K91, KA1, KB1, KC1, KD1 }, \ - { K02, K12, K22, K32, K42, K52, K62, K72, K82, K92, KA2, KB2, KC2, KD2 }, \ - { K03, K13, K23, K33, K43, K53, K63, K73, K83, K93, KA3, KB3, KC3, KD3 }, \ - { K05, K15, K25, K35, K45, K55, K65, K75, K85, K95, KA5, KB5, KC5, KC_NO }, \ - { K06, K16, K26, K36, K46, K56, K66, K76, K86, K96, KA6, KB6, KC6, KD6 }, \ - { K07, K17, K27, K37, KC_NO, K57, KC_NO, KC_NO, K87, K97, KA7, KB7, KC7, KD7 } \ -} diff --git a/keyboards/phase_studio/titan65/hotswap/hotswap.c b/keyboards/phase_studio/titan65/hotswap/hotswap.c index 9c6538abf9c5..6df8319a830b 100644 --- a/keyboards/phase_studio/titan65/hotswap/hotswap.c +++ b/keyboards/phase_studio/titan65/hotswap/hotswap.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "hotswap.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { diff --git a/keyboards/phase_studio/titan65/hotswap/hotswap.h b/keyboards/phase_studio/titan65/hotswap/hotswap.h deleted file mode 100644 index 36ea0e7e1991..000000000000 --- a/keyboards/phase_studio/titan65/hotswap/hotswap.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 Christopher Courtney, aka Drashna Jael're (@drashna) - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, K0F, \ - K10, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \ - K20, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2F, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3E, K3F, \ - K40, K41, K43, K46, K4A, K4B, K4D, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, ___, K0E, K0F }, \ - { K10, ___, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \ - { K20, ___, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, ___, K2F }, \ - { ___, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, ___, K3D, K3E, K3F }, \ - { K40, K41, ___, K43, ___, ___, K46, ___, ___, ___, K4A, K4B, ___, K4D, K4E, K4F }, \ -} diff --git a/keyboards/phase_studio/titan65/hotswap/info.json b/keyboards/phase_studio/titan65/hotswap/info.json index c7429ca65c4f..380c0c271a6d 100644 --- a/keyboards/phase_studio/titan65/hotswap/info.json +++ b/keyboards/phase_studio/titan65/hotswap/info.json @@ -24,73 +24,78 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B4,B0)", "x":0, "y":0}, - {"label":"K01 (B4,B1)", "x":1, "y":0}, - {"label":"K02 (B4,B2)", "x":2, "y":0}, - {"label":"K03 (B4,B3)", "x":3, "y":0}, - {"label":"K04 (B4,B7)", "x":4, "y":0}, - {"label":"K05 (B4,D0)", "x":5, "y":0}, - {"label":"K06 (B4,D1)", "x":6, "y":0}, - {"label":"K07 (B4,D2)", "x":7, "y":0}, - {"label":"K08 (B4,D3)", "x":8, "y":0}, - {"label":"K09 (B4,D5)", "x":9, "y":0}, - {"label":"K0A (B4,F0)", "x":10, "y":0}, - {"label":"K0B (B4,F1)", "x":11, "y":0}, - {"label":"K0C (B4,C7)", "x":12, "y":0}, - {"label":"K0E (B4,F5)", "x":13, "y":0, "w":2}, - {"label":"K0F (B4,F6)", "x":15, "y":0}, - {"label":"K10 (B5,B0)", "x":0, "y":1, "w":1.5}, - {"label":"K12 (B5,B2)", "x":1.5, "y":1}, - {"label":"K13 (B5,B3)", "x":2.5, "y":1}, - {"label":"K14 (B5,B7)", "x":3.5, "y":1}, - {"label":"K15 (B5,D0)", "x":4.5, "y":1}, - {"label":"K16 (B5,D1)", "x":5.5, "y":1}, - {"label":"K17 (B5,D2)", "x":6.5, "y":1}, - {"label":"K18 (B5,D3)", "x":7.5, "y":1}, - {"label":"K19 (B5,D5)", "x":8.5, "y":1}, - {"label":"K1A (B5,F0)", "x":9.5, "y":1}, - {"label":"K1B (B5,F1)", "x":10.5, "y":1}, - {"label":"K1C (B5,C7)", "x":11.5, "y":1}, - {"label":"K1D (B5,F4)", "x":12.5, "y":1}, - {"label":"K1E (B5,F5)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B5,F6)", "x":15, "y":1}, - {"label":"K20 (B6,B0)", "x":0, "y":2, "w":1.75}, - {"label":"K22 (B6,B2)", "x":1.75, "y":2}, - {"label":"K23 (B6,B3)", "x":2.75, "y":2}, - {"label":"K24 (B6,B7)", "x":3.75, "y":2}, - {"label":"K25 (B6,D0)", "x":4.75, "y":2}, - {"label":"K26 (B6,D1)", "x":5.75, "y":2}, - {"label":"K27 (B6,D2)", "x":6.75, "y":2}, - {"label":"K28 (B6,D3)", "x":7.75, "y":2}, - {"label":"K29 (B6,D5)", "x":8.75, "y":2}, - {"label":"K2A (B6,F0)", "x":9.75, "y":2}, - {"label":"K2B (B6,F1)", "x":10.75, "y":2}, - {"label":"K2C (B6,C7)", "x":11.75, "y":2}, - {"label":"K2D (B6,F4)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (B6,F6)", "x":15, "y":2}, - {"label":"K31 (C6,B1)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (C6,B2)", "x":2.25, "y":3}, - {"label":"K33 (C6,B3)", "x":3.25, "y":3}, - {"label":"K34 (C6,B7)", "x":4.25, "y":3}, - {"label":"K35 (C6,D0)", "x":5.25, "y":3}, - {"label":"K36 (C6,D1)", "x":6.25, "y":3}, - {"label":"K37 (C6,D2)", "x":7.25, "y":3}, - {"label":"K38 (C6,D3)", "x":8.25, "y":3}, - {"label":"K39 (C6,D5)", "x":9.25, "y":3}, - {"label":"K3A (C6,F0)", "x":10.25, "y":3}, - {"label":"K3B (C6,F1)", "x":11.25, "y":3}, - {"label":"K3D (C6,F4)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (C6,F5)", "x":14, "y":3}, - {"label":"K3F (C6,F6)", "x":15, "y":3}, - {"label":"K40 (F7,B0)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (F7,B1)", "x":1.25, "y":4}, - {"label":"K42 (F7,B2)", "x":2.25, "y":4, "w":1.25}, - {"label":"K46 (F7,D1)", "x":3.5, "y":4, "w":6.25}, - {"label":"K4A (F7,F0)", "x":9.75, "y":4, "w":1.25}, - {"label":"K4B (F7,F1)", "x":11, "y":4, "w":1.25}, - {"label":"K4D (F7,F4)", "x":13, "y":4}, - {"label":"K4E (F7,F5)", "x":14, "y":4}, - {"label":"K4F (F7,F6)", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 3], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.5, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/phrygian/ph100/info.json b/keyboards/phrygian/ph100/info.json index 5930a8266f3d..f33081284ef3 100644 --- a/keyboards/phrygian/ph100/info.json +++ b/keyboards/phrygian/ph100/info.json @@ -23,106 +23,124 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESCAPE", "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":"HOME", "x":15.25, "y":0}, - {"label":"PRINT SCREEN", "x":16.25, "y":0}, - {"label":"BACKTICK", "x":0, "y":1}, - {"label":"1", "x":1, "y":1}, - {"label":"2", "x":2, "y":1}, - {"label":"3", "x":3, "y":1}, - {"label":"4", "x":4, "y":1}, - {"label":"5", "x":5, "y":1}, - {"label":"6", "x":6, "y":1}, - {"label":"7", "x":7, "y":1}, - {"label":"8", "x":8, "y":1}, - {"label":"9", "x":9, "y":1}, - {"label":"0", "x":10, "y":1}, - {"label":"MINUS", "x":11, "y":1}, - {"label":"EQUALS", "x":12, "y":1}, - {"label":"BACKSPACE", "x":13, "y":1, "w":2}, - {"label":"END", "x":15.25, "y":1}, - {"label":"PAGE UP", "x":16.25, "y":1}, - {"label":"NUM LOCK", "x":17.5, "y":1}, - {"label":"/", "x":18.5, "y":1}, - {"label":"*", "x":19.5, "y":1}, - {"label":"-", "x":20.5, "y":1}, - {"label":"TAB", "x":0, "y":2, "w":1.5}, - {"label":"Q", "x":1.5, "y":2}, - {"label":"W", "x":2.5, "y":2}, - {"label":"E", "x":3.5, "y":2}, - {"label":"R", "x":4.5, "y":2}, - {"label":"T", "x":5.5, "y":2}, - {"label":"Y", "x":6.5, "y":2}, - {"label":"U", "x":7.5, "y":2}, - {"label":"I", "x":8.5, "y":2}, - {"label":"O", "x":9.5, "y":2}, - {"label":"P", "x":10.5, "y":2}, - {"label":"LEFT BRACKET", "x":11.5, "y":2}, - {"label":"RIGHT BRACKET", "x":12.5, "y":2}, - {"label":"BACK SLASH", "x":13.5, "y":2, "w":1.5}, - {"label":"DELETE", "x":15.25, "y":2}, - {"label":"PAGE DOWN", "x":16.25, "y":2}, - {"label":"7", "x":17.5, "y":2}, - {"label":"8", "x":18.5, "y":2}, - {"label":"9", "x":19.5, "y":2}, - {"label":"+", "x":20.5, "y":2, "h":2}, - {"label":"CAPS LOCK", "x":0, "y":3, "w":1.75}, - {"label":"A", "x":1.75, "y":3}, - {"label":"S", "x":2.75, "y":3}, - {"label":"D", "x":3.75, "y":3}, - {"label":"F", "x":4.75, "y":3}, - {"label":"G", "x":5.75, "y":3}, - {"label":"H", "x":6.75, "y":3}, - {"label":"J", "x":7.75, "y":3}, - {"label":"K", "x":8.75, "y":3}, - {"label":"L", "x":9.75, "y":3}, - {"label":"SEMICOLON", "x":10.75, "y":3}, - {"label":"SINGLE TICK", "x":11.75, "y":3}, - {"label":"ENTER", "x":12.75, "y":3, "w":2.25}, - {"label":"4", "x":17.5, "y":3}, - {"label":"5", "x":18.5, "y":3}, - {"label":"6", "x":19.5, "y":3}, - {"label":"LEFT SHIFT", "x":0, "y":4, "w":2.25}, - {"label":"Z", "x":2.25, "y":4}, - {"label":"X", "x":3.25, "y":4}, - {"label":"C", "x":4.25, "y":4}, - {"label":"V", "x":5.25, "y":4}, - {"label":"B", "x":6.25, "y":4}, - {"label":"N", "x":7.25, "y":4}, - {"label":"M", "x":8.25, "y":4}, - {"label":"COMMA", "x":9.25, "y":4}, - {"label":"PERIOD", "x":10.25, "y":4}, - {"label":"FORWARD SLASH", "x":11.25, "y":4}, - {"label":"RIGHT SHIFT", "x":12.25, "y":4, "w":2.25}, - {"label":"UP ARROW", "x":15.25, "y":4}, - {"label":"1", "x":17.5, "y":4}, - {"label":"2", "x":18.5, "y":4}, - {"label":"3", "x":19.5, "y":4}, - {"label":"ENTER", "x":20.5, "y":4, "h":2}, - {"label":"LEFT CTRL", "x":0, "y":5, "w":1.25}, - {"label":"LEFT WIN", "x":1.25, "y":5, "w":1.25}, - {"label":"LEFT ALT", "x":2.5, "y":5, "w":1.25}, - {"label":"SPACEBAR", "x":3.75, "y":5, "w":6.25}, - {"label":"RIGHT ALT", "x":10, "y":5, "w":1.25}, - {"label":"RIGHT CTRL", "x":11.25, "y":5, "w":1.25}, - {"label":"FN", "x":12.5, "y":5}, - {"label":"LEFT ARROW", "x":14.25, "y":5}, - {"label":"DOWN ARROW", "x":15.25, "y":5}, - {"label":"RIGHT ARROW", "x":16.25, "y":5}, - {"label":"0", "x":17.5, "y":5, "w":2}, - {"label":".", "x":19.5, "y":5} + {"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": [6, 0], "x": 12, "y": 0}, + {"matrix": [6, 1], "x": 13, "y": 0}, + {"matrix": [6, 2], "x": 14, "y": 0}, + + {"matrix": [6, 3], "x": 15.25, "y": 0}, + {"matrix": [6, 4], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [7, 0], "x": 10, "y": 1}, + {"matrix": [7, 1], "x": 11, "y": 1}, + {"matrix": [7, 2], "x": 12, "y": 1}, + {"matrix": [7, 3], "x": 13, "y": 1, "w": 2}, + + {"matrix": [7, 4], "x": 15.25, "y": 1}, + {"matrix": [7, 5], "x": 16.25, "y": 1}, + + {"matrix": [6, 5], "x": 17.5, "y": 1}, + {"matrix": [6, 6], "x": 18.5, "y": 1}, + {"matrix": [6, 7], "x": 19.5, "y": 1}, + {"matrix": [6, 8], "x": 20.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [8, 0], "x": 10.5, "y": 2}, + {"matrix": [8, 1], "x": 11.5, "y": 2}, + {"matrix": [8, 2], "x": 12.5, "y": 2}, + {"matrix": [8, 3], "x": 13.5, "y": 2, "w": 1.5}, + + {"matrix": [8, 4], "x": 15.25, "y": 2}, + {"matrix": [8, 5], "x": 16.25, "y": 2}, + + {"matrix": [7, 6], "x": 17.5, "y": 2}, + {"matrix": [7, 7], "x": 18.5, "y": 2}, + {"matrix": [7, 8], "x": 19.5, "y": 2}, + {"matrix": [3, 0], "x": 20.5, "y": 2, "h": 2}, + + {"matrix": [3, 1], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [9, 0], "x": 9.75, "y": 3}, + {"matrix": [9, 2], "x": 10.75, "y": 3}, + {"matrix": [9, 4], "x": 11.75, "y": 3}, + {"matrix": [8, 6], "x": 12.75, "y": 3, "w": 2.25}, + + {"matrix": [8, 7], "x": 17.5, "y": 3}, + {"matrix": [7, 9], "x": 18.5, "y": 3}, + {"matrix": [6, 9], "x": 19.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [9, 1], "x": 11.25, "y": 4}, + {"matrix": [9, 3], "x": 12.25, "y": 4, "w": 2.25}, + + {"matrix": [9, 5], "x": 15.25, "y": 4}, + + {"matrix": [9, 6], "x": 17.5, "y": 4}, + {"matrix": [8, 8], "x": 18.5, "y": 4}, + {"matrix": [8, 9], "x": 19.5, "y": 4}, + {"matrix": [5, 0], "x": 20.5, "y": 4, "h": 2}, + + {"matrix": [5, 1], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 2], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [5, 4], "x": 3.75, "y": 5, "w": 6.25}, + {"matrix": [5, 5], "x": 10, "y": 5, "w": 1.25}, + {"matrix": [5, 6], "x": 11.25, "y": 5, "w": 1.25}, + {"matrix": [5, 7], "x": 12.5, "y": 5}, + + {"matrix": [5, 8], "x": 14.25, "y": 5}, + {"matrix": [5, 9], "x": 15.25, "y": 5}, + {"matrix": [9, 7], "x": 16.25, "y": 5}, + + {"matrix": [9, 8], "x": 17.5, "y": 5, "w": 2}, + {"matrix": [9, 9], "x": 19.5, "y": 5} ] } } diff --git a/keyboards/phrygian/ph100/ph100.h b/keyboards/phrygian/ph100/ph100.h deleted file mode 100644 index bd18bfd1902f..000000000000 --- a/keyboards/phrygian/ph100/ph100.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 Phrygian Design - * - * 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 - -#define XXX KC_NO - -#include "quantum.h" - -// This a shortcut to help you visually see your layout. - -#define LAYOUT(\ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K61, K62, K63, K64, K65, \ - K11, K12, K13, K14, K15, K16, K17, K18, K19, K20, K71, K72, K73, K74, K75, K76, K66, K67, K68, K69, \ - K21, K22, K23, K24, K25, K26, K27, K28, K29, K30, K81, K82, K83, K84, K85, K86, K77, K78, K79, \ - K31, K32, K33, K34, K35, K36, K37, K38, K39, K40, K91, K93, K95, K87, K88, K80, K70, \ - K41, K42, K43, K44, K45, K46, K47, K48, K49, K50, K92, K94, K96, K97, K89, K90, \ - K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K98, K99, K100\ -){ \ - { K01, K02, K03, K04, K05, K06, K07, K08, K09, K10 }, \ - { K11, K12, K13, K14, K15, K16, K17, K18, K19, K20 }, \ - { K21, K22, K23, K24, K25, K26, K27, K28, K29, K30 }, \ - { K31, K32, K33, K34, K35, K36, K37, K38, K39, K40 }, \ - { K41, K42, K43, K44, K45, K46, K47, K48, K49, K50 }, \ - { K51, K52, K53, K54, K55, K56, K57, K58, K59, K60 }, \ - { K61, K62, K63, K64, K65, K66, K67, K68, K69, K70 }, \ - { K71, K72, K73, K74, K75, K76, K77, K78, K79, K80 }, \ - { K81, K82, K83, K84, K85, K86, K87, K88, K89, K90 }, \ - { K91, K92, K93, K94, K95, K96, K97, K98, K99, K100 }, \ -} - diff --git a/keyboards/pico/65keys/65keys.h b/keyboards/pico/65keys/65keys.h deleted file mode 100644 index 444d8d2ee524..000000000000 --- a/keyboards/pico/65keys/65keys.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) \ -{ \ - { KC_NO, L01, L02, L03, L04, L05, L06 }, \ - { KC_NO, L11, L12, L13, L14, L15, L16 }, \ - { KC_NO, L21, L22, L23, L24, L25, L26 }, \ - { KC_NO, L31, L32, L33, L34, L35, L36 }, \ - { KC_NO, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/pico/65keys/info.json b/keyboards/pico/65keys/info.json index c591f0fe4744..c9d61fc43428 100644 --- a/keyboards/pico/65keys/info.json +++ b/keyboards/pico/65keys/info.json @@ -24,71 +24,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":9, "y":0}, - {"label":"7", "x":10, "y":0}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"-", "x":14, "y":0}, - {"label":"\u2190", "x":15, "y":0}, - {"label":"Tab", "x":0.25, "y":1}, - {"label":"Q", "x":1.25, "y":1}, - {"label":"W", "x":2.25, "y":1}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1}, - {"label":"T", "x":5.25, "y":1}, - {"label":"Y", "x":9.25, "y":1}, - {"label":"U", "x":10.25, "y":1}, - {"label":"I", "x":11.25, "y":1}, - {"label":"O", "x":12.25, "y":1}, - {"label":"P", "x":13.25, "y":1}, - {"label":"[", "x":14.25, "y":1}, - {"label":"]", "x":15.25, "y":1}, - {"label":"Ctrl", "x":0.5, "y":2}, - {"label":"A", "x":1.5, "y":2}, - {"label":"S", "x":2.5, "y":2}, - {"label":"D", "x":3.5, "y":2}, - {"label":"F", "x":4.5, "y":2}, - {"label":"G", "x":5.5, "y":2}, - {"label":"H", "x":9.5, "y":2}, - {"label":"J", "x":10.5, "y":2}, - {"label":"K", "x":11.5, "y":2}, - {"label":"L", "x":12.5, "y":2}, - {"label":";", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, - {"label":"Enter", "x":15.5, "y":2}, - {"label":"Shift", "x":0.75, "y":3}, - {"label":"Z", "x":1.75, "y":3}, - {"label":"X", "x":2.75, "y":3}, - {"label":"C", "x":3.75, "y":3}, - {"label":"V", "x":4.75, "y":3}, - {"label":"B", "x":5.75, "y":3}, - {"label":"N", "x":9.75, "y":3}, - {"label":"M", "x":10.75, "y":3}, - {"label":",", "x":11.75, "y":3}, - {"label":".", "x":12.75, "y":3}, - {"label":"/", "x":13.75, "y":3}, - {"label":"\u2191", "x":14.75, "y":3}, - {"label":"Shift", "x":15.75, "y":3}, - {"label":"Alt", "x":1, "y":4}, - {"label":"Enter", "x":2, "y":4}, - {"label":"Del", "x":3, "y":4}, - {"label":"GUI", "x":4, "y":4}, - {"label":"LANG2", "x":5, "y":4}, - {"label":"Space", "x":6, "y":4}, - {"label":"Space", "x":10, "y":4}, - {"label":"LANG1", "x":11, "y":4}, - {"label":"GUI", "x":12, "y":4}, - {"label":"Del", "x":13, "y":4}, - {"label":"\u2190", "x":14, "y":4}, - {"label":"\u2193", "x":15, "y":4}, - {"label":"\u2192", "x":16, "y":4} + {"matrix": [0, 1], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 1, "y": 0}, + {"matrix": [0, 3], "x": 2, "y": 0}, + {"matrix": [0, 4], "x": 3, "y": 0}, + {"matrix": [0, 5], "x": 4, "y": 0}, + {"matrix": [0, 6], "x": 5, "y": 0}, + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + + {"matrix": [1, 1], "x": 0.25, "y": 1}, + {"matrix": [1, 2], "x": 1.25, "y": 1}, + {"matrix": [1, 3], "x": 2.25, "y": 1}, + {"matrix": [1, 4], "x": 3.25, "y": 1}, + {"matrix": [1, 5], "x": 4.25, "y": 1}, + {"matrix": [1, 6], "x": 5.25, "y": 1}, + {"matrix": [6, 0], "x": 9.25, "y": 1}, + {"matrix": [6, 1], "x": 10.25, "y": 1}, + {"matrix": [6, 2], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 4], "x": 13.25, "y": 1}, + {"matrix": [6, 5], "x": 14.25, "y": 1}, + {"matrix": [6, 6], "x": 15.25, "y": 1}, + + {"matrix": [2, 1], "x": 0.5, "y": 2}, + {"matrix": [2, 2], "x": 1.5, "y": 2}, + {"matrix": [2, 3], "x": 2.5, "y": 2}, + {"matrix": [2, 4], "x": 3.5, "y": 2}, + {"matrix": [2, 5], "x": 4.5, "y": 2}, + {"matrix": [2, 6], "x": 5.5, "y": 2}, + {"matrix": [7, 0], "x": 9.5, "y": 2}, + {"matrix": [7, 1], "x": 10.5, "y": 2}, + {"matrix": [7, 2], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 4], "x": 13.5, "y": 2}, + {"matrix": [7, 5], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 1], "x": 0.75, "y": 3}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [8, 0], "x": 9.75, "y": 3}, + {"matrix": [8, 1], "x": 10.75, "y": 3}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 4], "x": 13.75, "y": 3}, + {"matrix": [8, 5], "x": 14.75, "y": 3}, + {"matrix": [8, 6], "x": 15.75, "y": 3}, + + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [9, 0], "x": 10, "y": 4}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 4], "x": 14, "y": 4}, + {"matrix": [9, 5], "x": 15, "y": 4}, + {"matrix": [9, 6], "x": 16, "y": 4} ] } } diff --git a/keyboards/pico/70keys/70keys.h b/keyboards/pico/70keys/70keys.h deleted file mode 100644 index 6235d8e136c6..000000000000 --- a/keyboards/pico/70keys/70keys.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 } \ -} diff --git a/keyboards/pico/70keys/info.json b/keyboards/pico/70keys/info.json index 0cd5afb0ca1e..09c1cfa5b38e 100644 --- a/keyboards/pico/70keys/info.json +++ b/keyboards/pico/70keys/info.json @@ -24,76 +24,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"~", "x":1, "y":0}, - {"label":"1", "x":2, "y":0}, - {"label":"2", "x":3, "y":0}, - {"label":"3", "x":4, "y":0}, - {"label":"4", "x":5, "y":0}, - {"label":"5", "x":6, "y":0}, - {"label":"6", "x":9, "y":0}, - {"label":"7", "x":10, "y":0}, - {"label":"8", "x":11, "y":0}, - {"label":"9", "x":12, "y":0}, - {"label":"0", "x":13, "y":0}, - {"label":"-", "x":14, "y":0}, - {"label":"\u2190", "x":15, "y":0}, - {"label":"Tab", "x":0.25, "y":1}, - {"label":"Tab", "x":1.25, "y":1}, - {"label":"Q", "x":2.25, "y":1}, - {"label":"W", "x":3.25, "y":1}, - {"label":"E", "x":4.25, "y":1}, - {"label":"R", "x":5.25, "y":1}, - {"label":"T", "x":6.25, "y":1}, - {"label":"Y", "x":9.25, "y":1}, - {"label":"U", "x":10.25, "y":1}, - {"label":"I", "x":11.25, "y":1}, - {"label":"O", "x":12.25, "y":1}, - {"label":"P", "x":13.25, "y":1}, - {"label":"[", "x":14.25, "y":1}, - {"label":"]", "x":15.25, "y":1}, - {"label":"Ctrl", "x":0.5, "y":2}, - {"label":"Ctrl", "x":1.5, "y":2}, - {"label":"A", "x":2.5, "y":2}, - {"label":"S", "x":3.5, "y":2}, - {"label":"D", "x":4.5, "y":2}, - {"label":"F", "x":5.5, "y":2}, - {"label":"G", "x":6.5, "y":2}, - {"label":"H", "x":9.5, "y":2}, - {"label":"J", "x":10.5, "y":2}, - {"label":"K", "x":11.5, "y":2}, - {"label":"L", "x":12.5, "y":2}, - {"label":";", "x":13.5, "y":2}, - {"label":"'", "x":14.5, "y":2}, - {"label":"Enter", "x":15.5, "y":2}, - {"label":"Shift", "x":0.75, "y":3}, - {"label":"Shift", "x":1.75, "y":3}, - {"label":"Z", "x":2.75, "y":3}, - {"label":"X", "x":3.75, "y":3}, - {"label":"C", "x":4.75, "y":3}, - {"label":"V", "x":5.75, "y":3}, - {"label":"B", "x":6.75, "y":3}, - {"label":"N", "x":9.75, "y":3}, - {"label":"M", "x":10.75, "y":3}, - {"label":",", "x":11.75, "y":3}, - {"label":".", "x":12.75, "y":3}, - {"label":"/", "x":13.75, "y":3}, - {"label":"\u2191", "x":14.75, "y":3}, - {"label":"Shift", "x":15.75, "y":3}, - {"label":"Alt", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Enter", "x":3, "y":4}, - {"label":"Del", "x":4, "y":4}, - {"label":"GUI", "x":5, "y":4}, - {"label":"LANG2", "x":6, "y":4}, - {"label":"Space", "x":7, "y":4}, - {"label":"Space", "x":10, "y":4}, - {"label":"LANG1", "x":11, "y":4}, - {"label":"GUI", "x":12, "y":4}, - {"label":"Del", "x":13, "y":4}, - {"label":"\u2190", "x":14, "y":4}, - {"label":"\u2193", "x":15, "y":4}, - {"label":"\u2192", "x":16, "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": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [6, 0], "x": 9.25, "y": 1}, + {"matrix": [6, 1], "x": 10.25, "y": 1}, + {"matrix": [6, 2], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 4], "x": 13.25, "y": 1}, + {"matrix": [6, 5], "x": 14.25, "y": 1}, + {"matrix": [6, 6], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0.5, "y": 2}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [7, 0], "x": 9.5, "y": 2}, + {"matrix": [7, 1], "x": 10.5, "y": 2}, + {"matrix": [7, 2], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 4], "x": 13.5, "y": 2}, + {"matrix": [7, 5], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [8, 0], "x": 9.75, "y": 3}, + {"matrix": [8, 1], "x": 10.75, "y": 3}, + {"matrix": [8, 2], "x": 11.75, "y": 3}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 4], "x": 13.75, "y": 3}, + {"matrix": [8, 5], "x": 14.75, "y": 3}, + {"matrix": [8, 6], "x": 15.75, "y": 3}, + + {"matrix": [4, 0], "x": 1, "y": 4}, + {"matrix": [4, 1], "x": 2, "y": 4}, + {"matrix": [4, 2], "x": 3, "y": 4}, + {"matrix": [4, 3], "x": 4, "y": 4}, + {"matrix": [4, 4], "x": 5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4}, + {"matrix": [4, 6], "x": 7, "y": 4}, + {"matrix": [9, 0], "x": 10, "y": 4}, + {"matrix": [9, 1], "x": 11, "y": 4}, + {"matrix": [9, 2], "x": 12, "y": 4}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 4], "x": 14, "y": 4}, + {"matrix": [9, 5], "x": 15, "y": 4}, + {"matrix": [9, 6], "x": 16, "y": 4} ] } } diff --git a/keyboards/picolab/frusta_fundamental/frusta_fundamental.h b/keyboards/picolab/frusta_fundamental/frusta_fundamental.h deleted file mode 100644 index db0dc69421b2..000000000000 --- a/keyboards/picolab/frusta_fundamental/frusta_fundamental.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 PicoLab - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - - //Default layout. - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ - K400, K401, K402, K405, K409, K410, K411, K412, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, K412, KC_NO, K414 } \ -} diff --git a/keyboards/picolab/frusta_fundamental/info.json b/keyboards/picolab/frusta_fundamental/info.json index 2296712e1ed5..91aadda6ff4f 100644 --- a/keyboards/picolab/frusta_fundamental/info.json +++ b/keyboards/picolab/frusta_fundamental/info.json @@ -21,77 +21,78 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "!", "x": 1, "y": 0 }, - { "label": "@", "x": 2, "y": 0 }, - { "label": "#", "x": 3, "y": 0 }, - { "label": "$", "x": 4, "y": 0 }, - { "label": "%", "x": 5, "y": 0 }, - { "label": "^", "x": 6, "y": 0 }, - { "label": "&", "x": 7, "y": 0 }, - { "label": "*", "x": 8, "y": 0 }, - { "label": "(", "x": 9, "y": 0 }, - { "label": ")", "x": 10, "y": 0 }, - { "label": "_", "x": 11, "y": 0 }, - { "label": "+", "x": 12, "y": 0 }, - { "label": "Backspace", "x": 13, "y": 0, "w": 2 }, - { "label": "Pause", "x": 15, "y": 0 }, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, - { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 1 }, - { "label": "W", "x": 2.5, "y": 1 }, - { "label": "E", "x": 3.5, "y": 1 }, - { "label": "R", "x": 4.5, "y": 1 }, - { "label": "T", "x": 5.5, "y": 1 }, - { "label": "Y", "x": 6.5, "y": 1 }, - { "label": "U", "x": 7.5, "y": 1 }, - { "label": "I", "x": 8.5, "y": 1 }, - { "label": "O", "x": 9.5, "y": 1 }, - { "label": "P", "x": 10.5, "y": 1 }, - { "label": "{", "x": 11.5, "y": 1 }, - { "label": "}", "x": 12.5, "y": 1 }, - { "label": "|", "x": 13.5, "y": 1, "w": 1.5 }, - { "label": "Home", "x": 15, "y": 1 }, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, - { "label": "RControl", "x": 0, "y": 2, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 2 }, - { "label": "S", "x": 2.75, "y": 2 }, - { "label": "D", "x": 3.75, "y": 2 }, - { "label": "F", "x": 4.75, "y": 2 }, - { "label": "G", "x": 5.75, "y": 2 }, - { "label": "H", "x": 6.75, "y": 2 }, - { "label": "J", "x": 7.75, "y": 2 }, - { "label": "K", "x": 8.75, "y": 2 }, - { "label": "L", "x": 9.75, "y": 2 }, - { "label": ":", "x": 10.75, "y": 2 }, - { "label": "\"", "x": 11.75, "y": 2 }, - { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 }, - { "label": "End", "x": 15, "y": 2 }, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, - { "label": "LShift", "x": 0, "y": 3, "w": 2.25 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 7.25, "y": 3 }, - { "label": "M", "x": 8.25, "y": 3 }, - { "label": "<", "x": 9.25, "y": 3 }, - { "label": ">", "x": 10.25, "y": 3 }, - { "label": "?", "x": 11.25, "y": 3 }, - { "label": "RShift", "x": 12.25, "y": 3, "w": 1.75 }, - { "label": "Up", "x": 14, "y": 3 }, - { "label": "Del", "x": 15, "y": 3 }, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, - { "label": "Fn", "x": 0, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 3.75, "y": 4, "w": 6.25 }, - { "label": "Fn", "x": 10, "y": 4, "w": 1.25 }, - { "label": "RCtrl", "x": 11.25, "y": 4, "w": 1.25 }, - { "label": "Left", "x": 13, "y": 4 }, - { "label": "Down", "x": 14, "y": 4 }, - { "label": "Right", "x": 15, "y": 4 } + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/pkb65/info.json b/keyboards/pkb65/info.json index 41438841dba3..05561927a3c1 100644 --- a/keyboards/pkb65/info.json +++ b/keyboards/pkb65/info.json @@ -16,73 +16,79 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Delete", "x":15, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"PrtSc", "x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Fn", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "x":15, "y":4}] - } + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} + ] + } } } diff --git a/keyboards/pkb65/pkb65.h b/keyboards/pkb65/pkb65.h deleted file mode 100644 index 770f3db457cf..000000000000 --- a/keyboards/pkb65/pkb65.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - -Copyright 2021 MCKeebs -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K405, K409, K410, K411, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, K412, K413 } \ -} - - diff --git a/keyboards/playkbtw/ca66/ca66.h b/keyboards/playkbtw/ca66/ca66.h deleted file mode 100644 index e52bdea664e0..000000000000 --- a/keyboards/playkbtw/ca66/ca66.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K114, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K314, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K414, \ - K401, K402, K403, K404, K406, K408, K409, K410, K411, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { KC_NO, K401, K402, K403, K404, KC_NO, K406, KC_NO, K408, K409, K410, K411, K412, K413, K414 } \ -} diff --git a/keyboards/playkbtw/ca66/info.json b/keyboards/playkbtw/ca66/info.json index 4363e0c618c3..275d9e011da1 100644 --- a/keyboards/playkbtw/ca66/info.json +++ b/keyboards/playkbtw/ca66/info.json @@ -26,7 +26,89 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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.5, "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.5, "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, "w":2.25}, {"x":15.5, "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":15.5, "y":3}, {"x":14.25, "y":3.25}, {"x":0, "y":4, "w":1.25}, {"x":2.25, "y":4}, {"x":3.25, "y":4, "w":1.25}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4, "w":2.75}, {"x":9.5, "y":4, "w":1.25}, {"x":10.75, "y":4}, {"x":11.75, "y":4, "w":1.25}, {"x":13.25, "y":4.25}, {"x":14.25, "y":4.25}, {"x":15.25, "y":4.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 14], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 15.5, "y": 3}, + + {"matrix": [4, 14], "x": 14.25, "y": 3.25}, + + {"matrix": [4, 1], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.25}, + {"matrix": [4, 6], "x": 6.75, "y": 4, "w": 2.75}, + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 10.75, "y": 4}, + {"matrix": [4, 10], "x": 11.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 11], "x": 13.25, "y": 4.25}, + {"matrix": [4, 12], "x": 14.25, "y": 4.25}, + {"matrix": [4, 13], "x": 15.25, "y": 4.25} + ] } } } diff --git a/keyboards/plut0nium/0x3e/0x3e.h b/keyboards/plut0nium/0x3e/0x3e.h deleted file mode 100644 index e44530b2faa9..000000000000 --- a/keyboards/plut0nium/0x3e/0x3e.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 plut0nium - * - * 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( \ - k40, k41, k42, k43, k44, k45, k47, k48, k49, k4a, k4b, k4c, \ - k30, k31, k32, k33, k34, k35, k37, k38, k39, k3a, k3b, k3c, \ - k20, k21, k22, k23, k24, k25, k27, k28, k29, k2a, k2b, k2c, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c \ -) \ -{ \ - { k40, k41, k42, k43, k44, k45, KC_NO, k47, k48, k49, k4a, k4b, k4c }, \ - { k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b, k3c }, \ - { k20, k21, k22, k23, k24, k25, KC_NO, k27, k28, k29, k2a, k2b, k2c }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c }, \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \ -} - - diff --git a/keyboards/plut0nium/0x3e/info.json b/keyboards/plut0nium/0x3e/info.json index 65c4567c4e5d..ce4cf7c6607b 100644 --- a/keyboards/plut0nium/0x3e/info.json +++ b/keyboards/plut0nium/0x3e/info.json @@ -26,68 +26,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0, "w":1.5}, - {"label":"1", "x":1.5, "y":0}, - {"label":"2", "x":2.5, "y":0}, - {"label":"3", "x":3.5, "y":0}, - {"label":"4", "x":4.5, "y":0}, - {"label":"5", "x":5.5, "y":0}, - {"label":"6", "x":7.5, "y":0}, - {"label":"7", "x":8.5, "y":0}, - {"label":"8", "x":9.5, "y":0}, - {"label":"9", "x":10.5, "y":0}, - {"label":"0", "x":11.5, "y":0}, - {"label":"Back Space", "x":12.5, "y":0, "w":1.5}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"\\", "x":12.5, "y":1, "w":1.5}, - {"label":"Fn", "x":0, "y":2, "w":1.5}, - {"label":"A", "x":1.5, "y":2}, - {"label":"S", "x":2.5, "y":2}, - {"label":"D", "x":3.5, "y":2}, - {"label":"F", "x":4.5, "y":2}, - {"label":"G", "x":5.5, "y":2}, - {"label":"H", "x":7.5, "y":2}, - {"label":"J", "x":8.5, "y":2}, - {"label":"K", "x":9.5, "y":2}, - {"label":"L", "x":10.5, "y":2}, - {"label":";", "x":11.5, "y":2}, - {"label":"Return", "x":12.5, "y":2, "w":1.5}, - {"label":"Shift", "x":0, "y":3, "w":1.5}, - {"label":"Z", "x":1.5, "y":3}, - {"label":"X", "x":2.5, "y":3}, - {"label":"C", "x":3.5, "y":3}, - {"label":"V", "x":4.5, "y":3}, - {"label":"B", "x":5.5, "y":3}, - {"label":"PgUp", "x":6.5, "y":3}, - {"label":"N", "x":7.5, "y":3}, - {"label":"M", "x":8.5, "y":3}, - {"label":",", "x":9.5, "y":3}, - {"label":".", "x":10.5, "y":3}, - {"label":"/", "x":11.5, "y":3}, - {"label":"Shift", "x":12.5, "y":3, "w":1.5}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4}, - {"label":"Menu", "x":2.5, "y":4}, - {"label":"Alt", "x":3.5, "y":4}, - {"label":"Space", "x":4.5, "y":4}, - {"label":"Space", "x":5.5, "y":4}, - {"label":"PgDn", "x":6.5, "y":4}, - {"label":"Space", "x":7.5, "y":4}, - {"label":"Space", "x":8.5, "y":4}, - {"label":"AltGr", "x":9.5, "y":4}, - {"label":"[", "x":10.5, "y":4}, - {"label":"]", "x":11.5, "y":4}, - {"label":"Ctrl", "x":12.5, "y":4, "w":1.5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.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": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + {"matrix": [4, 7], "x": 7.5, "y": 4}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4}, + {"matrix": [4, 10], "x": 10.5, "y": 4}, + {"matrix": [4, 11], "x": 11.5, "y": 4}, + {"matrix": [4, 12], "x": 12.5, "y": 4, "w": 1.5} ] } } diff --git a/keyboards/polilla/info.json b/keyboards/polilla/info.json index 3c04775b36d7..d0074da4e580 100644 --- a/keyboards/polilla/info.json +++ b/keyboards/polilla/info.json @@ -18,75 +18,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0.25}, - {"x": 1, "y": 0.25}, - {"x": 2, "y": 0.125}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0.125}, - {"x": 13.5, "y": 0.25}, - {"x": 14.5, "y": 0.25}, + {"matrix": [0, 6], "x": 9.5, "y": 0}, + {"matrix": [0, 7], "x": 10.5, "y": 0}, + {"matrix": [0, 8], "x": 11.5, "y": 0}, + {"matrix": [0, 9], "x": 12.5, "y": 0.125}, + {"matrix": [0, 10], "x": 13.5, "y": 0.25}, + {"matrix": [0, 11], "x": 14.5, "y": 0.25}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.125}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, - {"x": 9.5, "y": 1}, - {"x": 10.5, "y": 1}, - {"x": 11.5, "y": 1}, - {"x": 12.5, "y": 1.125}, - {"x": 13.5, "y": 1.25}, - {"x": 14.5, "y": 1.25}, + {"matrix": [1, 6], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1}, + {"matrix": [1, 9], "x": 12.5, "y": 1.125}, + {"matrix": [1, 10], "x": 13.5, "y": 1.25}, + {"matrix": [1, 11], "x": 14.5, "y": 1.25}, - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.125}, - {"x": 3, "y": 2}, - {"x": 4, "y": 2}, - {"x": 5, "y": 2}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, - {"x": 9.5, "y": 2}, - {"x": 10.5, "y": 2}, - {"x": 11.5, "y": 2}, - {"x": 12.5, "y": 2.125}, - {"x": 13.5, "y": 2.25}, - {"x": 14.5, "y": 2.25}, + {"matrix": [2, 6], "x": 9.5, "y": 2}, + {"matrix": [2, 7], "x": 10.5, "y": 2}, + {"matrix": [2, 8], "x": 11.5, "y": 2}, + {"matrix": [2, 9], "x": 12.5, "y": 2.125}, + {"matrix": [2, 10], "x": 13.5, "y": 2.25}, + {"matrix": [2, 11], "x": 14.5, "y": 2.25}, - {"x": 0, "y": 3.25}, - {"x": 1, "y": 3.25}, - {"x": 2, "y": 3.125}, - {"x": 3, "y": 3}, - {"x": 4, "y": 3}, - {"x": 5, "y": 3}, + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, - {"x": 9.5, "y": 3}, - {"x": 10.5, "y": 3}, - {"x": 11.5, "y": 3}, - {"x": 12.5, "y": 3.125}, - {"x": 13.5, "y": 3.25}, - {"x": 14.5, "y": 3.25}, + {"matrix": [4, 5], "x": 9.5, "y": 3}, + {"matrix": [4, 6], "x": 10.5, "y": 3}, + {"matrix": [3, 6], "x": 11.5, "y": 3}, + {"matrix": [3, 7], "x": 12.5, "y": 3.125}, + {"matrix": [3, 8], "x": 13.5, "y": 3.25}, + {"matrix": [3, 9], "x": 14.5, "y": 3.25}, - {"x": 2, "y": 4.125}, - {"x": 3, "y": 4}, - {"x": 4, "y": 4}, - {"x": 5, "y": 4}, - {"x": 6, "y": 3.75, "h": 1.5}, - {"x": 6, "y": 2.75}, + {"matrix": [3, 10], "x": 2, "y": 4.125}, + {"matrix": [3, 11], "x": 3, "y": 4}, + {"matrix": [4, 0], "x": 4, "y": 4}, + {"matrix": [4, 1], "x": 5, "y": 4}, + {"matrix": [4, 2], "x": 6, "y": 3.75, "h": 1.5}, + {"matrix": [4, 3], "x": 6, "y": 2.75}, - {"x": 8.5, "y": 2.75}, - {"x": 8.5, "y": 3.75, "h": 1.5}, - {"x": 9.5, "y": 4}, - {"x": 10.5, "y": 4}, - {"x": 11.5, "y": 4}, - {"x": 12.5, "y": 4.125} + {"matrix": [4, 4], "x": 8.5, "y": 2.75}, + {"matrix": [4, 7], "x": 8.5, "y": 3.75, "h": 1.5}, + {"matrix": [4, 8], "x": 9.5, "y": 4}, + {"matrix": [4, 9], "x": 10.5, "y": 4}, + {"matrix": [4, 10], "x": 11.5, "y": 4}, + {"matrix": [4, 11], "x": 12.5, "y": 4.125} ] } } diff --git a/keyboards/polilla/polilla.h b/keyboards/polilla/polilla.h deleted file mode 100644 index 39a706ee2610..000000000000 --- a/keyboards/polilla/polilla.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 elagil - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix.k - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, L45, R41, R42, R43, R44, R45 \ -) { \ - { L00, L01, L02, L03, L04, L05, R01, R02, R03, R04, R05, R06 },\ - { L10, L11, L12, L13, L14, L15, R11, R12, R13, R14, R15, R16 },\ - { L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26 },\ - { L30, L31, L32, L33, L34, L35, R31, R32, R33, R34, R35, R36 },\ - { L41, L42, L43, L44, L45, L36, R30, R41, R42, R43, R44, R45 },\ -} diff --git a/keyboards/primekb/meridian_rgb/info.json b/keyboards/primekb/meridian_rgb/info.json index d3422ffec9f8..239f6ea4f460 100644 --- a/keyboards/primekb/meridian_rgb/info.json +++ b/keyboards/primekb/meridian_rgb/info.json @@ -25,7 +25,81 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.5, "y":0}, {"label":"*", "x":9.5, "y":0}, {"label":"(", "x":10.5, "y":0}, {"label":")", "x":11.5, "y":0}, {"label":"_", "x":12.5, "y":0}, {"label":"+", "x":13.5, "y":0}, {"label":"Backspace", "x":14.5, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8, "y":1}, {"label":"U", "x":9, "y":1}, {"label":"I", "x":10, "y":1}, {"label":"O", "x":11, "y":1}, {"label":"P", "x":12, "y":1}, {"label":"{", "x":13, "y":1}, {"label":"}", "x":14, "y":1}, {"label":"|", "x":15, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.25, "y":2}, {"label":"J", "x":9.25, "y":2}, {"label":"K", "x":10.25, "y":2}, {"label":"L", "x":11.25, "y":2}, {"label":":", "x":12.25, "y":2}, {"label":"\"", "x":13.25, "y":2}, {"label":"Enter", "x":14.25, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"B", "x":7.75, "y":3}, {"label":"N", "x":8.75, "y":3}, {"label":"M", "x":9.75, "y":3}, {"label":"<", "x":10.75, "y":3}, {"label":">", "x":11.75, "y":3}, {"label":"?", "x":12.75, "y":3}, {"label":"Shift", "x":13.75, "y":3, "w":1.75}, {"label":"Fn", "x":15.5, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3.75, "y":4, "w":1.25}, {"x":5, "y":4, "w":2.25}, {"x":7.75, "y":4, "w":2.75}, {"label":"Alt", "x":10.5, "y":4, "w":1.25}, {"label":"Win", "x":12.75, "y":4, "w":1.25}, {"label":"Menu", "x":14, "y":4, "w":1.25}, {"label":"Ctrl", "x":15.25, "y":4, "w":1.25}] + "layout": [ + {"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": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + {"matrix": [1, 11], "x": 13, "y": 1}, + {"matrix": [1, 12], "x": 14, "y": 1}, + {"matrix": [1, 13], "x": 15, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.25, "y": 2}, + {"matrix": [2, 7], "x": 9.25, "y": 2}, + {"matrix": [2, 8], "x": 10.25, "y": 2}, + {"matrix": [2, 9], "x": 11.25, "y": 2}, + {"matrix": [2, 10], "x": 12.25, "y": 2}, + {"matrix": [2, 11], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 7.75, "y": 3}, + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 15.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5, "y": 4, "w": 2.25}, + + {"matrix": [4, 7], "x": 7.75, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 15.25, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/primekb/meridian_rgb/meridian_rgb.h b/keyboards/primekb/meridian_rgb/meridian_rgb.h deleted file mode 100644 index 8cff4ff96d2a..000000000000 --- a/keyboards/primekb/meridian_rgb/meridian_rgb.h +++ /dev/null @@ -1,37 +0,0 @@ -/* -Copyright 2022 Holten Campbell - -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 K_NO KC_NO - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K404, K407, K409, K411, K412, K413 \ -) \ -{ \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K_NO, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \ - { K400, K401, K402, K_NO, K404, K_NO, K_NO, K407, K_NO, K409, K_NO, K411, K412, K413 } \ -} diff --git a/keyboards/primekb/prime_e/info.json b/keyboards/primekb/prime_e/info.json index 51847d82a782..f94271be6ce3 100644 --- a/keyboards/primekb/prime_e/info.json +++ b/keyboards/primekb/prime_e/info.json @@ -13,12 +13,60 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "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":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":0,"y":1,"w":1.25}, {"x":1.25,"y":1}, {"x":2.25,"y":1}, {"x":3.25,"y":1}, {"x":4.25,"y":1}, {"x":5.25,"y":1}, {"x":7.25,"y":1}, {"x":8.25,"y":1}, {"x":9.25,"y":1}, {"x":10.25,"y":1}, {"x":11.25,"y":1}, {"x":12.25,"y":1,"w":1.75}, - {"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,"w":1.25}, - {"x":0,"y":3,"w":1.25}, {"x":1.25,"y":3,"w":1.25}, {"x":3.5,"y":3,"w":1.25}, {"x":4.75,"y":3,"w":2}, {"x":6.75,"y":3,"w":2.25}, {"x":9,"y":3,"w":1.25}, {"x":11.5,"y":3,"w":1.25}, {"x":12.75,"y":3,"w":1.25} - ] - } + "LAYOUT": { + "layout": [ + {"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": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [1, 6], "x": 7.25, "y": 1}, + {"matrix": [1, 7], "x": 8.25, "y": 1}, + {"matrix": [1, 8], "x": 9.25, "y": 1}, + {"matrix": [1, 9], "x": 10.25, "y": 1}, + {"matrix": [1, 10], "x": 11.25, "y": 1}, + {"matrix": [1, 12], "x": 12.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 6.75, "y": 3, "w": 2.25}, + {"matrix": [3, 8], "x": 9, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 11.5, "y": 3, "w": 1.25}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.25} + ] + } } } diff --git a/keyboards/primekb/prime_e/prime_e.h b/keyboards/primekb/prime_e/prime_e.h deleted file mode 100644 index 8de0af462277..000000000000 --- a/keyboards/primekb/prime_e/prime_e.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2019 Holten Campbell - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K112, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, \ - K300, K301, K303, K304, K306, K308, K311, K312 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO, K112 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 }, \ - { K300, K301, KC_NO, K303, K304, KC_NO, K306, KC_NO, K308, KC_NO, KC_NO, K311, K312 } \ -} diff --git a/keyboards/primekb/prime_l/info.json b/keyboards/primekb/prime_l/info.json index b9c5545ca71d..93bb4432e2dc 100644 --- a/keyboards/primekb/prime_l/info.json +++ b/keyboards/primekb/prime_l/info.json @@ -6,10 +6,5 @@ "vid": "0x5052" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "layouts": { - "LAYOUT": { - "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] - } - } + "bootloader": "atmel-dfu" } diff --git a/keyboards/primekb/prime_l/v1/info.json b/keyboards/primekb/prime_l/v1/info.json index 079c39571b95..c68d99294337 100644 --- a/keyboards/primekb/prime_l/v1/info.json +++ b/keyboards/primekb/prime_l/v1/info.json @@ -15,9 +15,89 @@ "pin": "B6", "levels": 4 }, - "layouts": { - "LAYOUT": { - "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4}, {"x":7.5, "y":4, "w":2}, {"x":9.5, "y":4, "w":2.25}, {"x":11.75, "y":4}, {"x":12.75, "y":4}, {"x":13.75, "y":4}, {"x":14.75, "y":4, "w":1.25}] - } - } + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2}, + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 15], "x": 14.25, "y": 2, "w": 1.75}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.75}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3}, + {"matrix": [3, 13], "x": 12.75, "y": 3}, + {"matrix": [3, 14], "x": 13.75, "y": 3}, + {"matrix": [3, 15], "x": 14.75, "y": 3, "w": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 5.5, "y": 4}, + {"matrix": [4, 7], "x": 6.5, "y": 4}, + {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 2}, + {"matrix": [4, 10], "x": 9.5, "y": 4, "w": 2.25}, + {"matrix": [4, 12], "x": 11.75, "y": 4}, + {"matrix": [4, 13], "x": 12.75, "y": 4}, + {"matrix": [4, 14], "x": 13.75, "y": 4}, + {"matrix": [4, 15], "x": 14.75, "y": 4, "w": 1.25} + ] + } + } } diff --git a/keyboards/primekb/prime_l/v1/v1.h b/keyboards/primekb/prime_l/v1/v1.h deleted file mode 100644 index 4ee291679f5d..000000000000 --- a/keyboards/primekb/prime_l/v1/v1.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215 , \ - K300, K301, K302, K303, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \ - K400, K401, K402, K403, K405, K406, K407, K408, K410, K412, K413, K414, K415 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ - { K300, K301, K302, K303, KC_NO, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \ - { K400, K401, K402, K403, KC_NO, K405, K406, K407, K408, KC_NO, K410, KC_NO, K412, K413, K414, K415 } \ -} diff --git a/keyboards/primekb/prime_l/v2/info.json b/keyboards/primekb/prime_l/v2/info.json index a97809736efa..77e2a3a75060 100644 --- a/keyboards/primekb/prime_l/v2/info.json +++ b/keyboards/primekb/prime_l/v2/info.json @@ -12,12 +12,88 @@ }, "diode_direction": "COL2ROW", "layouts": { - "LAYOUT": { - "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2, "w":1.25}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2, "w":1.75}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3, "w":1.75}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.25}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4, "w":1.25}, {"x":4.25, "y":4, "w":1.25}, {"x":5.5, "y":4}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":1.75}, {"x":9.5, "y":4, "w":1.75}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.25}, {"x":14.75, "y":4, "w":1.25}] - } + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2, "w": 1.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2}, + {"matrix": [2, 13], "x": 13.25, "y": 2}, + {"matrix": [2, 15], "x": 14.25, "y": 2, "w": 1.75}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "w": 1.75}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3}, + {"matrix": [3, 14], "x": 13.75, "y": 3}, + {"matrix": [3, 15], "x": 14.75, "y": 3, "w": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + {"matrix": [4, 6], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 7.5, "y": 4, "w": 2}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 2.25}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.75, "y": 4}, + {"matrix": [4, 14], "x": 13.75, "y": 4, "w": 1.25}, + {"matrix": [4, 15], "x": 14.75, "y": 4, "w": 1.25} + ] + } } } diff --git a/keyboards/primekb/prime_l/v2/v2.h b/keyboards/primekb/prime_l/v2/v2.h deleted file mode 100644 index b0924d5d79bc..000000000000 --- a/keyboards/primekb/prime_l/v2/v2.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Holten Campbell - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215 , \ - K300, K301, K302, K303, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \ - K400, K401, K402, K403, K405, K406, K407, K408, K410, K412, K413, K414, K415 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ - { K300, K301, K302, K303, K305, K306, K307, K308, K309, K310, K311, K312, K313, KC_NO, K314, K315 }, \ - { K400, K401, K402, K403, K405, K406, K407, K408, KC_NO, K410, KC_NO, K412, K413, KC_NO, K414, K415 } \ -} diff --git a/keyboards/primekb/prime_o/info.json b/keyboards/primekb/prime_o/info.json index b826606770e9..2a3a59cfb632 100644 --- a/keyboards/primekb/prime_o/info.json +++ b/keyboards/primekb/prime_o/info.json @@ -20,8 +20,93 @@ "processor": "atmega32u2", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] - } + "LAYOUT": { + "layout": [ + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [5, 0], "x": 1, "y": 0}, + {"matrix": [4, 1], "x": 2, "y": 0}, + {"matrix": [5, 1], "x": 3, "y": 0}, + {"matrix": [4, 2], "x": 4, "y": 0}, + {"matrix": [5, 2], "x": 5, "y": 0}, + {"matrix": [4, 3], "x": 6, "y": 0}, + {"matrix": [5, 3], "x": 7, "y": 0}, + {"matrix": [4, 4], "x": 8, "y": 0}, + {"matrix": [5, 4], "x": 9, "y": 0}, + {"matrix": [4, 5], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [4, 6], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + {"matrix": [4, 7], "x": 14, "y": 0}, + {"matrix": [5, 7], "x": 15, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1}, + {"matrix": [6, 0], "x": 1, "y": 1}, + {"matrix": [3, 1], "x": 2, "y": 1}, + {"matrix": [6, 1], "x": 3, "y": 1}, + {"matrix": [3, 2], "x": 4, "y": 1}, + {"matrix": [6, 2], "x": 5, "y": 1}, + {"matrix": [3, 3], "x": 6, "y": 1}, + {"matrix": [6, 3], "x": 7, "y": 1}, + {"matrix": [3, 4], "x": 8, "y": 1}, + {"matrix": [6, 4], "x": 9, "y": 1}, + {"matrix": [3, 5], "x": 10, "y": 1}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [3, 6], "x": 12, "y": 1}, + {"matrix": [6, 6], "x": 13, "y": 1}, + {"matrix": [3, 7], "x": 14, "y": 1}, + {"matrix": [6, 7], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [7, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [7, 1], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2}, + {"matrix": [7, 2], "x": 5, "y": 2}, + {"matrix": [2, 3], "x": 6, "y": 2}, + {"matrix": [7, 3], "x": 7, "y": 2}, + {"matrix": [2, 4], "x": 8, "y": 2}, + {"matrix": [7, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [2, 6], "x": 12, "y": 2}, + {"matrix": [7, 6], "x": 13, "y": 2}, + {"matrix": [2, 7], "x": 14, "y": 2}, + {"matrix": [7, 7], "x": 15, "y": 2}, + + {"matrix": [1, 0], "x": 0, "y": 3}, + {"matrix": [8, 0], "x": 1, "y": 3}, + {"matrix": [1, 1], "x": 2, "y": 3}, + {"matrix": [8, 1], "x": 3, "y": 3}, + {"matrix": [1, 2], "x": 4, "y": 3}, + {"matrix": [8, 2], "x": 5, "y": 3}, + {"matrix": [1, 3], "x": 6, "y": 3}, + {"matrix": [8, 3], "x": 7, "y": 3}, + {"matrix": [1, 4], "x": 8, "y": 3}, + {"matrix": [8, 4], "x": 9, "y": 3}, + {"matrix": [1, 5], "x": 10, "y": 3}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [1, 6], "x": 12, "y": 3}, + {"matrix": [8, 6], "x": 13, "y": 3}, + {"matrix": [1, 7], "x": 14, "y": 3}, + {"matrix": [8, 7], "x": 15, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4}, + {"matrix": [9, 0], "x": 1, "y": 4}, + {"matrix": [0, 1], "x": 2, "y": 4}, + {"matrix": [9, 1], "x": 3, "y": 4}, + {"matrix": [0, 2], "x": 4, "y": 4}, + {"matrix": [9, 2], "x": 5, "y": 4}, + {"matrix": [0, 3], "x": 6, "y": 4}, + {"matrix": [9, 3], "x": 7, "y": 4}, + {"matrix": [0, 4], "x": 8, "y": 4}, + {"matrix": [9, 4], "x": 9, "y": 4}, + {"matrix": [0, 5], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [0, 6], "x": 12, "y": 4}, + {"matrix": [9, 6], "x": 13, "y": 4}, + {"matrix": [0, 7], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4} + ] + } } } diff --git a/keyboards/primekb/prime_o/prime_o.h b/keyboards/primekb/prime_o/prime_o.h deleted file mode 100644 index fec3392b3193..000000000000 --- a/keyboards/primekb/prime_o/prime_o.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2018 Jumail Mundekkat - * - * 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( \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, \ - k30, k60, k31, k61, k32, k62, k33, k63, k34, k64, k35, k65, k36, k66, k37, k67, \ - k20, k70, k21, k71, k22, k72, k23, k73, k24, k74, k25, k75, k26, k76, k27, k77, \ - k10, k80, k11, k81, k12, k82, k13, k83, k14, k84, k15, k85, k16, k86, k17, k87, \ - k00, k90, k01, k91, k02, k92, k03, k93, k04, k94, k05, k95, k06, k96, k07, k97 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, 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, k84, k85, k86, k87 }, \ - { k90, k91, k92, k93, k94, k95, k96, k97 } \ -} diff --git a/keyboards/primekb/prime_r/info.json b/keyboards/primekb/prime_r/info.json index e081dc388c99..86c6db9c4f10 100644 --- a/keyboards/primekb/prime_r/info.json +++ b/keyboards/primekb/prime_r/info.json @@ -21,7 +21,87 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2, "y":0}, {"label":"K003", "x":3, "y":0}, {"label":"K004", "x":4, "y":0}, {"label":"K005", "x":5, "y":0}, {"label":"K006", "x":6, "y":0}, {"label":"K007", "x":7, "y":0}, {"label":"K008", "x":8, "y":0}, {"label":"K009", "x":9, "y":0}, {"label":"K010", "x":10, "y":0}, {"label":"K011", "x":11, "y":0}, {"label":"K012", "x":12, "y":0}, {"label":"K013", "x":13, "y":0}, {"label":"K014", "x":14, "y":0}, {"label":"K015", "x":15, "y":0}, {"label":"K100", "x":0, "y":1}, {"label":"K101", "x":1, "y":1}, {"label":"K102", "x":2, "y":1}, {"label":"K103", "x":3, "y":1}, {"label":"K104", "x":4, "y":1}, {"label":"K105", "x":5, "y":1}, {"label":"K106", "x":6, "y":1}, {"label":"K107", "x":7, "y":1}, {"label":"K108", "x":8, "y":1}, {"label":"K109", "x":9, "y":1}, {"label":"K110", "x":10, "y":1}, {"label":"K111", "x":11, "y":1}, {"label":"K112", "x":12, "y":1}, {"label":"K113", "x":13, "y":1}, {"label":"K114", "x":14, "y":1}, {"label":"K115", "x":15, "y":1}, {"label":"K200", "x":0, "y":2, "w":1.25}, {"label":"K201", "x":1.25, "y":2}, {"label":"K202", "x":2.25, "y":2}, {"label":"K203", "x":3.25, "y":2}, {"label":"K204", "x":4.25, "y":2}, {"label":"K205", "x":5.25, "y":2}, {"label":"K206", "x":6.25, "y":2}, {"label":"K207", "x":7.25, "y":2}, {"label":"K208", "x":8.25, "y":2}, {"label":"K209", "x":9.25, "y":2}, {"label":"K210", "x":10.25, "y":2}, {"label":"K212", "x":11.25, "y":2, "w":1.75}, {"label":"K213", "x":13, "y":2}, {"label":"K214", "x":14, "y":2}, {"label":"K215", "x":15, "y":2}, {"label":"K300", "x":0, "y":3, "w":1.75}, {"label":"K302", "x":1.75, "y":3}, {"label":"K303", "x":2.75, "y":3}, {"label":"K304", "x":3.75, "y":3}, {"label":"K305", "x":4.75, "y":3}, {"label":"K306", "x":5.75, "y":3}, {"label":"K307", "x":6.75, "y":3}, {"label":"K308", "x":7.75, "y":3}, {"label":"K309", "x":8.75, "y":3}, {"label":"K310", "x":9.75, "y":3}, {"label":"K311", "x":10.75, "y":3}, {"label":"K312", "x":11.75, "y":3, "w":1.25}, {"label":"K313", "x":13, "y":3}, {"label":"K314", "x":14, "y":3}, {"label":"K315", "x":15, "y":3}, {"label":"K400", "x":0, "y":4, "w":1.25}, {"label":"K402", "x":1.25, "y":4, "w":1.25}, {"label":"K403", "x":2.5, "y":4}, {"label":"K404", "x":3.5, "y":4}, {"label":"K405", "x":4.5, "y":4, "w":2}, {"label":"K407", "x":6.5, "y":4, "w":2.25}, {"label":"K409", "x":8.75, "y":4}, {"label":"K410", "x":9.75, "y":4}, {"label":"K411", "x":10.75, "y":4}, {"label":"K412", "x":11.75, "y":4, "w":1.25}, {"label":"K413", "x":13, "y":4}, {"label":"K414", "x":14, "y":4}, {"label":"K415", "x":15, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 12], "x": 11.25, "y": 2, "w": 1.75}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3}, + {"matrix": [3, 3], "x": 2.75, "y": 3}, + {"matrix": [3, 4], "x": 3.75, "y": 3}, + {"matrix": [3, 5], "x": 4.75, "y": 3}, + {"matrix": [3, 6], "x": 5.75, "y": 3}, + {"matrix": [3, 7], "x": 6.75, "y": 3}, + {"matrix": [3, 8], "x": 7.75, "y": 3}, + {"matrix": [3, 9], "x": 8.75, "y": 3}, + {"matrix": [3, 10], "x": 9.75, "y": 3}, + {"matrix": [3, 11], "x": 10.75, "y": 3}, + {"matrix": [3, 12], "x": 11.75, "y": 3, "w": 1.25}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4}, + {"matrix": [4, 4], "x": 3.5, "y": 4}, + {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 6.5, "y": 4, "w": 2.25}, + {"matrix": [4, 9], "x": 8.75, "y": 4}, + {"matrix": [4, 10], "x": 9.75, "y": 4}, + {"matrix": [4, 11], "x": 10.75, "y": 4}, + {"matrix": [4, 12], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/primekb/prime_r/prime_r.h b/keyboards/primekb/prime_r/prime_r.h deleted file mode 100644 index 905b5c8cf8bf..000000000000 --- a/keyboards/primekb/prime_r/prime_r.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2018 Andrew Heaston - * - * 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 XXX KC_NO - -#define LAYOUT( \ - 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, k2C, k2D, k2E, k2F, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, \ - k40, k42, k43, k44, k45, k47, k49, k4A, k4B, k4C, k4D, k4E, k4F \ -) { \ - { 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, XXX, k2C, k2D, k2E, k2F }, \ - { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F }, \ - { k40, XXX, k42, k43, k44, k45, XXX, k47, XXX, k49, k4A, k4B, k4C, k4D, k4E, k4F } \ -} diff --git a/keyboards/q4z/info.json b/keyboards/q4z/info.json index 3e000db2d2c5..dc02296131ba 100644 --- a/keyboards/q4z/info.json +++ b/keyboards/q4z/info.json @@ -18,48 +18,52 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (F4,D1)", "x":0.5, "y":0}, - {"label":"K01 (F4,D0)", "x":1.5, "y":0}, - {"label":"K02 (F4,D4)", "x":2.5, "y":0}, - {"label":"K03 (F4,B6)", "x":3.5, "y":0}, - {"label":"K04 (F4,B2)", "x":4.5, "y":0}, - {"label":"K10 (C6,D1)", "x":0, "y":1}, - {"label":"K11 (C6,D0)", "x":1, "y":1}, - {"label":"K12 (C6,D4)", "x":2, "y":1}, - {"label":"K13 (C6,B6)", "x":3, "y":1}, - {"label":"K14 (C6,B2)", "x":4, "y":1}, - {"label":"K15 (C6,B3)", "x":5, "y":1}, - {"label":"K16 (C6,B1)", "x":6, "y":1}, - {"label":"K17 (C6,F7)", "x":7, "y":1}, - {"label":"K18 (C6,F6)", "x":8, "y":1}, - {"label":"K19 (C6,F5)", "x":9, "y":1, "w":1.25}, - {"label":"K20 (D7,D1)", "x":0, "y":2, "w":1.25}, - {"label":"K21 (D7,D0)", "x":1.25, "y":2}, - {"label":"K22 (D7,D4)", "x":2.25, "y":2}, - {"label":"K23 (D7,B6)", "x":3.25, "y":2}, - {"label":"K24 (D7,B2)", "x":4.25, "y":2}, - {"label":"K25 (D7,B3)", "x":5.25, "y":2}, - {"label":"K26 (D7,B1)", "x":6.25, "y":2}, - {"label":"K27 (D7,F7)", "x":7.25, "y":2}, - {"label":"K28 (D7,F6)", "x":8.25, "y":2}, - {"label":"K29 (D7,F5)", "x":9.25, "y":2}, - {"label":"K30 (E6,D1)", "x":0, "y":3, "w":1.75}, - {"label":"K31 (E6,D0)", "x":1.75, "y":3}, - {"label":"K32 (E6,D4)", "x":2.75, "y":3}, - {"label":"K33 (E6,B6)", "x":3.75, "y":3}, - {"label":"K34 (E6,B2)", "x":4.75, "y":3}, - {"label":"K35 (E6,B3)", "x":5.75, "y":3}, - {"label":"K36 (E6,B1)", "x":6.75, "y":3}, - {"label":"K37 (E6,F7)", "x":7.75, "y":3}, - {"label":"K38 (E6,F6)", "x":8.75, "y":3, "w":1.5}, - {"label":"K40 (B4,D1)", "x":0, "y":4}, - {"label":"K41 (B4,D0)", "x":1, "y":4}, - {"label":"K42 (B4,D4)", "x":2, "y":4}, - {"label":"K43 (B4,B6)", "x":3, "y":4, "w":2.25}, - {"label":"K44 (B4,B2)", "x":5.25, "y":4, "w":2}, - {"label":"K45 (B4,B3)", "x":7.25, "y":4}, - {"label":"K46 (B4,B1)", "x":8.25, "y":4}, - {"label":"K47 (B4,F7)", "x":9.25, "y":4} + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 2.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 7.25, "y": 4}, + {"matrix": [4, 6], "x": 8.25, "y": 4}, + {"matrix": [4, 7], "x": 9.25, "y": 4} ] } } diff --git a/keyboards/q4z/q4z.h b/keyboards/q4z/q4z.h deleted file mode 100644 index 465178fdb130..000000000000 --- a/keyboards/q4z/q4z.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 rjboone - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K01, K06, K11, K16, K21, \ - K02, K07, K12, K17, K22, K26, K30, K34, K38, K41, \ - K03, K08, K13, K18, K23, K27, K31, K35, K39, K42, \ - K04, K09, K14, K19, K24, K28, K32, K36, K40, \ - K05, K10, K15, K20, K25, K29, K33, K37 \ -) { \ - { K01, K06, K11, K16, K21, XXX, XXX, XXX, XXX, XXX }, \ - { K02, K07, K12, K17, K22, K26, K30, K34, K38, K41 }, \ - { K03, K08, K13, K18, K23, K27, K31, K35, K39, K42 }, \ - { K04, K09, K14, K19, K24, K28, K32, K36, K40, XXX }, \ - { K05, K10, K15, K20, K25, K29, K33, K37, XXX, XXX } \ -} diff --git a/keyboards/quantrik/kyuu/info.json b/keyboards/quantrik/kyuu/info.json index ea8b3da4fa4e..e741eeb04a1a 100644 --- a/keyboards/quantrik/kyuu/info.json +++ b/keyboards/quantrik/kyuu/info.json @@ -16,76 +16,84 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"label":"K00 (B6,F1)", "x":0, "y":0}, - {"label":"K01 (B6,F4)", "x":1, "y":0}, - {"label":"K02 (B6,F5)", "x":2, "y":0}, - {"label":"K03 (B6,F6)", "x":3, "y":0}, - {"label":"K04 (B6,F7)", "x":4, "y":0}, - {"label":"K05 (B6,C7)", "x":5, "y":0}, - {"label":"K06 (B6,C6)", "x":6, "y":0}, - {"label":"K07 (B6,F0)", "x":7, "y":0}, - {"label":"K08 (B6,B7)", "x":8, "y":0}, - {"label":"K09 (B6,D0)", "x":9, "y":0}, - {"label":"K0A (B6,D5)", "x":10, "y":0}, - {"label":"K0B (B6,D3)", "x":11, "y":0}, - {"label":"K0C (B6,D2)", "x":12, "y":0}, - {"label":"K0D (B6,D1)", "x":13, "y":0}, - {"label":"K0E (B6,B3)", "x":14, "y":0}, - {"label":"K2E (B4,B3)", "x":15, "y":0}, - {"label":"K10 (B5,F1)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B5,F4)", "x":1.5, "y":1}, - {"label":"K12 (B5,F5)", "x":2.5, "y":1}, - {"label":"K13 (B5,F6)", "x":3.5, "y":1}, - {"label":"K14 (B5,F7)", "x":4.5, "y":1}, - {"label":"K15 (B5,C7)", "x":5.5, "y":1}, - {"label":"K16 (B5,C6)", "x":6.5, "y":1}, - {"label":"K17 (B5,F0)", "x":7.5, "y":1}, - {"label":"K18 (B5,B7)", "x":8.5, "y":1}, - {"label":"K19 (B5,D0)", "x":9.5, "y":1}, - {"label":"K1A (B5,D5)", "x":10.5, "y":1}, - {"label":"K1B (B5,D3)", "x":11.5, "y":1}, - {"label":"K1C (B5,D2)", "x":12.5, "y":1}, - {"label":"K1D (B5,D1)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B5,B3)", "x":15, "y":1}, - {"label":"K20 (B4,F1)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B4,F4)", "x":1.75, "y":2}, - {"label":"K22 (B4,F5)", "x":2.75, "y":2}, - {"label":"K23 (B4,F6)", "x":3.75, "y":2}, - {"label":"K24 (B4,F7)", "x":4.75, "y":2}, - {"label":"K25 (B4,C7)", "x":5.75, "y":2}, - {"label":"K26 (B4,C6)", "x":6.75, "y":2}, - {"label":"K27 (B4,F0)", "x":7.75, "y":2}, - {"label":"K28 (B4,B7)", "x":8.75, "y":2}, - {"label":"K29 (B4,D0)", "x":9.75, "y":2}, - {"label":"K2A (B4,D5)", "x":10.75, "y":2}, - {"label":"K2B (B4,D3)", "x":11.75, "y":2}, - {"label":"K2C (B4,D2)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2D (B4,D1)", "x":15, "y":2}, - {"label":"K30 (D7,F1)", "x":0, "y":3, "w":2.25}, - {"label":"K31 (D7,F4)", "x":2.25, "y":3}, - {"label":"K32 (D7,F5)", "x":3.25, "y":3}, - {"label":"K33 (D7,F6)", "x":4.25, "y":3}, - {"label":"K34 (D7,F7)", "x":5.25, "y":3}, - {"label":"K35 (D7,C7)", "x":6.25, "y":3}, - {"label":"K36 (D7,C6)", "x":7.25, "y":3}, - {"label":"K37 (D7,F0)", "x":8.25, "y":3}, - {"label":"K38 (D7,B7)", "x":9.25, "y":3}, - {"label":"K39 (D7,D0)", "x":10.25, "y":3}, - {"label":"K3A (D7,D5)", "x":11.25, "y":3}, - {"label":"K3B (D7,D3)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3C (D7,D2)", "x":14, "y":3}, - {"label":"K3D (D7,D1)", "x":15, "y":3}, - {"label":"K40 (D6,F1)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (D6,F4)", "x":1.5, "y":4}, - {"label":"K42 (D6,F5)", "x":2.5, "y":4, "w":1.5}, - {"label":"K46 (D6,C6)", "x":4, "y":4, "w":7}, - {"label":"K4A (D6,D5)", "x":11, "y":4, "w":1.5}, - {"label":"K4B (D6,D3)", "x":13, "y":4}, - {"label":"K4C (D6,D2)", "x":14, "y":4}, - {"label":"K4D (D6,D1)", "x":15, "y":4} - ] - } + "LAYOUT": { + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [2, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 13], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 12], "x": 14, "y": 3}, + {"matrix": [3, 13], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [4, 11], "x": 13, "y": 4}, + {"matrix": [4, 12], "x": 14, "y": 4}, + {"matrix": [4, 13], "x": 15, "y": 4} + ] + } } - } +} diff --git a/keyboards/quantrik/kyuu/kyuu.h b/keyboards/quantrik/kyuu/kyuu.h deleted file mode 100644 index 25d9d86dd55d..000000000000 --- a/keyboards/quantrik/kyuu/kyuu.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 mechmerlin - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k2E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4D \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, KC_NO }, \ - { k40, k41, k42, KC_NO, KC_NO, KC_NO, k46, KC_NO, KC_NO, KC_NO, k4A, k4B, k4C, k4D, KC_NO }, \ -} diff --git a/keyboards/quarkeys/z40/info.json b/keyboards/quarkeys/z40/info.json index bde8a576b95a..7b48e3d79e1d 100644 --- a/keyboards/quarkeys/z40/info.json +++ b/keyboards/quarkeys/z40/info.json @@ -24,57 +24,57 @@ "layouts": { "LAYOUT": { "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":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3, "w":2}, - {"x":7, "y":3}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 7, "y": 3}, + {"matrix": [3, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } - } \ No newline at end of file +} \ No newline at end of file diff --git a/keyboards/quarkeys/z40/z40.c b/keyboards/quarkeys/z40/z40.c index 9bc188f04fc1..18ebec736b74 100644 --- a/keyboards/quarkeys/z40/z40.c +++ b/keyboards/quarkeys/z40/z40.c @@ -12,8 +12,8 @@ / along with this program. If not, see . */ +#include "quantum.h" -#include "z40.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { // Key Matrix to LED Index diff --git a/keyboards/quarkeys/z40/z40.h b/keyboards/quarkeys/z40/z40.h deleted file mode 100644 index 9a599d9cd133..000000000000 --- a/keyboards/quarkeys/z40/z40.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -/ Copyright 2022 quarkeys -/ 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 XXX KC_NO - -#define LAYOUT( \ - 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 \ -) { \ - { 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, XXX, k36, k37, k38, k39, k3A }\ -} diff --git a/keyboards/quarkeys/z67/hotswap/hotswap.h b/keyboards/quarkeys/z67/hotswap/hotswap.h deleted file mode 100644 index ed5758dc37d9..000000000000 --- a/keyboards/quarkeys/z67/hotswap/hotswap.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -/ Copyright 2022 quarkeys -/ 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 XXXX KC_NO - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K400, K401, K403, K406, K410, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ - { K300, KC_NO, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { K400, K401, KC_NO, K403, KC_NO, KC_NO, K406, KC_NO, KC_NO, KC_NO, K410, K411, K412, K413, K414 } \ -} - diff --git a/keyboards/quarkeys/z67/hotswap/info.json b/keyboards/quarkeys/z67/hotswap/info.json index 5daf2e0d16d3..b01ce2374d0a 100644 --- a/keyboards/quarkeys/z67/hotswap/info.json +++ b/keyboards/quarkeys/z67/hotswap/info.json @@ -21,77 +21,82 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Delete", "x":15, "y":0}, - - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"PgUp", "x":15, "y":1}, - - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"PgDn", "x":15, "y":2}, - - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"Fn", "x":15, "y":3}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/quarkeys/z67/solder/info.json b/keyboards/quarkeys/z67/solder/info.json index 4e0e697fd901..271ee5fae5a1 100644 --- a/keyboards/quarkeys/z67/solder/info.json +++ b/keyboards/quarkeys/z67/solder/info.json @@ -21,81 +21,86 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Back", "x":13, "y":0}, - {"label":"~", "x":14, "y":0}, - {"label":"Delete", "x":15, "y":0}, - - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"PgUp", "x":15, "y":1}, - - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"~", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"PgDn", "x":15, "y":2}, - - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"|", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"\u2191", "x":14, "y":3}, - {"label":"Fn", "x":15, "y":3}, - - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"x":3.75, "y":4, "w":6.25}, - {"label":"Alt", "x":10, "y":4}, - {"label":"Win", "x":11, "y":4}, - {"label":"Ctrl", "x":12, "y":4}, - {"label":"\u2190", "x":13, "y":4}, - {"label":"\u2193", "x":14, "y":4}, - {"label":"\u2192", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 8], "x": 10, "y": 4}, + {"matrix": [4, 9], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/quarkeys/z67/solder/solder.h b/keyboards/quarkeys/z67/solder/solder.h deleted file mode 100644 index 2a72b547c102..000000000000 --- a/keyboards/quarkeys/z67/solder/solder.h +++ /dev/null @@ -1,31 +0,0 @@ -/* -/ Copyright 2022 quarkeys -/ 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 XXXX KC_NO - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K114, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, K315, \ - K400, K401, K402, K407, K408, K409, K411, K412, K413, K415 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, XXXX, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, XXXX, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, XXXX, K314, K315 }, \ - { K400, K401, K402, XXXX, XXXX, XXXX, XXXX, K407, K408, K409, XXXX, K411, K412, K413, XXXX, K415 } \ -} diff --git a/keyboards/qwertyydox/info.json b/keyboards/qwertyydox/info.json index 0a0a9a551e87..fcc14084b07e 100644 --- a/keyboards/qwertyydox/info.json +++ b/keyboards/qwertyydox/info.json @@ -25,59 +25,66 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0}, - {"label":"Q", "x":1, "y":0}, - {"label":"W", "x":2, "y":0}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0}, - {"label":"T", "x":5, "y":0}, - {"label":"Y", "x":6, "y":0}, - {"label":"Y", "x":9, "y":0}, - {"label":"U", "x":10, "y":0}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0}, - {"label":"P", "x":13, "y":0}, - {"label":"{", "x":14, "y":0}, - {"label":"}", "x":15, "y":0}, - {"label":"Caps Lock", "x":0.25, "y":1}, - {"label":"A", "x":1.25, "y":1}, - {"label":"S", "x":2.25, "y":1}, - {"label":"D", "x":3.25, "y":1}, - {"label":"F", "x":4.25, "y":1}, - {"label":"G", "x":5.25, "y":1}, - {"label":"H", "x":9.25, "y":1}, - {"label":"J", "x":10.25, "y":1}, - {"label":"K", "x":11.25, "y":1}, - {"label":"L", "x":12.25, "y":1}, - {"label":":", "x":13.25, "y":1}, - {"label":"\"", "x":14.25, "y":1}, - {"label":"|", "x":15.25, "y":1}, - {"label":"Shift", "x":0.75, "y":2}, - {"label":"Z", "x":1.75, "y":2}, - {"label":"X", "x":2.75, "y":2}, - {"label":"C", "x":3.75, "y":2}, - {"label":"V", "x":4.75, "y":2}, - {"label":"B", "x":5.75, "y":2}, - {"label":"N", "x":9.75, "y":2}, - {"label":"M", "x":10.75, "y":2}, - {"label":"<", "x":11.75, "y":2}, - {"label":">", "x":12.75, "y":2}, - {"label":"?", "x":13.75, "y":2}, - {"label":"Shift", "x":14.75, "y":2}, - {"label":"Ctrl", "x":0.75, "y":3}, - {"label":"GUI", "x":1.75, "y":3}, - {"label":"Alt", "x":2.75, "y":3}, - {"label":"\"-QWERTY\"", "x":3.75, "y":3}, - {"label":"Enter", "x":4.75, "y":3.33}, - {"label":"Delete", "x":5.75, "y":3.67}, - {"label":"TO(_NUM)", "x":6.75, "y":4}, - {"label":"TO(_NAV)", "x":8.75, "y":4}, - {"label":"Space", "x":9.75, "y":3.67}, - {"label":"Back Space", "x":10.75, "y":3.33}, - {"label":"Left", "x":11.75, "y":3}, - {"label":"Alt", "x":12.75, "y":3}, - {"label":"GUI", "x":13.75, "y":3}, - {"label":"Ctrl", "x":14.75, "y":3} + {"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": [4, 6], "x": 9, "y": 0}, + {"matrix": [4, 5], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 3], "x": 12, "y": 0}, + {"matrix": [4, 2], "x": 13, "y": 0}, + {"matrix": [4, 1], "x": 14, "y": 0}, + {"matrix": [4, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [5, 6], "x": 9.25, "y": 1}, + {"matrix": [5, 5], "x": 10.25, "y": 1}, + {"matrix": [5, 4], "x": 11.25, "y": 1}, + {"matrix": [5, 3], "x": 12.25, "y": 1}, + {"matrix": [5, 2], "x": 13.25, "y": 1}, + {"matrix": [5, 1], "x": 14.25, "y": 1}, + {"matrix": [5, 0], "x": 15.25, "y": 1}, + + {"matrix": [2, 0], "x": 0.75, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [6, 5], "x": 9.75, "y": 2}, + {"matrix": [6, 4], "x": 10.75, "y": 2}, + {"matrix": [6, 3], "x": 11.75, "y": 2}, + {"matrix": [6, 2], "x": 12.75, "y": 2}, + {"matrix": [6, 1], "x": 13.75, "y": 2}, + {"matrix": [6, 0], "x": 14.75, "y": 2}, + + {"matrix": [3, 0], "x": 0.75, "y": 3}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3.33}, + {"matrix": [3, 5], "x": 5.75, "y": 3.67}, + {"matrix": [3, 6], "x": 6.75, "y": 4}, + + {"matrix": [7, 6], "x": 8.75, "y": 4}, + {"matrix": [7, 5], "x": 9.75, "y": 3.67}, + {"matrix": [7, 4], "x": 10.75, "y": 3.33}, + {"matrix": [7, 3], "x": 11.75, "y": 3}, + {"matrix": [7, 2], "x": 12.75, "y": 3}, + {"matrix": [7, 1], "x": 13.75, "y": 3}, + {"matrix": [7, 0], "x": 14.75, "y": 3} ] } } diff --git a/keyboards/qwertyydox/rev1/rev1.h b/keyboards/qwertyydox/rev1/rev1.h deleted file mode 100644 index d1c55886063e..000000000000 --- a/keyboards/qwertyydox/rev1/rev1.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, KC_NO, }, \ - { R36, R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/rabbit/rabbit68/info.json b/keyboards/rabbit/rabbit68/info.json index d50b5eb14a81..530af17cf091 100644 --- a/keyboards/rabbit/rabbit68/info.json +++ b/keyboards/rabbit/rabbit68/info.json @@ -18,74 +18,78 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0a", "x":10, "y":0}, - {"label":"k0b", "x":11, "y":0}, - {"label":"k0c", "x":12, "y":0}, - {"label":"k0d", "x":13, "y":0}, - {"label":"k10", "x":0, "y":1}, - {"label":"k11", "x":1, "y":1}, - {"label":"k12", "x":2, "y":1}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1}, - {"label":"k15", "x":5, "y":1}, - {"label":"k16", "x":6, "y":1}, - {"label":"k17", "x":7, "y":1}, - {"label":"k18", "x":8, "y":1}, - {"label":"k19", "x":9, "y":1}, - {"label":"k1a", "x":10, "y":1}, - {"label":"k1b", "x":11, "y":1}, - {"label":"k1c", "x":12, "y":1}, - {"label":"k1d", "x":13, "y":1}, - {"label":"k20", "x":0, "y":2}, - {"label":"k21", "x":1, "y":2}, - {"label":"k22", "x":2, "y":2}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2}, - {"label":"k25", "x":5, "y":2}, - {"label":"k26", "x":6, "y":2}, - {"label":"k27", "x":7, "y":2}, - {"label":"k28", "x":8, "y":2}, - {"label":"k29", "x":9, "y":2}, - {"label":"k2a", "x":10, "y":2}, - {"label":"k2b", "x":11, "y":2}, - {"label":"k2c", "x":12, "y":2}, - {"label":"k2d", "x":13, "y":2}, - {"label":"k30", "x":0, "y":3}, - {"label":"k31", "x":1, "y":3}, - {"label":"k32", "x":2, "y":3}, - {"label":"k33", "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":"k38", "x":8, "y":3}, - {"label":"k39", "x":9, "y":3}, - {"label":"k3a", "x":10, "y":3}, - {"label":"k3b", "x":11, "y":3}, - {"label":"k3c", "x":12, "y":3}, - {"label":"k3d", "x":13, "y":3}, - {"label":"k40", "x":0, "y":4}, - {"label":"k41", "x":1, "y":4}, - {"label":"k42", "x":2, "y":4, "w":1.25}, - {"label":"k43", "x":3.25, "y":4, "w":1.25}, - {"label":"k45", "x":4.5, "y":4, "w":1.5}, - {"label":"k46", "x":6, "y":4, "w":1.5}, - {"label":"k48", "x":7.5, "y":4, "w":1.25}, - {"label":"k49", "x":8.75, "y":4, "w":1.25}, - {"label":"k4a", "x":10, "y":4}, - {"label":"k4b", "x":11, "y":4}, - {"label":"k4c", "x":12, "y":4}, - {"label":"k4d", "x":13, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 4.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 6, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 7.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4} ] } } diff --git a/keyboards/rabbit/rabbit68/rabbit68.h b/keyboards/rabbit/rabbit68/rabbit68.h deleted file mode 100644 index 100863e76ffd..000000000000 --- a/keyboards/rabbit/rabbit68/rabbit68.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Kai Eckert - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k40, k41, k42, k43, k45, k46, k48, k49, k4a, k4b, k4c, k4d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \ - { k40, k41, k42, k43, KC_NO, k45, k46, KC_NO, k48, k49, k4a, k4b, k4c, k4d} \ -} diff --git a/keyboards/rainkeebs/rainkeeb/info.json b/keyboards/rainkeebs/rainkeeb/info.json index 1ac96eea6961..2b05e06f4c24 100644 --- a/keyboards/rainkeebs/rainkeeb/info.json +++ b/keyboards/rainkeebs/rainkeeb/info.json @@ -23,47 +23,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":7, "y":0}, - {"label":"k06", "x":8, "y":0}, - {"label":"k07", "x":9, "y":0}, - {"label":"k08", "x":10, "y":0}, - {"label":"k09", "x":11, "y":0}, - {"label":"k10", "x":0, "y":1}, - {"label":"k11", "x":1, "y":1}, - {"label":"k12", "x":2, "y":1}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1}, - {"label":"k15", "x":5.5, "y":1}, - {"label":"k16", "x":7, "y":1}, - {"label":"k17", "x":8, "y":1}, - {"label":"k18", "x":9, "y":1}, - {"label":"k19", "x":10, "y":1}, - {"label":"k1a", "x":11, "y":1}, - {"label":"k20", "x":0, "y":2}, - {"label":"k21", "x":1, "y":2}, - {"label":"k22", "x":2, "y":2}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2}, - {"label":"k25", "x":5.5, "y":2}, - {"label":"k26", "x":7, "y":2}, - {"label":"k27", "x":8, "y":2}, - {"label":"k28", "x":9, "y":2}, - {"label":"k29", "x":10, "y":2}, - {"label":"k2a", "x":11, "y":2}, - {"label":"k30", "x":0, "y":3}, - {"label":"k31", "x":1, "y":3}, - {"label":"k32", "x":2, "y":3}, - {"label":"k33", "x":3, "y":3, "w":2}, - {"label":"k34", "x":5, "y":3, "w":2}, - {"label":"k35", "x":7, "y":3, "w":2}, - {"label":"k36", "x":9, "y":3}, - {"label":"k37", "x":10, "y":3}, - {"label":"k38", "x":11, "y":3} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 3], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 4], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [2, 2], "x": 4, "y": 1}, + + {"matrix": [3, 2], "x": 5.5, "y": 1}, + + {"matrix": [2, 3], "x": 7, "y": 1}, + {"matrix": [3, 3], "x": 8, "y": 1}, + {"matrix": [2, 4], "x": 9, "y": 1}, + {"matrix": [3, 4], "x": 10, "y": 1}, + {"matrix": [2, 5], "x": 11, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2}, + {"matrix": [5, 0], "x": 1, "y": 2}, + {"matrix": [4, 1], "x": 2, "y": 2}, + {"matrix": [5, 1], "x": 3, "y": 2}, + {"matrix": [4, 2], "x": 4, "y": 2}, + + {"matrix": [5, 2], "x": 5.5, "y": 2}, + + {"matrix": [4, 3], "x": 7, "y": 2}, + {"matrix": [5, 3], "x": 8, "y": 2}, + {"matrix": [4, 4], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [4, 5], "x": 11, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3}, + {"matrix": [7, 0], "x": 1, "y": 3}, + {"matrix": [6, 1], "x": 2, "y": 3}, + {"matrix": [7, 2], "x": 3, "y": 3, "w": 2}, + {"matrix": [6, 2], "x": 5, "y": 3, "w": 2}, + {"matrix": [7, 3], "x": 7, "y": 3, "w": 2}, + {"matrix": [6, 4], "x": 9, "y": 3}, + {"matrix": [7, 4], "x": 10, "y": 3}, + {"matrix": [6, 5], "x": 11, "y": 3} ] } } diff --git a/keyboards/rainkeebs/rainkeeb/rainkeeb.h b/keyboards/rainkeebs/rainkeeb/rainkeeb.h deleted file mode 100644 index f0179f087c8c..000000000000 --- a/keyboards/rainkeebs/rainkeeb/rainkeeb.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2020 Regan Palmer - * - * 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( \ - K00, K10, K01, K11, K02, K13, K03, K14, K04, K15, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, \ - K60, K70, K61, K72, K62, K73, K64, K74, K65 \ -) { \ - { K00, K01, K02, K03, K04, KC_NO }, \ - { K10, K11, KC_NO, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, KC_NO }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, KC_NO }, \ - { K60, K61, K62, KC_NO, K64, K65 }, \ - { K70, KC_NO, K72, K73, K74, KC_NO } \ -} diff --git a/keyboards/rainkeebs/yasui/info.json b/keyboards/rainkeebs/yasui/info.json index 4ef45e2c4649..c1c874c77bcb 100644 --- a/keyboards/rainkeebs/yasui/info.json +++ b/keyboards/rainkeebs/yasui/info.json @@ -20,7 +20,51 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3} + ] } } } diff --git a/keyboards/rainkeebs/yasui/yasui.h b/keyboards/rainkeebs/yasui/yasui.h deleted file mode 100644 index 387b9a5ac8b9..000000000000 --- a/keyboards/rainkeebs/yasui/yasui.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Regan Palmer - * - * 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( \ - 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 \ -) { \ - { 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 } \ -} diff --git a/keyboards/rate/pistachio/info.json b/keyboards/rate/pistachio/info.json index e07d02061d1a..59329a2bd2c8 100644 --- a/keyboards/rate/pistachio/info.json +++ b/keyboards/rate/pistachio/info.json @@ -9,108 +9,5 @@ "device_version": "0.0.1" }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"x":1.25, "y":0}, - {"x":2.75, "y":0}, - {"x":3.75, "y":0}, - {"x":4.75, "y":0}, - {"x":5.75, "y":0}, - {"x":7.25, "y":0}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":14, "y":0}, - {"x":15, "y":0}, - {"x":16, "y":0}, - {"x":17, "y":0}, - - {"x":0, "y":1.5}, - {"x":1.25, "y":1.5}, - {"x":2.25, "y":1.5}, - {"x":3.25, "y":1.5}, - {"x":4.25, "y":1.5}, - {"x":5.25, "y":1.5}, - {"x":6.25, "y":1.5}, - {"x":7.25, "y":1.5}, - {"x":10, "y":1.5}, - {"x":11, "y":1.5}, - {"x":12, "y":1.5}, - {"x":13, "y":1.5}, - {"x":14, "y":1.5}, - {"x":15, "y":1.5}, - {"x":16, "y":1.5}, - {"x":17, "y":1.5}, - {"x":18.25, "y":1.5}, - - {"x":0, "y":2.5}, - {"x":1.25, "y":2.5, "w":1.5}, - {"x":2.75, "y":2.5}, - {"x":3.75, "y":2.5}, - {"x":4.75, "y":2.5}, - {"x":5.75, "y":2.5}, - {"x":6.75, "y":2.5}, - {"x":9.5, "y":2.5}, - {"x":10.5, "y":2.5}, - {"x":11.5, "y":2.5}, - {"x":12.5, "y":2.5}, - {"x":13.5, "y":2.5}, - {"x":14.5, "y":2.5}, - {"x":15.5, "y":2.5}, - {"x":18.25, "y":2.5}, - - {"x":0, "y":3.5}, - {"x":1.25, "y":3.5, "w":1.75}, - {"x":3, "y":3.5}, - {"x":4, "y":3.5}, - {"x":5, "y":3.5}, - {"x":6, "y":3.5}, - {"x":7, "y":3.5}, - {"x":9.75, "y":3.5}, - {"x":10.75, "y":3.5}, - {"x":11.75, "y":3.5}, - {"x":12.75, "y":3.5}, - {"x":13.75, "y":3.5}, - {"x":14.75, "y":3.5}, - {"x":15.75, "y":3.5}, - {"x":16.75, "y":2.5, "w":1.25, "h":2}, - {"x":18.25, "y":3.5}, - - {"x":0, "y":4.5}, - {"x":1.25, "y":4.5, "w":2.25}, - {"x":3.5, "y":4.5}, - {"x":4.5, "y":4.5}, - {"x":5.5, "y":4.5}, - {"x":6.5, "y":4.5}, - {"x":7.5, "y":4.5}, - {"x":10.25, "y":4.5}, - {"x":11.25, "y":4.5}, - {"x":12.25, "y":4.5}, - {"x":13.25, "y":4.5}, - {"x":14.25, "y":4.5}, - {"x":15.25, "y":4.5}, - {"x":16.25, "y":4.5, "w":1.75}, - {"x":18.25, "y":4.5}, - - {"x":0, "y":5.5}, - {"x":1.25, "y":5.5, "w":1.25}, - {"x":2.5, "y":5.5}, - {"x":3.5, "y":5.5, "w":1.25}, - {"x":4.75, "y":5.5}, - {"x":5.75, "y":5.5}, - {"x":6.75, "y":5.5, "w":1.25}, - {"x":10.5, "y":5.5, "w":1.25}, - {"x":11.75, "y":5.5}, - {"x":12.75, "y":5.5}, - {"x":13.75, "y":5.5}, - {"x":14.75, "y":5.5}, - {"x":15.75, "y":5.5}, - {"x":16.75, "y":5.5, "w":1.25}, - {"x":18.25, "y":5.5} - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/rate/pistachio/rev1/info.json b/keyboards/rate/pistachio/rev1/info.json index c57493f8fe7e..a50ae8b99194 100644 --- a/keyboards/rate/pistachio/rev1/info.json +++ b/keyboards/rate/pistachio/rev1/info.json @@ -6,5 +6,127 @@ "cols": ["F4", "F5", "F6", "F7", "B1", "B3", "B2", "B6", "D3"], "rows": ["D4", "C6", "D7", "E6", "B4", "B5"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1.25, "y": 0}, + + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + {"matrix": [6, 7], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + + {"matrix": [1, 1], "x": 1.25, "y": 1.5}, + {"matrix": [1, 2], "x": 2.25, "y": 1.5}, + {"matrix": [1, 3], "x": 3.25, "y": 1.5}, + {"matrix": [1, 4], "x": 4.25, "y": 1.5}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, + {"matrix": [1, 6], "x": 6.25, "y": 1.5}, + {"matrix": [1, 7], "x": 7.25, "y": 1.5}, + + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 1], "x": 11, "y": 1.5}, + {"matrix": [7, 2], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5}, + {"matrix": [7, 4], "x": 14, "y": 1.5}, + {"matrix": [7, 5], "x": 15, "y": 1.5}, + {"matrix": [7, 6], "x": 16, "y": 1.5}, + {"matrix": [7, 7], "x": 17, "y": 1.5}, + + {"matrix": [7, 8], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + + {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5}, + {"matrix": [2, 2], "x": 2.75, "y": 2.5}, + {"matrix": [2, 3], "x": 3.75, "y": 2.5}, + {"matrix": [2, 4], "x": 4.75, "y": 2.5}, + {"matrix": [2, 5], "x": 5.75, "y": 2.5}, + {"matrix": [2, 6], "x": 6.75, "y": 2.5}, + + {"matrix": [8, 0], "x": 9.5, "y": 2.5}, + {"matrix": [8, 1], "x": 10.5, "y": 2.5}, + {"matrix": [8, 2], "x": 11.5, "y": 2.5}, + {"matrix": [8, 3], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5}, + {"matrix": [8, 5], "x": 14.5, "y": 2.5}, + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + + {"matrix": [8, 8], "x": 18.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + + {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 2], "x": 3, "y": 3.5}, + {"matrix": [3, 3], "x": 4, "y": 3.5}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + {"matrix": [3, 6], "x": 7, "y": 3.5}, + + {"matrix": [9, 0], "x": 9.75, "y": 3.5}, + {"matrix": [9, 1], "x": 10.75, "y": 3.5}, + {"matrix": [9, 2], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5}, + {"matrix": [9, 4], "x": 13.75, "y": 3.5}, + {"matrix": [9, 5], "x": 14.75, "y": 3.5}, + {"matrix": [9, 6], "x": 15.75, "y": 3.5}, + {"matrix": [8, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [9, 7], "x": 18.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4.5}, + {"matrix": [4, 6], "x": 7.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 10.25, "y": 4.5}, + {"matrix": [10, 1], "x": 11.25, "y": 4.5}, + {"matrix": [10, 2], "x": 12.25, "y": 4.5}, + {"matrix": [10, 3], "x": 13.25, "y": 4.5}, + {"matrix": [10, 4], "x": 14.25, "y": 4.5}, + {"matrix": [10, 5], "x": 15.25, "y": 4.5}, + {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75}, + + {"matrix": [10, 7], "x": 18.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5.5}, + {"matrix": [5, 5], "x": 5.75, "y": 5.5}, + {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 1], "x": 11.75, "y": 5.5}, + {"matrix": [11, 2], "x": 12.75, "y": 5.5}, + {"matrix": [11, 3], "x": 13.75, "y": 5.5}, + {"matrix": [11, 4], "x": 14.75, "y": 5.5}, + {"matrix": [11, 5], "x": 15.75, "y": 5.5}, + {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 7], "x": 18.25, "y": 5.5} + ] + } + } } diff --git a/keyboards/rate/pistachio/rev1/rev1.h b/keyboards/rate/pistachio/rev1/rev1.h deleted file mode 100644 index e42de2d2b04e..000000000000 --- a/keyboards/rate/pistachio/rev1/rev1.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2020 rate - -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" - -/* - * ,------------------------------------------------- ---------------------------------------------------------. - * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | | - * |-------------------------------------- ---------- ---------------------------------------------------------+ - * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 | - * |------------------------------------------------- ---------------------------------------------------------+ - * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 | - * |--------------------------------------------- ------------------------------------------- ------+ - * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 | - * |---------------------------------------------- -------------------------------------------------------+ - * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 | - * |----------------------------------------------- -----------------------------------------------------+ - * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 | - * |----------------------------------------------- ---------------------------------------------------- - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \ - L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, KC_NO }, \ - { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \ - { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \ - } diff --git a/keyboards/rate/pistachio/rev2/info.json b/keyboards/rate/pistachio/rev2/info.json index a98938f559ae..690c179151a2 100644 --- a/keyboards/rate/pistachio/rev2/info.json +++ b/keyboards/rate/pistachio/rev2/info.json @@ -6,5 +6,127 @@ "cols": ["B6", "B2", "B3", "B1", "F7", "F6", "F5", "F4", "D3"], "rows": ["B5", "B4", "E6", "D7", "C6", "D4"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 1.25, "y": 0}, + + {"matrix": [0, 1], "x": 2.75, "y": 0}, + {"matrix": [0, 2], "x": 3.75, "y": 0}, + {"matrix": [0, 3], "x": 4.75, "y": 0}, + {"matrix": [0, 4], "x": 5.75, "y": 0}, + + {"matrix": [0, 5], "x": 7.25, "y": 0}, + + {"matrix": [6, 0], "x": 9.5, "y": 0}, + {"matrix": [6, 1], "x": 10.5, "y": 0}, + {"matrix": [6, 2], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + + {"matrix": [6, 4], "x": 14, "y": 0}, + {"matrix": [6, 5], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + {"matrix": [6, 7], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + + {"matrix": [1, 1], "x": 1.25, "y": 1.5}, + {"matrix": [1, 2], "x": 2.25, "y": 1.5}, + {"matrix": [1, 3], "x": 3.25, "y": 1.5}, + {"matrix": [1, 4], "x": 4.25, "y": 1.5}, + {"matrix": [1, 5], "x": 5.25, "y": 1.5}, + {"matrix": [1, 6], "x": 6.25, "y": 1.5}, + {"matrix": [1, 7], "x": 7.25, "y": 1.5}, + + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 1], "x": 11, "y": 1.5}, + {"matrix": [7, 2], "x": 12, "y": 1.5}, + {"matrix": [7, 3], "x": 13, "y": 1.5}, + {"matrix": [7, 4], "x": 14, "y": 1.5}, + {"matrix": [7, 5], "x": 15, "y": 1.5}, + {"matrix": [7, 6], "x": 16, "y": 1.5}, + {"matrix": [7, 7], "x": 17, "y": 1.5}, + + {"matrix": [7, 8], "x": 18.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + + {"matrix": [2, 1], "x": 1.25, "y": 2.5, "w": 1.5}, + {"matrix": [2, 2], "x": 2.75, "y": 2.5}, + {"matrix": [2, 3], "x": 3.75, "y": 2.5}, + {"matrix": [2, 4], "x": 4.75, "y": 2.5}, + {"matrix": [2, 5], "x": 5.75, "y": 2.5}, + {"matrix": [2, 6], "x": 6.75, "y": 2.5}, + + {"matrix": [8, 0], "x": 9.5, "y": 2.5}, + {"matrix": [8, 1], "x": 10.5, "y": 2.5}, + {"matrix": [8, 2], "x": 11.5, "y": 2.5}, + {"matrix": [8, 3], "x": 12.5, "y": 2.5}, + {"matrix": [8, 4], "x": 13.5, "y": 2.5}, + {"matrix": [8, 5], "x": 14.5, "y": 2.5}, + {"matrix": [8, 6], "x": 15.5, "y": 2.5}, + + {"matrix": [8, 7], "x": 18.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + + {"matrix": [3, 1], "x": 1.25, "y": 3.5, "w": 1.75}, + {"matrix": [3, 2], "x": 3, "y": 3.5}, + {"matrix": [3, 3], "x": 4, "y": 3.5}, + {"matrix": [3, 4], "x": 5, "y": 3.5}, + {"matrix": [3, 5], "x": 6, "y": 3.5}, + {"matrix": [3, 6], "x": 7, "y": 3.5}, + + {"matrix": [9, 0], "x": 9.75, "y": 3.5}, + {"matrix": [9, 1], "x": 10.75, "y": 3.5}, + {"matrix": [9, 2], "x": 11.75, "y": 3.5}, + {"matrix": [9, 3], "x": 12.75, "y": 3.5}, + {"matrix": [9, 4], "x": 13.75, "y": 3.5}, + {"matrix": [9, 5], "x": 14.75, "y": 3.5}, + {"matrix": [9, 6], "x": 15.75, "y": 3.5}, + {"matrix": [9, 7], "x": 16.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [9, 8], "x": 18.25, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + + {"matrix": [4, 1], "x": 1.25, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 3.5, "y": 4.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4.5}, + {"matrix": [4, 5], "x": 6.5, "y": 4.5}, + {"matrix": [4, 6], "x": 7.5, "y": 4.5}, + + {"matrix": [10, 0], "x": 10.25, "y": 4.5}, + {"matrix": [10, 1], "x": 11.25, "y": 4.5}, + {"matrix": [10, 2], "x": 12.25, "y": 4.5}, + {"matrix": [10, 3], "x": 13.25, "y": 4.5}, + {"matrix": [10, 4], "x": 14.25, "y": 4.5}, + {"matrix": [10, 5], "x": 15.25, "y": 4.5}, + {"matrix": [10, 6], "x": 16.25, "y": 4.5, "w": 1.75}, + + {"matrix": [10, 7], "x": 18.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 4.75, "y": 5.5}, + {"matrix": [5, 5], "x": 5.75, "y": 5.5}, + {"matrix": [5, 6], "x": 6.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 0], "x": 10.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 1], "x": 11.75, "y": 5.5}, + {"matrix": [11, 2], "x": 12.75, "y": 5.5}, + {"matrix": [11, 3], "x": 13.75, "y": 5.5}, + {"matrix": [11, 4], "x": 14.75, "y": 5.5}, + {"matrix": [11, 5], "x": 15.75, "y": 5.5}, + {"matrix": [11, 6], "x": 16.75, "y": 5.5, "w": 1.25}, + + {"matrix": [11, 7], "x": 18.25, "y": 5.5} + ] + } + } } diff --git a/keyboards/rate/pistachio/rev2/rev2.h b/keyboards/rate/pistachio/rev2/rev2.h deleted file mode 100644 index 750778a30e35..000000000000 --- a/keyboards/rate/pistachio/rev2/rev2.h +++ /dev/null @@ -1,58 +0,0 @@ -/* -Copyright 2020 rate - -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" - -/* - * ,------------------------------------------------- ---------------------------------------------------------. - * | | L00 | | L01 | L02 | L03 | L04 | | L05 | | R00 | R01 | R02 | R03 | | R04 | R05 | R06 | R07 | | - * |-------------------------------------- ---------- ---------------------------------------------------------+ - * | L10 || L11 | L12 | L13 | L14 | L15 | L16 | L17 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 || R18 | - * |------------------------------------------------- ---------------------------------------------------------+ - * | L20 || L21 | L22 | L23 | L24 | L25 | L26 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 || R28 | - * |--------------------------------------------- ------------------------------------------- ------+ - * | L30 || L31 | L32 | L33 | L34 | L35 | L36 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | || R37 | - * |---------------------------------------------- -------------------------------------------------------+ - * | L40 || L41 | L42 | L43 | L44 | L45 | L46 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 || R47 | - * |----------------------------------------------- -----------------------------------------------------+ - * | L50 || L51 | L52 | L53 | L54 | L55 | L56 | | R50 | R51 | R52 | R53 | R54 | R55 | R56 || R57 | - * |----------------------------------------------- ---------------------------------------------------- - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, L16, L17, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R27, R37, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, R47, \ - L50, L51, L52, L53, L54, L55, L56, R50, R51, R52, R53, R54, R55, R56, R57 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, L16, L17, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, L26, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, L56, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, KC_NO }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R28, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36, R27, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47, KC_NO }, \ - { R50, R51, R52, R53, R54, R55, R56, R57, KC_NO } \ - } diff --git a/keyboards/rate/pistachio_mp/info.json b/keyboards/rate/pistachio_mp/info.json index 0aca3a3f8e2c..648be80cd5cb 100644 --- a/keyboards/rate/pistachio_mp/info.json +++ b/keyboards/rate/pistachio_mp/info.json @@ -26,29 +26,29 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Encoder", "x":3, "y":0}, + {"matrix": [1, 3], "x": 3, "y": 0}, - {"label":"Num Lock", "x":0, "y":1.5}, - {"label":"/", "x":1, "y":1.5}, - {"label":"*", "x":2, "y":1.5}, - {"label":"-", "x":3, "y":1.5}, + {"matrix": [0, 0], "x": 0, "y": 1.5}, + {"matrix": [0, 1], "x": 1, "y": 1.5}, + {"matrix": [0, 2], "x": 2, "y": 1.5}, + {"matrix": [0, 3], "x": 3, "y": 1.5}, - {"label":"7", "x":0, "y":2.5}, - {"label":"8", "x":1, "y":2.5}, - {"label":"9", "x":2, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 2.5}, + {"matrix": [1, 1], "x": 1, "y": 2.5}, + {"matrix": [1, 2], "x": 2, "y": 2.5}, - {"label":"4", "x":0, "y":3.5}, - {"label":"5", "x":1, "y":3.5}, - {"label":"6", "x":2, "y":3.5}, - {"label":"+", "x":3, "y":2.5, "h":2}, + {"matrix": [2, 0], "x": 0, "y": 3.5}, + {"matrix": [2, 1], "x": 1, "y": 3.5}, + {"matrix": [2, 2], "x": 2, "y": 3.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5, "h": 2}, - {"label":"1", "x":0, "y":4.5}, - {"label":"2", "x":1, "y":4.5}, - {"label":"3", "x":2, "y":4.5}, + {"matrix": [3, 0], "x": 0, "y": 4.5}, + {"matrix": [3, 1], "x": 1, "y": 4.5}, + {"matrix": [3, 2], "x": 2, "y": 4.5}, - {"label":"0", "x":0, "y":5.5, "w":2}, - {"label":".", "x":2, "y":5.5}, - {"label":"Enter", "x":3, "y":4.5, "h":2} + {"matrix": [4, 0], "x": 0, "y": 5.5, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 5.5}, + {"matrix": [4, 3], "x": 3, "y": 4.5, "h": 2} ] } } diff --git a/keyboards/rate/pistachio_mp/pistachio_mp.h b/keyboards/rate/pistachio_mp/pistachio_mp.h deleted file mode 100644 index d7c5c9bad93d..000000000000 --- a/keyboards/rate/pistachio_mp/pistachio_mp.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2020 rate - * - * 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" - -/* - * ,------------------------ - * | K07 | - * |------------------------ - * | K00 | K01 | K02 | K03 | - * |------------------------ - * | K04 | K05 | K06 | | - * |------------------ K11 - - * | K08 | K09 | K10 | | - * |------------------------ - * | K12 | K13 | K14 | | - * |------------------ K17 - - * | K15 | K16 | | - * |------------------------ - */ -#define LAYOUT( \ - K07, \ - K00, K01, K02, K03, \ - K04, K05, K06, \ - K08, K09, K10, K11, \ - K12, K13, K14, \ - K15, K16, K17 ) { \ - { K00, K01, K02, K03 }, \ - { K04, K05, K06, K07 }, \ - { K08, K09, K10, K11 }, \ - { K12, K13, K14, KC_NO }, \ - { K15, KC_NO, K16, K17 }, \ -} diff --git a/keyboards/rate/pistachio_pro/info.json b/keyboards/rate/pistachio_pro/info.json index 743ff18155ef..cf0218b050fd 100644 --- a/keyboards/rate/pistachio_pro/info.json +++ b/keyboards/rate/pistachio_pro/info.json @@ -18,101 +18,109 @@ "layouts": { "LAYOUT": { "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":"Pause", "x":17.25, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"label":"E/J", "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":"|", "x":13, "y":1.5}, - {"label":"BS", "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}, + {"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.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":"Delete", "x":15.25, "y":2.5}, - {"label":"End", "x":16.25, "y":2.5}, - {"label":"PgDn", "x":17.25, "y":2.5}, + {"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.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":"}", "x":12.75, "y":3.5}, - {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2}, + {"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.5, "w":2.25}, - {"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":"_", "x":12.25, "y":4.5}, - {"label":"Shift", "x":13.25, "y":4.5, "w":1.75}, - {"label":"\u2191", "x":16.25, "y":4.5}, + {"matrix": [0, 13], "x": 17.25, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.5}, - {"label":"Alt", "x":2.25, "y":5.5, "w":1.25}, - {"x":3.5, "y":5.5}, - {"x":4.5, "y":5.5, "w":2.25}, - {"x":6.75, "y":5.5, "w":2.25}, - {"label":"kana", "x":9, "y":5.5, "w":1.25}, - {"x":10.25, "y":5.5, "w":1.25}, - {"label":"Alt", "x":11.5, "y":5.5, "w":1.25}, - {"label":"Menu", "x":12.75, "y":5.5}, - {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, - {"label":"\u2190", "x":15.25, "y":5.5}, - {"label":"\u2193", "x":16.25, "y":5.5}, - {"label":"\u2192", "x":17.25, "y":5.5} + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [1, 14], "x": 14, "y": 1.5}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.5}, + {"matrix": [1, 16], "x": 16.25, "y": 1.5}, + {"matrix": [1, 17], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + + {"matrix": [2, 13], "x": 15.25, "y": 2.5}, + {"matrix": [2, 14], "x": 16.25, "y": 2.5}, + {"matrix": [2, 15], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5}, + {"matrix": [4, 12], "x": 13.25, "y": 4.5, "w": 1.75}, + + {"matrix": [4, 13], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5}, + {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.5, "y": 5.5}, + {"matrix": [5, 4], "x": 4.5, "y": 5.5, "w": 2.25}, + {"matrix": [5, 5], "x": 6.75, "y": 5.5, "w": 2.25}, + {"matrix": [5, 6], "x": 9, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 10.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 11.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 9], "x": 12.75, "y": 5.5}, + {"matrix": [5, 10], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 15.25, "y": 5.5}, + {"matrix": [5, 12], "x": 16.25, "y": 5.5}, + {"matrix": [5, 13], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/rate/pistachio_pro/pistachio_pro.h b/keyboards/rate/pistachio_pro/pistachio_pro.h deleted file mode 100644 index 42de95ea8799..000000000000 --- a/keyboards/rate/pistachio_pro/pistachio_pro.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 rate - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, \ - k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513 ) { \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, k116, k117 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, KC_NO, KC_NO }, \ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k400, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { k500, k501, k502, k503, k504, k505, k506, k507, k508, k509, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/recompile_keys/choco60/choco60.h b/keyboards/recompile_keys/choco60/choco60.h deleted file mode 100644 index fedcf942bfd5..000000000000 --- a/keyboards/recompile_keys/choco60/choco60.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2019 Naoto Takai - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L43, R40, R41, R43, R44 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \ - { L40, L41, KC_NO, L43, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, R26, KC_NO, KC_NO }, \ - { R30, R31, R32, R33, R34, R35, R36, KC_NO, KC_NO }, \ - { R40, R41, KC_NO, R43, R44, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/recompile_keys/choco60/info.json b/keyboards/recompile_keys/choco60/info.json index 17ab7eadb2f6..891cc73796c8 100644 --- a/keyboards/recompile_keys/choco60/info.json +++ b/keyboards/recompile_keys/choco60/info.json @@ -8,9 +8,81 @@ "pid": "0x4362", "device_version": "0.0.1" }, - "layouts": { + "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":7, "y":0}, {"label":"&", "x":8, "y":0}, {"label":"*", "x":9, "y":0}, {"label":"(", "x":10, "y":0}, {"label":")", "x":11, "y":0}, {"label":"_", "x":12, "y":0}, {"label":"+", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"~", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":7.5, "y":1}, {"label":"U", "x":8.5, "y":1}, {"label":"I", "x":9.5, "y":1}, {"label":"O", "x":10.5, "y":1}, {"label":"P", "x":11.5, "y":1}, {"label":"{", "x":12.5, "y":1}, {"label":"}", "x":13.5, "y":1}, {"label":"Delete", "x":14.5, "y":1, "w":1.5}, {"label":"Control", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":7.75, "y":2}, {"label":"J", "x":8.75, "y":2}, {"label":"K", "x":9.75, "y":2}, {"label":"L", "x":10.75, "y":2}, {"label":":", "x":11.75, "y":2}, {"label":"\"", "x":12.75, "y":2}, {"label":"Return", "x":13.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":8.25, "y":3}, {"label":"M", "x":9.25, "y":3}, {"label":"<", "x":10.25, "y":3}, {"label":">", "x":11.25, "y":3}, {"label":"?", "x":12.25, "y":3}, {"label":"Shift", "x":13.25, "y":3, "w":1.75}, {"label":"Fn", "x":15, "y":3}, {"label":"Opt", "x":1.5, "y":4}, {"label":"\u2318", "x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":2.75}, {"label":"Opt", "x":7.75, "y":4}, {"x":8.75, "y":4, "w":2.25}, {"label":"\u2318", "x":11, "y":4, "w":1.5}, {"label":"Ctrl", "x":12.5, "y":4}] + "layout": [ + {"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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + {"matrix": [5, 7], "x": 14, "y": 0}, + {"matrix": [5, 8], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 5], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 1.5, "y": 4}, + {"matrix": [4, 1], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2.75}, + + {"matrix": [9, 0], "x": 7.75, "y": 4}, + {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 2.25}, + {"matrix": [9, 3], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 12.5, "y": 4} + ] } } } diff --git a/keyboards/recompile_keys/cocoa40/cocoa40.h b/keyboards/recompile_keys/cocoa40/cocoa40.h deleted file mode 100644 index a468a75ef2c8..000000000000 --- a/keyboards/recompile_keys/cocoa40/cocoa40.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2019 'Naoto Takai' - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \ - L31, L32, L33, R30, R32, R33 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { KC_NO, L31, L32, L33, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, KC_NO }, \ - { R20, R21, R22, R23, R24, R25, R26, KC_NO }, \ - { R30, KC_NO, R32, R33, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/recompile_keys/cocoa40/info.json b/keyboards/recompile_keys/cocoa40/info.json index b72f109cf620..76a9302eff12 100644 --- a/keyboards/recompile_keys/cocoa40/info.json +++ b/keyboards/recompile_keys/cocoa40/info.json @@ -20,7 +20,61 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":7.25, "y":0}, {"label":"U", "x":8.25, "y":0}, {"label":"I", "x":9.25, "y":0}, {"label":"O", "x":10.25, "y":0}, {"label":"P", "x":11.25, "y":0}, {"label":"{", "x":12.25, "y":0}, {"label":"}", "x":13.25, "y":0}, {"label":"Back
Space", "x":14.25, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":7.5, "y":1}, {"label":"J", "x":8.5, "y":1}, {"label":"K", "x":9.5, "y":1}, {"label":"L", "x":10.5, "y":1}, {"label":":", "x":11.5, "y":1}, {"label":"\"", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":8, "y":2}, {"label":"M", "x":9, "y":2}, {"label":"<", "x":10, "y":2}, {"label":">", "x":11, "y":2}, {"label":"?", "x":12, "y":2}, {"label":"Shift", "x":13, "y":2, "w":1.25}, {"label":"Fn", "x":14.25, "y":2}, {"label":"Opt", "x":1.5, "y":3}, {"label":"Command", "x":2.5, "y":3, "w":1.5}, {"label":"", "x":4, "y":3, "w":2.25}, {"label":"", "x":7.5, "y":3, "w":2.75}, {"label":"Command", "x":10.25, "y":3, "w":1.5}, {"label":"Opt", "x":11.75, "y":3}] + "layout": [ + {"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": [4, 0], "x": 7.25, "y": 0}, + {"matrix": [4, 1], "x": 8.25, "y": 0}, + {"matrix": [4, 2], "x": 9.25, "y": 0}, + {"matrix": [4, 3], "x": 10.25, "y": 0}, + {"matrix": [4, 4], "x": 11.25, "y": 0}, + {"matrix": [4, 5], "x": 12.25, "y": 0}, + {"matrix": [4, 6], "x": 13.25, "y": 0}, + {"matrix": [4, 7], "x": 14.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [5, 0], "x": 7.5, "y": 1}, + {"matrix": [5, 1], "x": 8.5, "y": 1}, + {"matrix": [5, 2], "x": 9.5, "y": 1}, + {"matrix": [5, 3], "x": 10.5, "y": 1}, + {"matrix": [5, 4], "x": 11.5, "y": 1}, + {"matrix": [5, 5], "x": 12.5, "y": 1}, + {"matrix": [5, 6], "x": 13.5, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [6, 0], "x": 8, "y": 2}, + {"matrix": [6, 1], "x": 9, "y": 2}, + {"matrix": [6, 2], "x": 10, "y": 2}, + {"matrix": [6, 3], "x": 11, "y": 2}, + {"matrix": [6, 4], "x": 12, "y": 2}, + {"matrix": [6, 5], "x": 13, "y": 2, "w": 1.25}, + {"matrix": [6, 6], "x": 14.25, "y": 2}, + + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25}, + + {"matrix": [7, 0], "x": 7.5, "y": 3, "w": 2.75}, + {"matrix": [7, 2], "x": 10.25, "y": 3, "w": 1.5}, + {"matrix": [7, 3], "x": 11.75, "y": 3} + ] } } } diff --git a/keyboards/recompile_keys/mio/info.json b/keyboards/recompile_keys/mio/info.json index 8843ad573929..450cf1c3b0bf 100644 --- a/keyboards/recompile_keys/mio/info.json +++ b/keyboards/recompile_keys/mio/info.json @@ -21,47 +21,54 @@ "layouts": { "LAYOUT": { "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.25, "y": 0 }, - {"label": "F6", "x": 7.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": "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": "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": "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": "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": 1.5 }, - {"x": 5.5, "y": 5.25, "w": 2.75 }, - {"x": 7, "y": 6.5, "w": 1.25 } + {"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.25, "y": 0}, + {"matrix": [0, 7], "x": 7.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": [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": [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": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 1], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 4, "y": 5.25, "w": 1.5}, + {"matrix": [5, 5], "x": 5.5, "y": 5.25, "w": 2.75}, + {"matrix": [5, 6], "x": 7, "y": 6.5, "w": 1.25} ] } } diff --git a/keyboards/recompile_keys/mio/mio.h b/keyboards/recompile_keys/mio/mio.h deleted file mode 100644 index da6dc3229c3d..000000000000 --- a/keyboards/recompile_keys/mio/mio.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2021 recompile keys - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K002, K003, K004, K005, K006, K007, \ - K100, K101, K102, K103, K104, K105, K106, K107, \ - K200, K201, K202, K203, K204, K205, K206, \ - K300, K301, K302, K303, K304, K305, K306, \ - K400, K401, K402, K403, K404, K405, K406, \ - K500, K501, K502, K505, K506 \ -) \ -{ \ - { K000, KC_NO, K002, K003, K004, K005, K006, K007 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107 }, \ - { K200, K201, K202, K203, K204, K205, K206, KC_NO }, \ - { K300, K301, K302, K303, K304, K305, K306, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, KC_NO }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, K506, KC_NO }, \ -} diff --git a/keyboards/recompile_keys/nomu30/info.json b/keyboards/recompile_keys/nomu30/info.json index 7fa6be0d39ca..3753b3cb1284 100644 --- a/keyboards/recompile_keys/nomu30/info.json +++ b/keyboards/recompile_keys/nomu30/info.json @@ -14,165 +14,39 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Q", - "x": 0.5, - "y": 0 - }, - { - "label": "W", - "x": 1.5, - "y": 0 - }, - { - "label": "E", - "x": 2.5, - "y": 0 - }, - { - "label": "R", - "x": 3.5, - "y": 0 - }, - { - "label": "T", - "x": 4.5, - "y": 0 - }, - { - "label": "Y", - "x": 5.5, - "y": 0 - }, - { - "label": "U", - "x": 6.5, - "y": 0 - }, - { - "label": "I", - "x": 7.5, - "y": 0 - }, - { - "label": "O", - "x": 8.5, - "y": 0 - }, - { - "label": "P", - "x": 9.5, - "y": 0 - }, - { - "label": "Del", - "x": 10.5, - "y": 0 - }, - { - "label": "|", - "x": 0, - "y": 1 - }, - { - "label": "A", - "x": 1, - "y": 1 - }, - { - "label": "S", - "x": 2, - "y": 1 - }, - { - "label": "D", - "x": 3, - "y": 1 - }, - { - "label": "F", - "x": 4, - "y": 1 - }, - { - "label": "G", - "x": 5, - "y": 1 - }, - { - "label": "H", - "x": 6, - "y": 1 - }, - { - "label": "J", - "x": 7, - "y": 1 - }, - { - "label": "K", - "x": 8, - "y": 1 - }, - { - "label": "L", - "x": 9, - "y": 1 - }, - { - "label": "Enter", - "x": 10.25, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "Control", - "x": 0, - "y": 2, - "w": 1.5 - }, - { - "label": "Z", - "x": 1.5, - "y": 2 - }, - { - "label": "X", - "x": 2.5, - "y": 2 - }, - { - "label": "C", - "x": 3.5, - "y": 2 - }, - { - "label": "V", - "x": 4.5, - "y": 2 - }, - { - "label": "B", - "x": 5.5, - "y": 2 - }, - { - "label": "N", - "x": 6.5, - "y": 2 - }, - { - "label": "M", - "x": 7.5, - "y": 2 - }, - { - "label": "Shift", - "x": 8.5, - "y": 2, - "w": 1.75 - } + {"matrix": [0, 1], "x": 0.5, "y": 0}, + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + {"matrix": [0, 11], "x": 10.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2, "w": 1.75} ] } } diff --git a/keyboards/recompile_keys/nomu30/nomu30.h b/keyboards/recompile_keys/nomu30/nomu30.h deleted file mode 100644 index 1b33c17be12e..000000000000 --- a/keyboards/recompile_keys/nomu30/nomu30.h +++ /dev/null @@ -1,29 +0,0 @@ -/* Copyright 2019 Naoto Takai - * - * 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( \ - K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208 \ -) \ -{ \ - { KC_NO, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/redox/rev1/info.json b/keyboards/redox/rev1/info.json index bceac88bb086..908404466a98 100644 --- a/keyboards/redox/rev1/info.json +++ b/keyboards/redox/rev1/info.json @@ -11,89 +11,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"_Nav || `", "x":0, "y":0.375, "w":1.25}, - {"label":"1", "x":1.25, "y":0.375}, - {"label":"2", "x":2.25, "y":0.125}, - {"label":"3", "x":3.25, "y":0}, - {"label":"4", "x":4.25, "y":0.125}, - {"label":"5", "x":5.25, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0.375}, + {"matrix": [0, 2], "x": 2.25, "y": 0.125}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0.125}, + {"matrix": [0, 5], "x": 5.25, "y": 0.25}, - {"label":"6", "x":12.25, "y":0.25}, - {"label":"7", "x":13.25, "y":0.125}, - {"label":"8", "x":14.25, "y":0}, - {"label":"9", "x":15.25, "y":0.125}, - {"label":"0", "x":16.25, "y":0.375}, - {"label":"_Nav || -", "x":17.25, "y":0.375, "w":1.25}, + {"matrix": [5, 5], "x": 12.25, "y": 0.25}, + {"matrix": [5, 4], "x": 13.25, "y": 0.125}, + {"matrix": [5, 3], "x": 14.25, "y": 0}, + {"matrix": [5, 2], "x": 15.25, "y": 0.125}, + {"matrix": [5, 1], "x": 16.25, "y": 0.375}, + {"matrix": [5, 0], "x": 17.25, "y": 0.375, "w": 1.25}, - {"label":"Tab", "x":0, "y":1.375, "w":1.25}, - {"label":"Q", "x":1.25, "y":1.375}, - {"label":"W", "x":2.25, "y":1.125}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1.125}, - {"label":"T", "x":5.25, "y":1.25}, - {"label":"MO(_SYMB)", "x":6.25, "y":0.75}, + {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1.375}, + {"matrix": [1, 2], "x": 2.25, "y": 1.125}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1.125}, + {"matrix": [1, 5], "x": 5.25, "y": 1.25}, + {"matrix": [0, 6], "x": 6.25, "y": 0.75}, - {"label":"MO(_SYMB)", "x":11.25, "y":0.75}, - {"label":"Y", "x":12.25, "y":1.25}, - {"label":"U", "x":13.25, "y":1.125}, - {"label":"I", "x":14.25, "y":1}, - {"label":"O", "x":15.25, "y":1.125}, - {"label":"P", "x":16.25, "y":1.375}, - {"label":"=", "x":17.25, "y":1.375, "w":1.25}, + {"matrix": [5, 6], "x": 11.25, "y": 0.75}, + {"matrix": [6, 5], "x": 12.25, "y": 1.25}, + {"matrix": [6, 4], "x": 13.25, "y": 1.125}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.125}, + {"matrix": [6, 1], "x": 16.25, "y": 1.375}, + {"matrix": [6, 0], "x": 17.25, "y": 1.375, "w": 1.25}, - {"label":"Esc", "x":0, "y":2.375, "w":1.25}, - {"label":"A", "x":1.25, "y":2.375}, - {"label":"S", "x":2.25, "y":2.125}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2.125}, - {"label":"G", "x":5.25, "y":2.25}, - {"label":"[", "x":6.25, "y":1.75, "h":1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.375}, + {"matrix": [2, 2], "x": 2.25, "y": 2.125}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2.125}, + {"matrix": [2, 5], "x": 5.25, "y": 2.25}, + {"matrix": [1, 6], "x": 6.25, "y": 1.75, "h": 1.5}, - {"label":"]", "x":11.25, "y":1.75, "h":1.5}, - {"label":"H", "x":12.25, "y":2.25}, - {"label":"J", "x":13.25, "y":2.125}, - {"label":"K", "x":14.25, "y":2}, - {"label":"L", "x":15.25, "y":2.125}, - {"label":";", "x":16.25, "y":2.375}, - {"label":"'", "x":17.25, "y":2.375, "w":1.25}, + {"matrix": [6, 6], "x": 11.25, "y": 1.75, "h": 1.5}, + {"matrix": [7, 5], "x": 12.25, "y": 2.25}, + {"matrix": [7, 4], "x": 13.25, "y": 2.125}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.125}, + {"matrix": [7, 1], "x": 16.25, "y": 2.375}, + {"matrix": [7, 0], "x": 17.25, "y": 2.375, "w": 1.25}, - {"label":"Shift", "x":0, "y":3.375, "w":1.25}, - {"label":"Z", "x":1.25, "y":3.375}, - {"label":"X", "x":2.25, "y":3.125}, - {"label":"C", "x":3.25, "y":3}, - {"label":"V", "x":4.25, "y":3.125}, - {"label":"B", "x":5.25, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.375}, + {"matrix": [3, 2], "x": 2.25, "y": 3.125}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3.125}, + {"matrix": [3, 5], "x": 5.25, "y": 3.25}, + {"matrix": [2, 6], "x": 6.75, "y": 3.75}, + {"matrix": [3, 6], "x": 7.75, "y": 3.75}, - {"label":"_Adjust/Page Up", "x":6.75, "y":3.75}, - {"label":"Page Down", "x":7.75, "y":3.75}, + {"matrix": [8, 6], "x": 9.75, "y": 3.75}, + {"matrix": [7, 6], "x": 10.75, "y": 3.75}, + {"matrix": [8, 5], "x": 12.25, "y": 3.25}, + {"matrix": [8, 4], "x": 13.25, "y": 3.125}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.125}, + {"matrix": [8, 1], "x": 16.25, "y": 3.375}, + {"matrix": [8, 0], "x": 17.25, "y": 3.375, "w": 1.25}, - {"label":"Home", "x":9.75, "y":3.75}, - {"label":"_Adjust/End", "x":10.75, "y":3.75}, + {"matrix": [4, 0], "x": 0.25, "y": 4.375}, + {"matrix": [4, 1], "x": 1.25, "y": 4.375}, + {"matrix": [4, 2], "x": 2.25, "y": 4.125}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 5.5, "y": 5.25, "w": 1.25}, + {"matrix": [4, 5], "x": 6.75, "y": 4.75, "h": 1.5}, + {"matrix": [4, 6], "x": 7.75, "y": 4.75, "h": 1.5}, - {"label":"N", "x":12.25, "y":3.25}, - {"label":"M", "x":13.25, "y":3.125}, - {"label":",", "x":14.25, "y":3}, - {"label":",", "x":15.25, "y":3.125}, - {"label":"\\", "x":16.25, "y":3.375}, - {"label":"Shift", "x":17.25, "y":3.375, "w":1.25}, - - {"label":"LGUI", "x":0.25, "y":4.375}, - {"label":"P+", "x":1.25, "y":4.375}, - {"label":"P-", "x":2.25, "y":4.125}, - {"label":"LAlt || P*", "x":3.25, "y":4}, - - {"label":"LCtrl || P/", "x":5.5, "y":5.25, "w":1.25}, - {"label":"Backspace", "x":6.75, "y":4.75, "h":1.5}, - {"label":"Delete", "x":7.75, "y":4.75, "h":1.5}, - - {"label":"Enter", "x":9.75, "y":4.75, "h":1.5}, - {"label":"Space", "x":10.75, "y":4.75, "h":1.5}, - {"label":"RAlt", "x":11.75, "y":5.25, "w":1.25}, - - {"label":"Left", "x":14.25, "y":4}, - {"label":"Down", "x":15.25, "y":4.125}, - {"label":"Up", "x":16.25, "y":4.375}, - {"label":"Right", "x":17.25, "y":4.375} + {"matrix": [9, 6], "x": 9.75, "y": 4.75, "h": 1.5}, + {"matrix": [9, 5], "x": 10.75, "y": 4.75, "h": 1.5}, + {"matrix": [9, 4], "x": 11.75, "y": 5.25, "w": 1.25}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.125}, + {"matrix": [9, 1], "x": 16.25, "y": 4.375}, + {"matrix": [9, 0], "x": 17.25, "y": 4.375} ] } } diff --git a/keyboards/redox/rev1/rev1.h b/keyboards/redox/rev1/rev1.h deleted file mode 100644 index 4ad423d897ef..000000000000 --- a/keyboards/redox/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k08, k09, k10, k11, k12, k13, \ - k14, k15, k16, k17, k18, k19, k06, k07, k22, k23, k24, k25, k26, k27, \ - k28, k29, k30, k31, k32, k33, k20, k21, k36, k37, k38, k39, k40, k41, \ - k42, k43, k44, k45, k46, k47, k34, k48, k49, k35, k50, k51, k52, k53, k54, k55, \ - k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k14, k15, k16, k17, k18, k19, k20 }, \ - { k28, k29, k30, k31, k32, k33, k34 }, \ - { k42, k43, k44, k45, k46, k47, k48 }, \ - { k56, k57, k58, k59, k60, k61, k62 }, \ - { k13, k12, k11, k10, k09, k08, k07 }, \ - { k27, k26, k25, k24, k23, k22, k21 }, \ - { k41, k40, k39, k38, k37, k36, k35 }, \ - { k55, k54, k53, k52, k51, k50, k49 }, \ - { k69, k68, k67, k66, k65, k64, k63 } \ -} diff --git a/keyboards/redox_media/info.json b/keyboards/redox_media/info.json index ca90fcc2d248..12e8f089b59a 100644 --- a/keyboards/redox_media/info.json +++ b/keyboards/redox_media/info.json @@ -26,84 +26,90 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Mute", "x":5.25, "y":0.15}, - {"label":"Play", "x":12.25, "y":0.15}, - {"label":"Next", "x":13.5, "y":0}, + {"matrix": [5, 6], "x": 5.25, "y": 0.15}, - {"label":"_Nav || `", "x":0, "y":1.375, "w":1.25}, - {"label":"1", "x":1.25, "y":1.375}, - {"label":"2", "x":2.25, "y":1.125}, - {"label":"3", "x":3.25, "y":1}, - {"label":"4", "x":4.25, "y":1.125}, - {"label":"5", "x":5.25, "y":1.25}, - {"label":"6", "x":12.25, "y":1.25}, - {"label":"7", "x":13.25, "y":1.125}, - {"label":"8", "x":14.25, "y":1}, - {"label":"9", "x":15.25, "y":1.125}, - {"label":"0", "x":16.25, "y":1.375}, - {"label":"_Nav || -", "x":17.25, "y":1.375, "w":1.25}, + {"matrix": [11, 6], "x": 12.25, "y": 0.15}, + {"matrix": [11, 5], "x": 13.5, "y": 0}, - {"label":"Tab", "x":0, "y":2.375, "w":1.25}, - {"label":"Q", "x":1.25, "y":2.375}, - {"label":"W", "x":2.25, "y":2.125}, - {"label":"E", "x":3.25, "y":2}, - {"label":"R", "x":4.25, "y":2.125}, - {"label":"T", "x":5.25, "y":2.25}, - {"label":"MO(_SYMB)", "x":6.25, "y":1.75}, - {"label":"MO(_SYMB)", "x":11.25, "y":1.75}, - {"label":"Y", "x":12.25, "y":2.25}, - {"label":"U", "x":13.25, "y":2.125}, - {"label":"I", "x":14.25, "y":2}, - {"label":"O", "x":15.25, "y":2.125}, - {"label":"P", "x":16.25, "y":2.375}, - {"label":"=", "x":17.25, "y":2.375, "w":1.25}, + {"matrix": [0, 0], "x": 0, "y": 1.375, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 1.375}, + {"matrix": [0, 2], "x": 2.25, "y": 1.125}, + {"matrix": [0, 3], "x": 3.25, "y": 1}, + {"matrix": [0, 4], "x": 4.25, "y": 1.125}, + {"matrix": [0, 5], "x": 5.25, "y": 1.25}, - {"label":"Esc", "x":0, "y":3.375, "w":1.25}, - {"label":"A", "x":1.25, "y":3.375}, - {"label":"S", "x":2.25, "y":3.125}, - {"label":"D", "x":3.25, "y":3}, - {"label":"F", "x":4.25, "y":3.125}, - {"label":"G", "x":5.25, "y":3.25}, - {"label":"[", "x":6.25, "y":3}, - {"label":"]", "x":11.25, "y":3}, - {"label":"H", "x":12.25, "y":3.25}, - {"label":"J", "x":13.25, "y":3.125}, - {"label":"K", "x":14.25, "y":3}, - {"label":"L", "x":15.25, "y":3.125}, - {"label":";", "x":16.25, "y":3.375}, - {"label":"'", "x":17.25, "y":3.375, "w":1.25}, + {"matrix": [6, 5], "x": 12.25, "y": 1.25}, + {"matrix": [6, 4], "x": 13.25, "y": 1.125}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 2], "x": 15.25, "y": 1.125}, + {"matrix": [6, 1], "x": 16.25, "y": 1.375}, + {"matrix": [6, 0], "x": 17.25, "y": 1.375, "w": 1.25}, - {"label":"Shift", "x":0, "y":4.375, "w":1.25}, - {"label":"Z", "x":1.25, "y":4.375}, - {"label":"X", "x":2.25, "y":4.125}, - {"label":"C", "x":3.25, "y":4}, - {"label":"V", "x":4.25, "y":4.125}, - {"label":"B", "x":5.25, "y":4.25}, - {"label":"_Adjust/Page Up", "x":6.75, "y":4.75}, - {"label":"Page Down", "x":7.75, "y":4.75}, - {"label":"Home", "x":9.75, "y":4.75}, - {"label":"_Adjust/End", "x":10.75, "y":4.75}, - {"label":"N", "x":12.25, "y":4.25}, - {"label":"M", "x":13.25, "y":4.125}, - {"label":",", "x":14.25, "y":4}, - {"label":",", "x":15.25, "y":4.125}, - {"label":"\\", "x":16.25, "y":4.375}, - {"label":"Shift", "x":17.25, "y":4.375, "w":1.25}, + {"matrix": [1, 0], "x": 0, "y": 2.375, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 2.375}, + {"matrix": [1, 2], "x": 2.25, "y": 2.125}, + {"matrix": [1, 3], "x": 3.25, "y": 2}, + {"matrix": [1, 4], "x": 4.25, "y": 2.125}, + {"matrix": [1, 5], "x": 5.25, "y": 2.25}, + {"matrix": [0, 6], "x": 6.25, "y": 1.75}, - {"label":"LGUI", "x":0.25, "y":5.375}, - {"label":"P+", "x":1.25, "y":5.375}, - {"label":"P-", "x":2.25, "y":5.125}, - {"label":"LAlt || P*", "x":3.25, "y":5}, - {"label":"LCtrl || P/", "x":5.5, "y":6.25, "w":1.25}, - {"label":"Backspace", "x":6.75, "y":5.75, "h":1.5}, - {"label":"Delete", "x":7.75, "y":5.75, "h":1.5}, - {"label":"Enter", "x":9.75, "y":5.75, "h":1.5}, - {"label":"Space", "x":10.75, "y":5.75, "h":1.5}, - {"label":"RAlt", "x":11.75, "y":6.25, "w":1.25}, - {"label":"Left", "x":14.25, "y":5}, - {"label":"Down", "x":15.25, "y":5.125}, - {"label":"Up", "x":16.25, "y":5.375}, - {"label":"Right", "x":17.25, "y":5.375} + {"matrix": [6, 6], "x": 11.25, "y": 1.75}, + {"matrix": [7, 5], "x": 12.25, "y": 2.25}, + {"matrix": [7, 4], "x": 13.25, "y": 2.125}, + {"matrix": [7, 3], "x": 14.25, "y": 2}, + {"matrix": [7, 2], "x": 15.25, "y": 2.125}, + {"matrix": [7, 1], "x": 16.25, "y": 2.375}, + {"matrix": [7, 0], "x": 17.25, "y": 2.375, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 3.375, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 3.375}, + {"matrix": [2, 2], "x": 2.25, "y": 3.125}, + {"matrix": [2, 3], "x": 3.25, "y": 3}, + {"matrix": [2, 4], "x": 4.25, "y": 3.125}, + {"matrix": [2, 5], "x": 5.25, "y": 3.25}, + {"matrix": [1, 6], "x": 6.25, "y": 3}, + + {"matrix": [7, 6], "x": 11.25, "y": 3}, + {"matrix": [8, 5], "x": 12.25, "y": 3.25}, + {"matrix": [8, 4], "x": 13.25, "y": 3.125}, + {"matrix": [8, 3], "x": 14.25, "y": 3}, + {"matrix": [8, 2], "x": 15.25, "y": 3.125}, + {"matrix": [8, 1], "x": 16.25, "y": 3.375}, + {"matrix": [8, 0], "x": 17.25, "y": 3.375, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 4.375, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 4.375}, + {"matrix": [3, 2], "x": 2.25, "y": 4.125}, + {"matrix": [3, 3], "x": 3.25, "y": 4}, + {"matrix": [3, 4], "x": 4.25, "y": 4.125}, + {"matrix": [3, 5], "x": 5.25, "y": 4.25}, + {"matrix": [2, 6], "x": 6.75, "y": 4.75}, + {"matrix": [3, 6], "x": 7.75, "y": 4.75}, + + {"matrix": [9, 6], "x": 9.75, "y": 4.75}, + {"matrix": [8, 6], "x": 10.75, "y": 4.75}, + {"matrix": [9, 5], "x": 12.25, "y": 4.25}, + {"matrix": [9, 4], "x": 13.25, "y": 4.125}, + {"matrix": [9, 3], "x": 14.25, "y": 4}, + {"matrix": [9, 2], "x": 15.25, "y": 4.125}, + {"matrix": [9, 1], "x": 16.25, "y": 4.375}, + {"matrix": [9, 0], "x": 17.25, "y": 4.375, "w": 1.25}, + + {"matrix": [4, 0], "x": 0.25, "y": 5.375}, + {"matrix": [4, 1], "x": 1.25, "y": 5.375}, + {"matrix": [4, 2], "x": 2.25, "y": 5.125}, + {"matrix": [4, 3], "x": 3.25, "y": 5}, + {"matrix": [4, 4], "x": 5.5, "y": 6.25, "w": 1.25}, + {"matrix": [4, 5], "x": 6.75, "y": 5.75, "h": 1.5}, + {"matrix": [4, 6], "x": 7.75, "y": 5.75, "h": 1.5}, + + {"matrix": [10, 6], "x": 9.75, "y": 5.75, "h": 1.5}, + {"matrix": [10, 5], "x": 10.75, "y": 5.75, "h": 1.5}, + {"matrix": [10, 4], "x": 11.75, "y": 6.25, "w": 1.25}, + {"matrix": [10, 3], "x": 14.25, "y": 5}, + {"matrix": [10, 2], "x": 15.25, "y": 5.125}, + {"matrix": [10, 1], "x": 16.25, "y": 5.375}, + {"matrix": [10, 0], "x": 17.25, "y": 5.375} ] } } diff --git a/keyboards/redox_media/redox_media.c b/keyboards/redox_media/redox_media.c index ca5a70dd490a..e3a83c6c2d8e 100644 --- a/keyboards/redox_media/redox_media.c +++ b/keyboards/redox_media/redox_media.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 "redox_media.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { diff --git a/keyboards/redox_media/redox_media.h b/keyboards/redox_media/redox_media.h deleted file mode 100644 index 8cd13c63f2f2..000000000000 --- a/keyboards/redox_media/redox_media.h +++ /dev/null @@ -1,69 +0,0 @@ -/* -Copyright 2021 Shiftux - -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 XXX KC_NO - -/* - * ┌───┐ ┌───┐┌───┐ - * │56 │ │B6 ││B5 │ - * └───┘ └───┘└───┘ - * ┌───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┐ - * │00 │01 │02 │03 │04 │05 │ │65 │64 │63 │62 │61 │60 │ - * ├───┼───┼───┼───┼───┼───┼───┐ ┌───┼───┼───┼───┼───┼───┼───┤ - * │10 │11 │12 │13 │14 │15 │06 │ │66 │75 │74 │73 │72 │71 │70 │ - * ├───┼───┼───┼───┼───┼───┼───┤ ├───┼───┼───┼───┼───┼───┼───┤ - * │20 │21 │22 │23 │24 │25 │16 │ │76 │85 │84 │83 │82 │81 │80 │ - * ├───┼───┼───┼───┼───┼───┼───┘ └───┼───┼───┼───┼───┼───┼───┤ - * │30 │31 │32 │33 │34 │35 │ ┌───┬───┐ ┌───┬───┐ │95 │94 │93 │92 │91 │90 │ - * ├───┼───┼───┼───┼───┴───┘ │26 │36 │ │96 │86 │ └───┴───┼───┼───┼───┼───┤ - * │40 │41 │42 │43 │ ├───┼───┤ ├───┼───┤ │A3 │A2 │A1 │A0 │ - * └───┴───┴───┴───┘ ┌────┤ │ │ │ │ ├────┐ └───┴───┴───┴───┘ - * │44 │45 │46 │ │A6 │A5 │A4 │ - * └────┴───┴───┘ └───┴───┴────┘ - * - * - */ - -// rows are doubled -// clang-format off -#define LAYOUT( \ - K56, KB6, KB5, \ - K00, K01, K02, K03, K04, K05, K65, K64, K63, K62, K61, K60, \ - K10, K11, K12, K13, K14, K15, K06, K66, K75, K74, K73, K72, K71, K70, \ - K20, K21, K22, K23, K24, K25, K16, K76, K85, K84, K83, K82, K81, K80, \ - K30, K31, K32, K33, K34, K35, K26, K36, K96, K86, K95, K94, K93, K92, K91, K90, \ - K40, K41, K42, K43, K44, K45, K46, KA6, KA5, KA4, KA3, KA2, KA1, KA0 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, K33, K34, K35, K36 }, \ - { K40, K41, K42, K43, K44, K45, K46 }, \ - { XXX, XXX, XXX, XXX, XXX, XXX, K56 }, \ -\ - { K60, K61, K62, K63, K64, K65, K66 }, \ - { K70, K71, K72, K73, K74, K75, K76 }, \ - { K80, K81, K82, K83, K84, K85, K86 }, \ - { K90, K91, K92, K93, K94, K95, K96 }, \ - { KA0, KA1, KA2, KA3, KA4, KA5, KA6 }, \ - { XXX, XXX, XXX, XXX, XXX, KB5, KB6 } \ -} diff --git a/keyboards/redox_w/info.json b/keyboards/redox_w/info.json index 13e2bb328339..c765291258b6 100644 --- a/keyboards/redox_w/info.json +++ b/keyboards/redox_w/info.json @@ -13,89 +13,85 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"_Nav || `", "x":0, "y":0.375, "w":1.25}, - {"label":"1", "x":1.25, "y":0.375}, - {"label":"2", "x":2.25, "y":0.125}, - {"label":"3", "x":3.25, "y":0}, - {"label":"4", "x":4.25, "y":0.125}, - {"label":"5", "x":5.25, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.375, "w": 1.25}, + {"matrix": [0, 1], "x": 1.25, "y": 0.375}, + {"matrix": [0, 2], "x": 2.25, "y": 0.125}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0.125}, + {"matrix": [0, 5], "x": 5.25, "y": 0.25}, - {"label":"6", "x":12.25, "y":0.25}, - {"label":"7", "x":13.25, "y":0.125}, - {"label":"8", "x":14.25, "y":0}, - {"label":"9", "x":15.25, "y":0.125}, - {"label":"0", "x":16.25, "y":0.375}, - {"label":"_Nav || -", "x":17.25, "y":0.375, "w":1.25}, + {"matrix": [0, 8], "x": 12.25, "y": 0.25}, + {"matrix": [0, 9], "x": 13.25, "y": 0.125}, + {"matrix": [0, 10], "x": 14.25, "y": 0}, + {"matrix": [0, 11], "x": 15.25, "y": 0.125}, + {"matrix": [0, 12], "x": 16.25, "y": 0.375}, + {"matrix": [0, 13], "x": 17.25, "y": 0.375, "w": 1.25}, - {"label":"Tab", "x":0, "y":1.375, "w":1.25}, - {"label":"Q", "x":1.25, "y":1.375}, - {"label":"W", "x":2.25, "y":1.125}, - {"label":"E", "x":3.25, "y":1}, - {"label":"R", "x":4.25, "y":1.125}, - {"label":"T", "x":5.25, "y":1.25}, - {"label":"MO(_SYMB)", "x":6.25, "y":0.75}, + {"matrix": [1, 0], "x": 0, "y": 1.375, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1.375}, + {"matrix": [1, 2], "x": 2.25, "y": 1.125}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1.125}, + {"matrix": [1, 5], "x": 5.25, "y": 1.25}, + {"matrix": [0, 6], "x": 6.25, "y": 0.75}, - {"label":"MO(_SYMB)", "x":11.25, "y":0.75}, - {"label":"Y", "x":12.25, "y":1.25}, - {"label":"U", "x":13.25, "y":1.125}, - {"label":"I", "x":14.25, "y":1}, - {"label":"O", "x":15.25, "y":1.125}, - {"label":"P", "x":16.25, "y":1.375}, - {"label":"=", "x":17.25, "y":1.375, "w":1.25}, + {"matrix": [0, 7], "x": 11.25, "y": 0.75}, + {"matrix": [1, 8], "x": 12.25, "y": 1.25}, + {"matrix": [1, 9], "x": 13.25, "y": 1.125}, + {"matrix": [1, 10], "x": 14.25, "y": 1}, + {"matrix": [1, 11], "x": 15.25, "y": 1.125}, + {"matrix": [1, 12], "x": 16.25, "y": 1.375}, + {"matrix": [1, 13], "x": 17.25, "y": 1.375, "w": 1.25}, - {"label":"Esc", "x":0, "y":2.375, "w":1.25}, - {"label":"A", "x":1.25, "y":2.375}, - {"label":"S", "x":2.25, "y":2.125}, - {"label":"D", "x":3.25, "y":2}, - {"label":"F", "x":4.25, "y":2.125}, - {"label":"G", "x":5.25, "y":2.25}, - {"label":"[", "x":6.25, "y":1.75, "h":1.5}, + {"matrix": [2, 0], "x": 0, "y": 2.375, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2.375}, + {"matrix": [2, 2], "x": 2.25, "y": 2.125}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2.125}, + {"matrix": [2, 5], "x": 5.25, "y": 2.25}, + {"matrix": [1, 6], "x": 6.25, "y": 1.75, "h": 1.5}, - {"label":"]", "x":11.25, "y":1.75, "h":1.5}, - {"label":"H", "x":12.25, "y":2.25}, - {"label":"J", "x":13.25, "y":2.125}, - {"label":"K", "x":14.25, "y":2}, - {"label":"L", "x":15.25, "y":2.125}, - {"label":";", "x":16.25, "y":2.375}, - {"label":"'", "x":17.25, "y":2.375, "w":1.25}, + {"matrix": [1, 7], "x": 11.25, "y": 1.75, "h": 1.5}, + {"matrix": [2, 8], "x": 12.25, "y": 2.25}, + {"matrix": [2, 9], "x": 13.25, "y": 2.125}, + {"matrix": [2, 10], "x": 14.25, "y": 2}, + {"matrix": [2, 11], "x": 15.25, "y": 2.125}, + {"matrix": [2, 12], "x": 16.25, "y": 2.375}, + {"matrix": [2, 13], "x": 17.25, "y": 2.375, "w": 1.25}, - {"label":"Shift", "x":0, "y":3.375, "w":1.25}, - {"label":"Z", "x":1.25, "y":3.375}, - {"label":"X", "x":2.25, "y":3.125}, - {"label":"C", "x":3.25, "y":3}, - {"label":"V", "x":4.25, "y":3.125}, - {"label":"B", "x":5.25, "y":3.25}, + {"matrix": [3, 0], "x": 0, "y": 3.375, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3.375}, + {"matrix": [3, 2], "x": 2.25, "y": 3.125}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3.125}, + {"matrix": [3, 5], "x": 5.25, "y": 3.25}, + {"matrix": [2, 6], "x": 6.75, "y": 3.75}, + {"matrix": [3, 6], "x": 7.75, "y": 3.75}, - {"label":"_Adjust/Page Up", "x":6.75, "y":3.75}, - {"label":"Page Down", "x":7.75, "y":3.75}, + {"matrix": [3, 7], "x": 9.75, "y": 3.75}, + {"matrix": [2, 7], "x": 10.75, "y": 3.75}, + {"matrix": [3, 8], "x": 12.25, "y": 3.25}, + {"matrix": [3, 9], "x": 13.25, "y": 3.125}, + {"matrix": [3, 10], "x": 14.25, "y": 3}, + {"matrix": [3, 11], "x": 15.25, "y": 3.125}, + {"matrix": [3, 12], "x": 16.25, "y": 3.375}, + {"matrix": [3, 13], "x": 17.25, "y": 3.375, "w": 1.25}, - {"label":"Home", "x":9.75, "y":3.75}, - {"label":"_Adjust/End", "x":10.75, "y":3.75}, + {"matrix": [4, 0], "x": 0.25, "y": 4.375}, + {"matrix": [4, 1], "x": 1.25, "y": 4.375}, + {"matrix": [4, 2], "x": 2.25, "y": 4.125}, + {"matrix": [4, 3], "x": 3.25, "y": 4}, + {"matrix": [4, 4], "x": 5.5, "y": 5.25, "w": 1.25}, + {"matrix": [4, 5], "x": 6.75, "y": 4.75, "h": 1.5}, + {"matrix": [4, 6], "x": 7.75, "y": 4.75, "h": 1.5}, - {"label":"N", "x":12.25, "y":3.25}, - {"label":"M", "x":13.25, "y":3.125}, - {"label":",", "x":14.25, "y":3}, - {"label":",", "x":15.25, "y":3.125}, - {"label":"\\", "x":16.25, "y":3.375}, - {"label":"Shift", "x":17.25, "y":3.375, "w":1.25}, - - {"label":"LGUI", "x":0.25, "y":4.375}, - {"label":"P+", "x":1.25, "y":4.375}, - {"label":"P-", "x":2.25, "y":4.125}, - {"label":"LAlt || P*", "x":3.25, "y":4}, - - {"label":"LCtrl || P/", "x":5.5, "y":5.25, "w":1.25}, - {"label":"Backspace", "x":6.75, "y":4.75, "h":1.5}, - {"label":"Delete", "x":7.75, "y":4.75, "h":1.5}, - - {"label":"Enter", "x":9.75, "y":4.75, "h":1.5}, - {"label":"Space", "x":10.75, "y":4.75, "h":1.5}, - {"label":"RAlt", "x":11.75, "y":5.25, "w":1.25}, - - {"label":"Left", "x":14.25, "y":4}, - {"label":"Down", "x":15.25, "y":4.125}, - {"label":"Up", "x":16.25, "y":4.375}, - {"label":"Right", "x":17.25, "y":4.375} + {"matrix": [4, 7], "x": 9.75, "y": 4.75, "h": 1.5}, + {"matrix": [4, 8], "x": 10.75, "y": 4.75, "h": 1.5}, + {"matrix": [4, 9], "x": 11.75, "y": 5.25, "w": 1.25}, + {"matrix": [4, 10], "x": 14.25, "y": 4}, + {"matrix": [4, 11], "x": 15.25, "y": 4.125}, + {"matrix": [4, 12], "x": 16.25, "y": 4.375}, + {"matrix": [4, 13], "x": 17.25, "y": 4.375} ] } } diff --git a/keyboards/redox_w/redox_w.h b/keyboards/redox_w/redox_w.h index 1ed42c84587e..086c8aae31dd 100644 --- a/keyboards/redox_w/redox_w.h +++ b/keyboards/redox_w/redox_w.h @@ -16,21 +16,3 @@ #define set_led_blue red_led_off; grn_led_off; blu_led_on; wht_led_off #define set_led_green red_led_off; grn_led_on; blu_led_off; wht_led_off #define set_led_white red_led_off; grn_led_off; blu_led_off; wht_led_on - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k08, k09, k10, k11, k12, k13, \ - k14, k15, k16, k17, k18, k19, k06, k07, k22, k23, k24, k25, k26, k27, \ - k28, k29, k30, k31, k32, k33, k20, k21, k36, k37, k38, k39, k40, k41, \ - k42, k43, k44, k45, k46, k47, k34, k48, k49, k35, k50, k51, k52, k53, k54, k55, \ - k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13 }, \ - { k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27 }, \ - { k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41 }, \ - { k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55 }, \ - { k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 } \ -} diff --git a/keyboards/reviung/reviung33/info.json b/keyboards/reviung/reviung33/info.json index addfdf057c9e..d5dfa7061a1c 100644 --- a/keyboards/reviung/reviung33/info.json +++ b/keyboards/reviung/reviung33/info.json @@ -24,42 +24,42 @@ "layouts": { "LAYOUT": { "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":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":6, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - - {"x":0, "y":3}, - {"x":2, "y":3, "w":6}, - {"x":9, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2, "y": 3, "w": 6}, + {"matrix": [3, 2], "x": 9, "y": 3} ] } } diff --git a/keyboards/reviung/reviung33/reviung33.h b/keyboards/reviung/reviung33/reviung33.h deleted file mode 100644 index 3f054eaa797a..000000000000 --- a/keyboards/reviung/reviung33/reviung33.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 gtips - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K32 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, K32, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/reviung/reviung39/info.json b/keyboards/reviung/reviung39/info.json index fbb2861f51db..5c2b3445d9a8 100644 --- a/keyboards/reviung/reviung39/info.json +++ b/keyboards/reviung/reviung39/info.json @@ -21,51 +21,51 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0.54}, - {"label":"K01", "x":1, "y":0.36}, - {"label":"K02", "x":2, "y":0.18}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0.18}, - {"label":"K05", "x":5, "y":0.36}, + {"matrix": [0, 0], "x": 0, "y": 0.54}, + {"matrix": [0, 1], "x": 1, "y": 0.36}, + {"matrix": [0, 2], "x": 2, "y": 0.18}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.18}, + {"matrix": [0, 5], "x": 5, "y": 0.36}, - {"label":"K30", "x":7, "y":0.36}, - {"label":"K31", "x":8, "y":0.18}, - {"label":"K32", "x":9, "y":0}, - {"label":"K33", "x":10, "y":0.18}, - {"label":"K34", "x":11, "y":0.36}, - {"label":"K35", "x":12, "y":0.54}, + {"matrix": [3, 0], "x": 7, "y": 0.36}, + {"matrix": [3, 1], "x": 8, "y": 0.18}, + {"matrix": [3, 2], "x": 9, "y": 0}, + {"matrix": [3, 3], "x": 10, "y": 0.18}, + {"matrix": [3, 4], "x": 11, "y": 0.36}, + {"matrix": [3, 5], "x": 12, "y": 0.54}, - {"label":"K10", "x":0, "y":1.54}, - {"label":"K11", "x":1, "y":1.36}, - {"label":"K12", "x":2, "y":1.18}, - {"label":"K13", "x":3, "y":1}, - {"label":"K14", "x":4, "y":1.18}, - {"label":"K15", "x":5, "y":1.36}, + {"matrix": [1, 0], "x": 0, "y": 1.54}, + {"matrix": [1, 1], "x": 1, "y": 1.36}, + {"matrix": [1, 2], "x": 2, "y": 1.18}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.18}, + {"matrix": [1, 5], "x": 5, "y": 1.36}, - {"label":"K40", "x":7, "y":1.36}, - {"label":"K41", "x":8, "y":1.18}, - {"label":"K42", "x":9, "y":1}, - {"label":"K43", "x":10, "y":1.18}, - {"label":"K44", "x":11, "y":1.36}, - {"label":"K45", "x":12, "y":1.54}, + {"matrix": [4, 0], "x": 7, "y": 1.36}, + {"matrix": [4, 1], "x": 8, "y": 1.18}, + {"matrix": [4, 2], "x": 9, "y": 1}, + {"matrix": [4, 3], "x": 10, "y": 1.18}, + {"matrix": [4, 4], "x": 11, "y": 1.36}, + {"matrix": [4, 5], "x": 12, "y": 1.54}, - {"label":"K20", "x":0, "y":2.54}, - {"label":"K21", "x":1, "y":2.36}, - {"label":"K22", "x":2, "y":2.18}, - {"label":"K23", "x":3, "y":2}, - {"label":"K24", "x":4, "y":2.18}, - {"label":"K25", "x":5, "y":2.36}, + {"matrix": [2, 0], "x": 0, "y": 2.54}, + {"matrix": [2, 1], "x": 1, "y": 2.36}, + {"matrix": [2, 2], "x": 2, "y": 2.18}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.18}, + {"matrix": [2, 5], "x": 5, "y": 2.36}, - {"label":"K50", "x":7, "y":2.36}, - {"label":"K51", "x":8, "y":2.18}, - {"label":"K52", "x":9, "y":2}, - {"label":"K53", "x":10, "y":2.18}, - {"label":"K54", "x":11, "y":2.36}, - {"label":"K55", "x":12, "y":2.54}, + {"matrix": [5, 0], "x": 7, "y": 2.36}, + {"matrix": [5, 1], "x": 8, "y": 2.18}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 3], "x": 10, "y": 2.18}, + {"matrix": [5, 4], "x": 11, "y": 2.36}, + {"matrix": [5, 5], "x": 12, "y": 2.54}, - {"label":"K60", "x":4.125, "y":3.54, "w":1.25}, - {"label":"K61", "x":5.375, "y":3.54, "w":2.25}, - {"label":"K62", "x":7.625, "y":3.54, "w":1.25} + {"matrix": [6, 0], "x": 4.125, "y": 3.54, "w": 1.25}, + {"matrix": [6, 1], "x": 5.375, "y": 3.54, "w": 2.25}, + {"matrix": [6, 2], "x": 7.625, "y": 3.54, "w": 1.25} ] } } diff --git a/keyboards/reviung/reviung39/reviung39.h b/keyboards/reviung/reviung39/reviung39.h deleted file mode 100644 index 131562450711..000000000000 --- a/keyboards/reviung/reviung39/reviung39.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2019 gtips - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K30, K31, K32, K33, K34, K35, \ - K10, K11, K12, K13, K14, K15, K40, K41, K42, K43, K44, K45, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K55, \ - K60, K61, K62 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, K55 }, \ - { K60, K61, K62, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/reviung/reviung41/info.json b/keyboards/reviung/reviung41/info.json index a138636dc041..6344a3e53e12 100644 --- a/keyboards/reviung/reviung41/info.json +++ b/keyboards/reviung/reviung41/info.json @@ -24,53 +24,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0.54}, - {"label":"K01", "x":1, "y":0.36}, - {"label":"K02", "x":2, "y":0.18}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0.18}, - {"label":"K05", "x":5, "y":0.36}, + {"matrix": [0, 0], "x": 0, "y": 0.54}, + {"matrix": [0, 1], "x": 1, "y": 0.36}, + {"matrix": [0, 2], "x": 2, "y": 0.18}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.18}, + {"matrix": [0, 5], "x": 5, "y": 0.36}, - {"label":"K30", "x":7, "y":0.36}, - {"label":"K31", "x":8, "y":0.18}, - {"label":"K32", "x":9, "y":0}, - {"label":"K33", "x":10, "y":0.18}, - {"label":"K34", "x":11, "y":0.36}, - {"label":"K35", "x":12, "y":0.54}, + {"matrix": [3, 0], "x": 7, "y": 0.36}, + {"matrix": [3, 1], "x": 8, "y": 0.18}, + {"matrix": [3, 2], "x": 9, "y": 0}, + {"matrix": [3, 3], "x": 10, "y": 0.18}, + {"matrix": [3, 4], "x": 11, "y": 0.36}, + {"matrix": [3, 5], "x": 12, "y": 0.54}, - {"label":"K10", "x":0, "y":1.54}, - {"label":"K11", "x":1, "y":1.36}, - {"label":"K12", "x":2, "y":1.18}, - {"label":"K13", "x":3, "y":1}, - {"label":"K14", "x":4, "y":1.18}, - {"label":"K15", "x":5, "y":1.36}, + {"matrix": [1, 0], "x": 0, "y": 1.54}, + {"matrix": [1, 1], "x": 1, "y": 1.36}, + {"matrix": [1, 2], "x": 2, "y": 1.18}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.18}, + {"matrix": [1, 5], "x": 5, "y": 1.36}, - {"label":"K40", "x":7, "y":1.36}, - {"label":"K41", "x":8, "y":1.18}, - {"label":"K42", "x":9, "y":1}, - {"label":"K43", "x":10, "y":1.18}, - {"label":"K44", "x":11, "y":1.36}, - {"label":"K45", "x":12, "y":1.54}, + {"matrix": [4, 0], "x": 7, "y": 1.36}, + {"matrix": [4, 1], "x": 8, "y": 1.18}, + {"matrix": [4, 2], "x": 9, "y": 1}, + {"matrix": [4, 3], "x": 10, "y": 1.18}, + {"matrix": [4, 4], "x": 11, "y": 1.36}, + {"matrix": [4, 5], "x": 12, "y": 1.54}, - {"label":"K20", "x":0, "y":2.54}, - {"label":"K21", "x":1, "y":2.36}, - {"label":"K22", "x":2, "y":2.18}, - {"label":"K23", "x":3, "y":2}, - {"label":"K24", "x":4, "y":2.18}, - {"label":"K25", "x":5, "y":2.36}, + {"matrix": [2, 0], "x": 0, "y": 2.54}, + {"matrix": [2, 1], "x": 1, "y": 2.36}, + {"matrix": [2, 2], "x": 2, "y": 2.18}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.18}, + {"matrix": [2, 5], "x": 5, "y": 2.36}, - {"label":"K50", "x":7, "y":2.36}, - {"label":"K51", "x":8, "y":2.18}, - {"label":"K52", "x":9, "y":2}, - {"label":"K53", "x":10, "y":2.18}, - {"label":"K54", "x":11, "y":2.36}, - {"label":"K55", "x":12, "y":2.54}, + {"matrix": [5, 0], "x": 7, "y": 2.36}, + {"matrix": [5, 1], "x": 8, "y": 2.18}, + {"matrix": [5, 2], "x": 9, "y": 2}, + {"matrix": [5, 3], "x": 10, "y": 2.18}, + {"matrix": [5, 4], "x": 11, "y": 2.36}, + {"matrix": [5, 5], "x": 12, "y": 2.54}, - {"label":"K60", "x":2.875, "y":3.54, "w":1.25}, - {"label":"K61", "x":4.125, "y":3.54, "w":1.25}, - {"label":"K62", "x":5.375, "y":3.54, "w":2.25}, - {"label":"K63", "x":7.625, "y":3.54, "w":1.25}, - {"label":"K64", "x":8.875, "y":3.54, "w":1.25} + {"matrix": [6, 0], "x": 2.875, "y": 3.54, "w": 1.25}, + {"matrix": [6, 1], "x": 4.125, "y": 3.54, "w": 1.25}, + {"matrix": [6, 2], "x": 5.375, "y": 3.54, "w": 2.25}, + {"matrix": [6, 3], "x": 7.625, "y": 3.54, "w": 1.25}, + {"matrix": [6, 4], "x": 8.875, "y": 3.54, "w": 1.25} ] } } diff --git a/keyboards/reviung/reviung41/reviung41.h b/keyboards/reviung/reviung41/reviung41.h deleted file mode 100644 index a1b7f14a0a91..000000000000 --- a/keyboards/reviung/reviung41/reviung41.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 gtips - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K30, K31, K32, K33, K34, K35, \ - K10, K11, K12, K13, K14, K15, K40, K41, K42, K43, K44, K45, \ - K20, K21, K22, K23, K24, K25, K50, K51, K52, K53, K54, K55, \ - K60, K61, K62, K63, K64 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, K55 }, \ - { K60, K61, K62, K63, K64, KC_NO } \ -} diff --git a/keyboards/reviung/reviung53/info.json b/keyboards/reviung/reviung53/info.json index 4d3b7c1354bc..bf398b82c82d 100644 --- a/keyboards/reviung/reviung53/info.json +++ b/keyboards/reviung/reviung53/info.json @@ -24,64 +24,68 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k02", "x":2.25, "y":0}, - {"label": "k03", "x":3.5, "y":0}, - {"label": "k04", "x":4.5, "y":0}, - {"label": "k05", "x":5.5, "y":0}, - {"label": "k06", "x":6.5, "y":0}, - {"label": "k07", "x":7.75, "y":0}, - {"label": "k40", "x":8.75, "y":0}, - {"label": "k41", "x":9.75, "y":0}, - {"label": "k42", "x":10.75, "y":0}, - {"label": "k43", "x":12, "y":0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, - {"label": "k10", "x":0, "y":1.25, "w":1.5}, - {"label": "k11", "x":1.5, "y":1.25}, - {"label": "k12", "x":2.5, "y":1.25}, - {"label": "k13", "x":3.5, "y":1.25}, - {"label": "k14", "x":4.5, "y":1.25}, - {"label": "k15", "x":5.5, "y":1.25}, - {"label": "k16", "x":6.5, "y":1.25}, - {"label": "k17", "x":7.5, "y":1.25}, - {"label": "k44", "x":8.5, "y":1.25}, - {"label": "k45", "x":9.5, "y":1.25}, - {"label": "k46", "x":10.5, "y":1.25}, - {"label": "k47", "x":11.5, "y":1.25, "w":1.5}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"label": "k20", "x":0, "y":2.25, "w":1.75}, - {"label": "k21", "x":1.75, "y":2.25}, - {"label": "k22", "x":2.75, "y":2.25}, - {"label": "k23", "x":3.75, "y":2.25}, - {"label": "k24", "x":4.75, "y":2.25}, - {"label": "k25", "x":5.75, "y":2.25}, - {"label": "k26", "x":6.75, "y":2.25}, - {"label": "k27", "x":7.75, "y":2.25}, - {"label": "k50", "x":8.75, "y":2.25}, - {"label": "k51", "x":9.75, "y":2.25}, - {"label": "k52", "x":10.75, "y":2.25}, - {"label": "k53", "x":11.75, "y":2.25, "w":1.25}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [4, 0], "x": 8.75, "y": 0}, + {"matrix": [4, 1], "x": 9.75, "y": 0}, + {"matrix": [4, 2], "x": 10.75, "y": 0}, - {"label": "k30", "x":0, "y":3.25, "w":2.25}, - {"label": "k31", "x":2.25, "y":3.25}, - {"label": "k32", "x":3.25, "y":3.25}, - {"label": "k33", "x":4.25, "y":3.25}, - {"label": "k34", "x":5.25, "y":3.25}, - {"label": "k35", "x":6.25, "y":3.25}, - {"label": "k36", "x":7.25, "y":3.25}, - {"label": "k37", "x":8.25, "y":3.25}, - {"label": "k54", "x":9.25, "y":3.25}, - {"label": "k55", "x":10.25, "y":3.25}, - {"label": "k56", "x":11.25, "y":3.25, "w":1.75}, + {"matrix": [4, 3], "x": 12, "y": 0}, - {"label": "k60", "x":0, "y":4.25, "w":1.5}, - {"label": "k61", "x":1.5, "y":4.25, "w":1.25}, - {"label": "k62", "x":2.75, "y":4.25, "w":1.25}, - {"label": "k63", "x":4, "y":4.25, "w":2.75}, - {"label": "k64", "x":6.75, "y":4.25, "w":2.25}, - {"label": "k65", "x":9, "y":4.25, "w":1.25}, - {"label": "k66", "x":10.25, "y":4.25, "w":1.25}, - {"label": "k67", "x":11.5, "y":4.25, "w":1.5} + {"matrix": [1, 0], "x": 0, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1.25}, + {"matrix": [1, 3], "x": 3.5, "y": 1.25}, + {"matrix": [1, 4], "x": 4.5, "y": 1.25}, + {"matrix": [1, 5], "x": 5.5, "y": 1.25}, + {"matrix": [1, 6], "x": 6.5, "y": 1.25}, + {"matrix": [1, 7], "x": 7.5, "y": 1.25}, + {"matrix": [4, 4], "x": 8.5, "y": 1.25}, + {"matrix": [4, 5], "x": 9.5, "y": 1.25}, + {"matrix": [4, 6], "x": 10.5, "y": 1.25}, + {"matrix": [4, 7], "x": 11.5, "y": 1.25, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2.25}, + {"matrix": [2, 2], "x": 2.75, "y": 2.25}, + {"matrix": [2, 3], "x": 3.75, "y": 2.25}, + {"matrix": [2, 4], "x": 4.75, "y": 2.25}, + {"matrix": [2, 5], "x": 5.75, "y": 2.25}, + {"matrix": [2, 6], "x": 6.75, "y": 2.25}, + {"matrix": [2, 7], "x": 7.75, "y": 2.25}, + {"matrix": [5, 0], "x": 8.75, "y": 2.25}, + {"matrix": [5, 1], "x": 9.75, "y": 2.25}, + {"matrix": [5, 2], "x": 10.75, "y": 2.25}, + {"matrix": [5, 3], "x": 11.75, "y": 2.25, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.25}, + {"matrix": [3, 4], "x": 5.25, "y": 3.25}, + {"matrix": [3, 5], "x": 6.25, "y": 3.25}, + {"matrix": [3, 6], "x": 7.25, "y": 3.25}, + {"matrix": [3, 7], "x": 8.25, "y": 3.25}, + {"matrix": [5, 4], "x": 9.25, "y": 3.25}, + {"matrix": [5, 5], "x": 10.25, "y": 3.25}, + {"matrix": [5, 6], "x": 11.25, "y": 3.25, "w": 1.75}, + + {"matrix": [6, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [6, 1], "x": 1.5, "y": 4.25, "w": 1.25}, + {"matrix": [6, 2], "x": 2.75, "y": 4.25, "w": 1.25}, + {"matrix": [6, 3], "x": 4, "y": 4.25, "w": 2.75}, + {"matrix": [6, 4], "x": 6.75, "y": 4.25, "w": 2.25}, + {"matrix": [6, 5], "x": 9, "y": 4.25, "w": 1.25}, + {"matrix": [6, 6], "x": 10.25, "y": 4.25, "w": 1.25}, + {"matrix": [6, 7], "x": 11.5, "y": 4.25, "w": 1.5} ] } } + } diff --git a/keyboards/reviung/reviung53/reviung53.h b/keyboards/reviung/reviung53/reviung53.h deleted file mode 100644 index 23ae04500fc9..000000000000 --- a/keyboards/reviung/reviung53/reviung53.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2021 gtips (@gtips) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K02, K03, K04, K05, K06, K07, K40, K41, K42, K43, \ - K10, K11, K12, K13, K14, K15, K16, K17, K44, K45, K46, K47, \ - K20, K21, K22, K23, K24, K25, K26, K27, K50, K51, K52, K53, \ - K30, K31, K32, K33, K34, K35, K36, K37, K54, K55, K56,\ - K60, K61, K62, K63, K64, K65, K66, K67 \ -) { \ - { KC_NO, KC_NO, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, 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, KC_NO }, \ - { K60, K61, K62, K63, K64, K65, K66, K67 } \ -} diff --git a/keyboards/rgbkb/mun/rev1/info.json b/keyboards/rgbkb/mun/rev1/info.json index b447c4b58d7b..a2f6872090df 100644 --- a/keyboards/rgbkb/mun/rev1/info.json +++ b/keyboards/rgbkb/mun/rev1/info.json @@ -34,94 +34,107 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - {"label":"R00", "x":7.5, "y":0}, - {"label":"R01", "x":8.5, "y":0}, - {"label":"R02", "x":9.5, "y":0}, - {"label":"R03", "x":10.5, "y":0}, - {"label":"R04", "x":11.5, "y":0}, - {"label":"R05", "x":12.5, "y":0}, - {"label":"R06", "x":13.5, "y":0}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"L16", "x":6, "y":1}, - {"label":"R10", "x":7.5, "y":1}, - {"label":"R11", "x":8.5, "y":1}, - {"label":"R12", "x":9.5, "y":1}, - {"label":"R13", "x":10.5, "y":1}, - {"label":"R14", "x":11.5, "y":1}, - {"label":"R15", "x":12.5, "y":1}, - {"label":"R16", "x":13.5, "y":1}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"L26", "x":6, "y":2}, - {"label":"R20", "x":7.5, "y":2}, - {"label":"R21", "x":8.5, "y":2}, - {"label":"R22", "x":9.5, "y":2}, - {"label":"R23", "x":10.5, "y":2}, - {"label":"R24", "x":11.5, "y":2}, - {"label":"R25", "x":12.5, "y":2}, - {"label":"R26", "x":13.5, "y":2}, - {"label":"L30", "x":0, "y":3}, - {"label":"L31", "x":1, "y":3}, - {"label":"L32", "x":2, "y":3}, - {"label":"L33", "x":3, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3}, - {"label":"L36", "x":6, "y":3}, - {"label":"R30", "x":7.5, "y":3}, - {"label":"R21", "x":8.5, "y":3}, - {"label":"R32", "x":9.5, "y":3}, - {"label":"R33", "x":10.5, "y":3}, - {"label":"R34", "x":11.5, "y":3}, - {"label":"R35", "x":12.5, "y":3}, - {"label":"R36", "x":13.5, "y":3}, - {"label":"L40", "x":0, "y":4}, - {"label":"L41", "x":1, "y":4}, - {"label":"L42", "x":2, "y":4}, - {"label":"L43", "x":3, "y":4}, - {"label":"L44", "x":4, "y":4}, - {"label":"L45", "x":5, "y":4}, - {"label":"L46", "x":6, "y":4}, - {"label":"R40", "x":7.5, "y":4}, - {"label":"R41", "x":8.5, "y":4}, - {"label":"R42", "x":9.5, "y":4}, - {"label":"R43", "x":10.5, "y":4}, - {"label":"R44", "x":11.5, "y":4}, - {"label":"R45", "x":12.5, "y":4}, - {"label":"R46", "x":13.5, "y":4}, - {"label":"E00", "x":0, "y":5.5}, - {"label":"E01", "x":1, "y":5.5}, - {"label":"E10", "x":2, "y":5.5}, - {"label":"E11", "x":3, "y":5.5}, - {"label":"E20", "x":10.5, "y":5.5}, - {"label":"E21", "x":11.5, "y":5.5}, - {"label":"E30", "x":12.5, "y":5.5}, - {"label":"E31", "x":13.5, "y":5.5}, - {"label":"T00", "x":0, "y":6.5}, - {"label":"T01", "x":1, "y":6.5}, - {"label":"T02", "x":2, "y":6.5}, - {"label":"T03", "x":3, "y":6.5}, - {"label":"T04", "x":4, "y":6.5}, - {"label":"T10", "x":9.5, "y":6.5}, - {"label":"T11", "x":10.5, "y":6.5}, - {"label":"T12", "x":11.5, "y":6.5}, - {"label":"T13", "x":12.5, "y":6.5}, - {"label":"T14", "x":13.5, "y":6.5} + {"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": [7, 6], "x": 7.5, "y": 0}, + {"matrix": [7, 5], "x": 8.5, "y": 0}, + {"matrix": [7, 4], "x": 9.5, "y": 0}, + {"matrix": [7, 3], "x": 10.5, "y": 0}, + {"matrix": [7, 2], "x": 11.5, "y": 0}, + {"matrix": [7, 1], "x": 12.5, "y": 0}, + {"matrix": [7, 0], "x": 13.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [8, 6], "x": 7.5, "y": 1}, + {"matrix": [8, 5], "x": 8.5, "y": 1}, + {"matrix": [8, 4], "x": 9.5, "y": 1}, + {"matrix": [8, 3], "x": 10.5, "y": 1}, + {"matrix": [8, 2], "x": 11.5, "y": 1}, + {"matrix": [8, 1], "x": 12.5, "y": 1}, + {"matrix": [8, 0], "x": 13.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [9, 6], "x": 7.5, "y": 2}, + {"matrix": [9, 5], "x": 8.5, "y": 2}, + {"matrix": [9, 4], "x": 9.5, "y": 2}, + {"matrix": [9, 3], "x": 10.5, "y": 2}, + {"matrix": [9, 2], "x": 11.5, "y": 2}, + {"matrix": [9, 1], "x": 12.5, "y": 2}, + {"matrix": [9, 0], "x": 13.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [10, 6], "x": 7.5, "y": 3}, + {"matrix": [10, 5], "x": 8.5, "y": 3}, + {"matrix": [10, 4], "x": 9.5, "y": 3}, + {"matrix": [10, 3], "x": 10.5, "y": 3}, + {"matrix": [10, 2], "x": 11.5, "y": 3}, + {"matrix": [10, 1], "x": 12.5, "y": 3}, + {"matrix": [10, 0], "x": 13.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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": [11, 6], "x": 7.5, "y": 4}, + {"matrix": [11, 5], "x": 8.5, "y": 4}, + {"matrix": [11, 4], "x": 9.5, "y": 4}, + {"matrix": [11, 3], "x": 10.5, "y": 4}, + {"matrix": [11, 2], "x": 11.5, "y": 4}, + {"matrix": [11, 1], "x": 12.5, "y": 4}, + {"matrix": [11, 0], "x": 13.5, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "x": 2, "y": 5.5}, + {"matrix": [5, 3], "x": 3, "y": 5.5}, + + {"matrix": [12, 0], "x": 10.5, "y": 5.5}, + {"matrix": [12, 1], "x": 11.5, "y": 5.5}, + {"matrix": [12, 2], "x": 12.5, "y": 5.5}, + {"matrix": [12, 3], "x": 13.5, "y": 5.5}, + + {"matrix": [6, 0], "x": 0, "y": 6.5}, + {"matrix": [6, 1], "x": 1, "y": 6.5}, + {"matrix": [6, 2], "x": 2, "y": 6.5}, + {"matrix": [6, 3], "x": 3, "y": 6.5}, + {"matrix": [6, 4], "x": 4, "y": 6.5}, + + {"matrix": [13, 0], "x": 9.5, "y": 6.5}, + {"matrix": [13, 1], "x": 10.5, "y": 6.5}, + {"matrix": [13, 2], "x": 11.5, "y": 6.5}, + {"matrix": [13, 3], "x": 12.5, "y": 6.5}, + {"matrix": [13, 4], "x": 13.5, "y": 6.5} ] } } diff --git a/keyboards/rgbkb/mun/rev1/rev1.h b/keyboards/rgbkb/mun/rev1/rev1.h index 8e7b65f45ca3..291428c0fbba 100644 --- a/keyboards/rgbkb/mun/rev1/rev1.h +++ b/keyboards/rgbkb/mun/rev1/rev1.h @@ -11,33 +11,3 @@ #include "mun.h" #include "touch_encoder.h" - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, R40, R41, R42, R43, R44, R45, R46, \ - E00, E01, E10, E11, E20, E21, E30, E31, \ - T00, T01, T02, T03, T04, T10, T11, T12, T13, T14 \ -) \ -{ \ - /* Left Half */ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { E00, E01, E10, E11, KC_NO, KC_NO, KC_NO }, \ - { T00, T01, T02, T03, T04, KC_NO, KC_NO }, \ - /* Right Half */ \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { R46, R45, R44, R43, R42, R41, R40 }, \ - { E20, E21, E30, E31, KC_NO, KC_NO, KC_NO }, \ - { T10, T11, T12, T13, T14, KC_NO, KC_NO } \ -} -// clang-format on diff --git a/keyboards/rgbkb/sol/rev1/info.json b/keyboards/rgbkb/sol/rev1/info.json index b93857eb51ab..b0b8fc12d023 100644 --- a/keyboards/rgbkb/sol/rev1/info.json +++ b/keyboards/rgbkb/sol/rev1/info.json @@ -32,80 +32,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0, "w":1.5}, - {"label":"L01", "x":1.5, "y":0}, - {"label":"L02", "x":2.5, "y":0}, - {"label":"L03", "x":3.5, "y":0}, - {"label":"L04", "x":4.5, "y":0}, - {"label":"L05", "x":5.5, "y":0}, - {"label":"L06", "x":6.75, "y":0}, - {"label":"R06", "x":9.25, "y":0}, - {"label":"R00", "x":10.5, "y":0}, - {"label":"R01", "x":11.5, "y":0}, - {"label":"R02", "x":12.5, "y":0}, - {"label":"R03", "x":13.5, "y":0}, - {"label":"R04", "x":14.5, "y":0}, - {"label":"R05", "x":15.5, "y":0, "w":1.5}, - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - {"label":"L16", "x":6.75, "y":1}, - {"label":"R16", "x":9.25, "y":1}, - {"label":"R10", "x":10.5, "y":1}, - {"label":"R11", "x":11.5, "y":1}, - {"label":"R12", "x":12.5, "y":1}, - {"label":"R13", "x":13.5, "y":1}, - {"label":"R14", "x":14.5, "y":1}, - {"label":"R15", "x":15.5, "y":1, "w":1.5}, - {"label":"L20", "x":0, "y":2, "w":1.5}, - {"label":"L21", "x":1.5, "y":2}, - {"label":"L22", "x":2.5, "y":2}, - {"label":"L23", "x":3.5, "y":2}, - {"label":"L24", "x":4.5, "y":2}, - {"label":"L25", "x":5.5, "y":2}, - {"label":"L26", "x":6.75, "y":2}, - {"label":"R26", "x":9.25, "y":2}, - {"label":"R20", "x":10.5, "y":2}, - {"label":"R21", "x":11.5, "y":2}, - {"label":"R22", "x":12.5, "y":2}, - {"label":"R23", "x":13.5, "y":2}, - {"label":"R24", "x":14.5, "y":2}, - {"label":"R25", "x":15.5, "y":2, "w":1.5}, - {"label":"L30", "x":0, "y":3, "w":1.5}, - {"label":"L31", "x":1.5, "y":3}, - {"label":"L32", "x":2.5, "y":3}, - {"label":"L33", "x":3.5, "y":3}, - {"label":"L34", "x":4.5, "y":3}, - {"label":"L35", "x":5.5, "y":3}, - {"label":"L36", "x":6.75, "y":3}, - {"label":"R36", "x":9.25, "y":3}, - {"label":"R30", "x":10.5, "y":3}, - {"label":"R31", "x":11.5, "y":3}, - {"label":"R32", "x":12.5, "y":3}, - {"label":"R33", "x":13.5, "y":3}, - {"label":"R34", "x":14.5, "y":3}, - {"label":"R35", "x":15.5, "y":3, "w":1.5}, - {"label":"L40", "x":0, "y":4, "w":1.5}, - {"label":"L41", "x":1.5, "y":4}, - {"label":"L42", "x":2.5, "y":4}, - {"label":"L43", "x":3.5, "y":4}, - {"label":"L44", "x":4.5, "y":4}, - {"label":"L45", "x":6, "y":4.5}, - {"label":"L46", "x":7, "y":4.5}, - {"label":"R46", "x":9, "y":4.5}, - {"label":"R40", "x":10, "y":4.5}, - {"label":"R41", "x":11.5, "y":4}, - {"label":"R42", "x":12.5, "y":4}, - {"label":"R43", "x":13.5, "y":4}, - {"label":"R44", "x":14.5, "y":4}, - {"label":"R45", "x":15.5, "y":4, "w":1.5}, - {"label":"L55", "x":6, "y":5.5}, - {"label":"L56", "x":7, "y":5.5}, - {"label":"R56", "x":9, "y":5.5}, - {"label":"R50", "x":10, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [6, 6], "x": 9.25, "y": 0}, + {"matrix": [6, 5], "x": 10.5, "y": 0}, + {"matrix": [6, 4], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + {"matrix": [6, 2], "x": 13.5, "y": 0}, + {"matrix": [6, 1], "x": 14.5, "y": 0}, + {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + + {"matrix": [7, 6], "x": 9.25, "y": 1}, + {"matrix": [7, 5], "x": 10.5, "y": 1}, + {"matrix": [7, 4], "x": 11.5, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 1}, + {"matrix": [7, 2], "x": 13.5, "y": 1}, + {"matrix": [7, 1], "x": 14.5, "y": 1}, + {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 5], "x": 10.5, "y": 2}, + {"matrix": [8, 4], "x": 11.5, "y": 2}, + {"matrix": [8, 3], "x": 12.5, "y": 2}, + {"matrix": [8, 2], "x": 13.5, "y": 2}, + {"matrix": [8, 1], "x": 14.5, "y": 2}, + {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.25, "y": 3}, + {"matrix": [9, 5], "x": 10.5, "y": 3}, + {"matrix": [9, 4], "x": 11.5, "y": 3}, + {"matrix": [9, 3], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 1], "x": 14.5, "y": 3}, + {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4.5}, + {"matrix": [4, 6], "x": 7, "y": 4.5}, + + {"matrix": [10, 6], "x": 9, "y": 4.5}, + {"matrix": [10, 5], "x": 10, "y": 4.5}, + {"matrix": [10, 4], "x": 11.5, "y": 4}, + {"matrix": [10, 3], "x": 12.5, "y": 4}, + {"matrix": [10, 2], "x": 13.5, "y": 4}, + {"matrix": [10, 1], "x": 14.5, "y": 4}, + {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, + + {"matrix": [5, 5], "x": 6, "y": 5.5}, + {"matrix": [5, 6], "x": 7, "y": 5.5}, + + {"matrix": [11, 6], "x": 9, "y": 5.5}, + {"matrix": [11, 5], "x": 10, "y": 5.5} ] } } diff --git a/keyboards/rgbkb/sol/rev2/info.json b/keyboards/rgbkb/sol/rev2/info.json index 2daee64be49d..1eec8a393035 100644 --- a/keyboards/rgbkb/sol/rev2/info.json +++ b/keyboards/rgbkb/sol/rev2/info.json @@ -27,80 +27,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0, "w":1.5}, - {"label":"L01", "x":1.5, "y":0}, - {"label":"L02", "x":2.5, "y":0}, - {"label":"L03", "x":3.5, "y":0}, - {"label":"L04", "x":4.5, "y":0}, - {"label":"L05", "x":5.5, "y":0}, - {"label":"L06", "x":6.75, "y":0}, - {"label":"R06", "x":9.25, "y":0}, - {"label":"R00", "x":10.5, "y":0}, - {"label":"R01", "x":11.5, "y":0}, - {"label":"R02", "x":12.5, "y":0}, - {"label":"R03", "x":13.5, "y":0}, - {"label":"R04", "x":14.5, "y":0}, - {"label":"R05", "x":15.5, "y":0, "w":1.5}, - {"label":"L10", "x":0, "y":1, "w":1.5}, - {"label":"L11", "x":1.5, "y":1}, - {"label":"L12", "x":2.5, "y":1}, - {"label":"L13", "x":3.5, "y":1}, - {"label":"L14", "x":4.5, "y":1}, - {"label":"L15", "x":5.5, "y":1}, - {"label":"L16", "x":6.75, "y":1}, - {"label":"R16", "x":9.25, "y":1}, - {"label":"R10", "x":10.5, "y":1}, - {"label":"R11", "x":11.5, "y":1}, - {"label":"R12", "x":12.5, "y":1}, - {"label":"R13", "x":13.5, "y":1}, - {"label":"R14", "x":14.5, "y":1}, - {"label":"R15", "x":15.5, "y":1, "w":1.5}, - {"label":"L20", "x":0, "y":2, "w":1.5}, - {"label":"L21", "x":1.5, "y":2}, - {"label":"L22", "x":2.5, "y":2}, - {"label":"L23", "x":3.5, "y":2}, - {"label":"L24", "x":4.5, "y":2}, - {"label":"L25", "x":5.5, "y":2}, - {"label":"L26", "x":6.75, "y":2}, - {"label":"R26", "x":9.25, "y":2}, - {"label":"R20", "x":10.5, "y":2}, - {"label":"R21", "x":11.5, "y":2}, - {"label":"R22", "x":12.5, "y":2}, - {"label":"R23", "x":13.5, "y":2}, - {"label":"R24", "x":14.5, "y":2}, - {"label":"R25", "x":15.5, "y":2, "w":1.5}, - {"label":"L30", "x":0, "y":3, "w":1.5}, - {"label":"L31", "x":1.5, "y":3}, - {"label":"L32", "x":2.5, "y":3}, - {"label":"L33", "x":3.5, "y":3}, - {"label":"L34", "x":4.5, "y":3}, - {"label":"L35", "x":5.5, "y":3}, - {"label":"L36", "x":6.75, "y":3}, - {"label":"R36", "x":9.25, "y":3}, - {"label":"R30", "x":10.5, "y":3}, - {"label":"R31", "x":11.5, "y":3}, - {"label":"R32", "x":12.5, "y":3}, - {"label":"R33", "x":13.5, "y":3}, - {"label":"R34", "x":14.5, "y":3}, - {"label":"R35", "x":15.5, "y":3, "w":1.5}, - {"label":"L40", "x":0, "y":4, "w":1.5}, - {"label":"L41", "x":1.5, "y":4}, - {"label":"L42", "x":2.5, "y":4}, - {"label":"L43", "x":3.5, "y":4}, - {"label":"L44", "x":4.5, "y":4}, - {"label":"L45", "x":6, "y":4.5}, - {"label":"L46", "x":7, "y":4.5}, - {"label":"R46", "x":9, "y":4.5}, - {"label":"R40", "x":10, "y":4.5}, - {"label":"R41", "x":11.5, "y":4}, - {"label":"R42", "x":12.5, "y":4}, - {"label":"R43", "x":13.5, "y":4}, - {"label":"R44", "x":14.5, "y":4}, - {"label":"R45", "x":15.5, "y":4, "w":1.5}, - {"label":"L55", "x":6, "y":5.5}, - {"label":"L56", "x":7, "y":5.5}, - {"label":"R56", "x":9, "y":5.5}, - {"label":"R50", "x":10, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [6, 6], "x": 9.25, "y": 0}, + {"matrix": [6, 5], "x": 10.5, "y": 0}, + {"matrix": [6, 4], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + {"matrix": [6, 2], "x": 13.5, "y": 0}, + {"matrix": [6, 1], "x": 14.5, "y": 0}, + {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + + {"matrix": [7, 6], "x": 9.25, "y": 1}, + {"matrix": [7, 5], "x": 10.5, "y": 1}, + {"matrix": [7, 4], "x": 11.5, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 1}, + {"matrix": [7, 2], "x": 13.5, "y": 1}, + {"matrix": [7, 1], "x": 14.5, "y": 1}, + {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 5], "x": 10.5, "y": 2}, + {"matrix": [8, 4], "x": 11.5, "y": 2}, + {"matrix": [8, 3], "x": 12.5, "y": 2}, + {"matrix": [8, 2], "x": 13.5, "y": 2}, + {"matrix": [8, 1], "x": 14.5, "y": 2}, + {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + + {"matrix": [9, 6], "x": 9.25, "y": 3}, + {"matrix": [9, 5], "x": 10.5, "y": 3}, + {"matrix": [9, 4], "x": 11.5, "y": 3}, + {"matrix": [9, 3], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 1], "x": 14.5, "y": 3}, + {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4.5}, + {"matrix": [4, 6], "x": 7, "y": 4.5}, + + {"matrix": [10, 6], "x": 9, "y": 4.5}, + {"matrix": [10, 5], "x": 10, "y": 4.5}, + {"matrix": [10, 4], "x": 11.5, "y": 4}, + {"matrix": [10, 3], "x": 12.5, "y": 4}, + {"matrix": [10, 2], "x": 13.5, "y": 4}, + {"matrix": [10, 1], "x": 14.5, "y": 4}, + {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, + + {"matrix": [5, 5], "x": 6, "y": 5.5}, + {"matrix": [5, 6], "x": 7, "y": 5.5}, + + {"matrix": [11, 6], "x": 9, "y": 5.5}, + {"matrix": [11, 5], "x": 10, "y": 5.5} ] } } diff --git a/keyboards/rgbkb/sol/sol.h b/keyboards/rgbkb/sol/sol.h index 695dc6db6158..2cab4810447e 100644 --- a/keyboards/rgbkb/sol/sol.h +++ b/keyboards/rgbkb/sol/sol.h @@ -2,29 +2,6 @@ #include "quantum.h" -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, L16, R16, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, L26, R26, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L36, R36, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, L45, L46, R46, R40, R41, R42, R43, R44, R45, \ - L55, L56, R56, R50 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, L55, L56 }, \ - { R05, R04, R03, R02, R01, R00, R06 }, \ - { R15, R14, R13, R12, R11, R10, R16 }, \ - { R25, R24, R23, R22, R21, R20, R26 }, \ - { R35, R34, R33, R32, R31, R30, R36 }, \ - { R45, R44, R43, R42, R41, R40, R46 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, R50, R56 } \ - } - #define ENCODER_LAYOUT( \ E10, E11, \ E20, E21 \ diff --git a/keyboards/rgbkb/sol3/rev1/info.json b/keyboards/rgbkb/sol3/rev1/info.json index 3dd7404c447d..74af9d21faf5 100644 --- a/keyboards/rgbkb/sol3/rev1/info.json +++ b/keyboards/rgbkb/sol3/rev1/info.json @@ -50,113 +50,113 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "w":1.5}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.75, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, - {"x":9.25, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0}, - {"x":14.5, "y":0}, - {"x":15.5, "y":0, "w":1.5}, + {"matrix": [6, 6], "x": 9.25, "y": 0}, + {"matrix": [6, 5], "x": 10.5, "y": 0}, + {"matrix": [6, 4], "x": 11.5, "y": 0}, + {"matrix": [6, 3], "x": 12.5, "y": 0}, + {"matrix": [6, 2], "x": 13.5, "y": 0}, + {"matrix": [6, 1], "x": 14.5, "y": 0}, + {"matrix": [6, 0], "x": 15.5, "y": 0, "w": 1.5}, - {"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.75, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, - {"x":9.25, "y":1}, - {"x":10.5, "y":1}, - {"x":11.5, "y":1}, - {"x":12.5, "y":1}, - {"x":13.5, "y":1}, - {"x":14.5, "y":1}, - {"x":15.5, "y":1, "w":1.5}, + {"matrix": [7, 6], "x": 9.25, "y": 1}, + {"matrix": [7, 5], "x": 10.5, "y": 1}, + {"matrix": [7, 4], "x": 11.5, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 1}, + {"matrix": [7, 2], "x": 13.5, "y": 1}, + {"matrix": [7, 1], "x": 14.5, "y": 1}, + {"matrix": [7, 0], "x": 15.5, "y": 1, "w": 1.5}, - {"x":0, "y":2, "w":1.5}, - {"x":1.5, "y":2}, - {"x":2.5, "y":2}, - {"x":3.5, "y":2}, - {"x":4.5, "y":2}, - {"x":5.5, "y":2}, - {"x":6.75, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"x":9.25, "y":2}, - {"x":10.5, "y":2}, - {"x":11.5, "y":2}, - {"x":12.5, "y":2}, - {"x":13.5, "y":2}, - {"x":14.5, "y":2}, - {"x":15.5, "y":2, "w":1.5}, + {"matrix": [8, 6], "x": 9.25, "y": 2}, + {"matrix": [8, 5], "x": 10.5, "y": 2}, + {"matrix": [8, 4], "x": 11.5, "y": 2}, + {"matrix": [8, 3], "x": 12.5, "y": 2}, + {"matrix": [8, 2], "x": 13.5, "y": 2}, + {"matrix": [8, 1], "x": 14.5, "y": 2}, + {"matrix": [8, 0], "x": 15.5, "y": 2, "w": 1.5}, - {"x":0, "y":3, "w":1.5}, - {"x":1.5, "y":3}, - {"x":2.5, "y":3}, - {"x":3.5, "y":3}, - {"x":4.5, "y":3}, - {"x":5.5, "y":3}, - {"x":6.75, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, - {"x":9.25, "y":3}, - {"x":10.5, "y":3}, - {"x":11.5, "y":3}, - {"x":12.5, "y":3}, - {"x":13.5, "y":3}, - {"x":14.5, "y":3}, - {"x":15.5, "y":3, "w":1.5}, + {"matrix": [9, 6], "x": 9.25, "y": 3}, + {"matrix": [9, 5], "x": 10.5, "y": 3}, + {"matrix": [9, 4], "x": 11.5, "y": 3}, + {"matrix": [9, 3], "x": 12.5, "y": 3}, + {"matrix": [9, 2], "x": 13.5, "y": 3}, + {"matrix": [9, 1], "x": 14.5, "y": 3}, + {"matrix": [9, 0], "x": 15.5, "y": 3, "w": 1.5}, - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4}, - {"x":2.5, "y":4}, - {"x":3.5, "y":4}, - {"x":4.5, "y":4}, - {"x":6, "y":4.5, "h":2}, - {"x":7, "y":4.5}, - {"x":7, "y":5.5}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2}, + {"matrix": [4, 6], "x": 7, "y": 4.5}, + {"matrix": [4, 7], "x": 7, "y": 5.5}, - {"x":9, "y":5.5}, - {"x":9, "y":4.5}, - {"x":10, "y":4.5, "h":2}, - {"x":11.5, "y":4}, - {"x":12.5, "y":4}, - {"x":13.5, "y":4}, - {"x":14.5, "y":4}, - {"x":15.5, "y":4, "w":1.5}, + {"matrix": [10, 7], "x": 9, "y": 5.5}, + {"matrix": [10, 6], "x": 9, "y": 4.5}, + {"matrix": [10, 5], "x": 10, "y": 4.5, "h": 2}, + {"matrix": [10, 4], "x": 11.5, "y": 4}, + {"matrix": [10, 3], "x": 12.5, "y": 4}, + {"matrix": [10, 2], "x": 13.5, "y": 4}, + {"matrix": [10, 1], "x": 14.5, "y": 4}, + {"matrix": [10, 0], "x": 15.5, "y": 4, "w": 1.5}, - {"x":0, "y":7, "w":0.8, "h":0.8}, - {"x":0.8, "y":7, "w":0.8, "h":0.8}, - {"x":1.6, "y":7, "w":0.8, "h":0.8}, - {"x":2.4, "y":7, "w":0.8, "h":0.8}, - {"x":3.2, "y":7, "w":0.8, "h":0.8}, - {"x":4, "y":7, "w":0.8, "h":0.8}, + {"matrix": [5, 0], "x": 0, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [5, 1], "x": 0.8, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [5, 2], "x": 1.6, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [5, 3], "x": 2.4, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [5, 4], "x": 3.2, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [5, 5], "x": 4, "y": 7, "w": 0.8, "h": 0.8}, - {"x":12.2, "y":7, "w":0.8, "h":0.8}, - {"x":13, "y":7, "w":0.8, "h":0.8}, - {"x":13.8, "y":7, "w":0.8, "h":0.8}, - {"x":14.6, "y":7, "w":0.8, "h":0.8}, - {"x":15.4, "y":7, "w":0.8, "h":0.8}, - {"x":16.2, "y":7, "w":0.8, "h":0.8}, + {"matrix": [11, 0], "x": 12.2, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [11, 1], "x": 13, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [11, 2], "x": 13.8, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [11, 3], "x": 14.6, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [11, 4], "x": 15.4, "y": 7, "w": 0.8, "h": 0.8}, + {"matrix": [11, 5], "x": 16.2, "y": 7, "w": 0.8, "h": 0.8}, - {"x":0, "y":7.8, "w":0.8, "h":0.8}, - {"x":0.8, "y":7.8, "w":0.8, "h":0.8}, - {"x":1.6, "y":7.8, "w":0.8, "h":0.8}, - {"x":2.4, "y":7.8, "w":0.8, "h":0.8}, - {"x":3.2, "y":7.8, "w":0.8, "h":0.8}, + {"matrix": [0, 7], "x": 0, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [1, 7], "x": 0.8, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [2, 7], "x": 1.6, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [5, 6], "x": 2.4, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [5, 7], "x": 3.2, "y": 7.8, "w": 0.8, "h": 0.8}, - {"x":13, "y":7.8, "w":0.8, "h":0.8}, - {"x":13.8, "y":7.8, "w":0.8, "h":0.8}, - {"x":14.6, "y":7.8, "w":0.8, "h":0.8}, - {"x":15.4, "y":7.8, "w":0.8, "h":0.8}, - {"x":16.2, "y":7.8, "w":0.8, "h":0.8} + {"matrix": [6, 7], "x": 13, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [7, 7], "x": 13.8, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [8, 7], "x": 14.6, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [11, 6], "x": 15.4, "y": 7.8, "w": 0.8, "h": 0.8}, + {"matrix": [11, 7], "x": 16.2, "y": 7.8, "w": 0.8, "h": 0.8} ] } } diff --git a/keyboards/rgbkb/sol3/rev1/rev1.h b/keyboards/rgbkb/sol3/rev1/rev1.h index e80f8c298d37..2ed720fcc3ea 100644 --- a/keyboards/rgbkb/sol3/rev1/rev1.h +++ b/keyboards/rgbkb/sol3/rev1/rev1.h @@ -11,57 +11,6 @@ #include "sol3.h" -// clang-format off -/* Blank ascii map to reuse, with labeled possible encoder positions, *rgb encoder only -┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┬──────┐ -│ │ │ │ │ │ │ E2 │ │ E5 │ │ │ │ │ │ │ -├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ -│ │ │ │ │ │ │ │ │ │ │ │ │ │ │ │ -├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ -│ │ │ │ │ │ │ E2 │ │ E5 │ │ │ │ │ │ │ -├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ ├──────┼──────┼──────┼──────┼──────┼──────┼──────┤ -│ │ │ │ E1 │ E1 │ │ E0* │ │ E3* │ │ E4 │ E4 │ │ │ │ -└──────┴──────┴──────┴──────┴──────┤ ├──────┤ ├──────┤ ├──────┴──────┴──────┴──────┴──────┘ - │ │ E0 │ │ E3 │ │ - └──────┴──────┘ └──────┴──────┘ -┌──────┬──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┬──────┐ -│ E0↑ │ E0↓ │ E1↑ │ E1↓ │ E2↑ │ E2↓ │ │ E3↑ │ E3↓ │ E4↑ │ E4↓ │ E5↑ │ E5↓ │ -└──────┴──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┴──────┘ -┌──────┬──────┬──────┬──────┬──────┐ ┌──────┬──────┬──────┬──────┬──────┐ -│ │ │ │ │ │ │ │ │ │ │ │ -└──────┴──────┴──────┴──────┴──────┘ └──────┴──────┴──────┴──────┴──────┘ -*/ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, L45, L46, L47, R40, R41, R42, R43, R44, R45, R46, R47, \ - \ - E0L, E0R, E1L, E1R, E2L, E2R, E3L, E3R, E4L, E4R, E5L, E5R, \ - LT0, LT1, LT2, LSL, LSR, RT0, RT1, RT2, RSL, RSR \ -) \ -{ \ - /* Left Half */ \ - { L00, L01, L02, L03, L04, L05, L06, LT0 }, \ - { L10, L11, L12, L13, L14, L15, L16, LT1 }, \ - { L20, L21, L22, L23, L24, L25, L26, LT2 }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, L46, L47 }, \ - { E0L, E0R, E1L, E1R, E2L, E2R, LSL, LSR }, \ - /* Right Half */ \ - { R06, R05, R04, R03, R02, R01, R00, RT0 }, \ - { R16, R15, R14, R13, R12, R11, R10, RT1 }, \ - { R26, R25, R24, R23, R22, R21, R20, RT2 }, \ - { R36, R35, R34, R33, R32, R31, R30, KC_NO }, \ - { R47, R46, R45, R44, R43, R42, R41, R40 }, \ - { E3L, E3R, E4L, E4R, E5L, E5R, RSL, RSR } \ -} -// clang-format on - // weak functions overridable by the user void render_layer_status(void); void render_leds_status(void); diff --git a/keyboards/rgbkb/zen/rev1/info.json b/keyboards/rgbkb/zen/rev1/info.json index 013b56764fe5..940df081c96d 100644 --- a/keyboards/rgbkb/zen/rev1/info.json +++ b/keyboards/rgbkb/zen/rev1/info.json @@ -23,7 +23,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0.5, "y":0}, {"label":"k01", "x":1.5, "y":0}, {"label":"k02", "x":2.5, "y":0}, {"label":"k03", "x":3.5, "y":0}, {"label":"k04", "x":4.5, "y":0}, {"label":"k05", "x":5.5, "y":0}, {"label":"k55", "x":10.5, "y":0}, {"label":"k54", "x":11.5, "y":0}, {"label":"k53", "x":12.5, "y":0}, {"label":"k52", "x":13.5, "y":0}, {"label":"k51", "x":14.5, "y":0}, {"label":"k50", "x":15.5, "y":0}, {"label":"k10", "x":0, "y":1, "w":1.5}, {"label":"k11", "x":1.5, "y":1}, {"label":"k12", "x":2.5, "y":1}, {"label":"k13", "x":3.5, "y":1}, {"label":"k14", "x":4.5, "y":1}, {"label":"k15", "x":5.5, "y":1}, {"label":"k65", "x":10.5, "y":1}, {"label":"k64", "x":11.5, "y":1}, {"label":"k63", "x":12.5, "y":1}, {"label":"k62", "x":13.5, "y":1}, {"label":"k61", "x":14.5, "y":1}, {"label":"k60", "x":15.5, "y":1, "w":1.5}, {"label":"k20", "x":0, "y":2, "w":1.5}, {"label":"k21", "x":1.5, "y":2}, {"label":"k22", "x":2.5, "y":2}, {"label":"k23", "x":3.5, "y":2}, {"label":"k24", "x":4.5, "y":2}, {"label":"k25", "x":5.5, "y":2}, {"label":"k75", "x":10.5, "y":2}, {"label":"k74", "x":11.5, "y":2}, {"label":"k73", "x":12.5, "y":2}, {"label":"k72", "x":13.5, "y":2}, {"label":"k71", "x":14.5, "y":2}, {"label":"k70", "x":15.5, "y":2, "w":1.5}, {"label":"k30", "x":0, "y":3, "w":1.5}, {"label":"k31", "x":1.5, "y":3}, {"label":"k32", "x":2.5, "y":3}, {"label":"k33", "x":3.5, "y":3}, {"label":"k34", "x":4.5, "y":3}, {"label":"k35", "x":5.5, "y":3}, {"label":"k85", "x":10.5, "y":3}, {"label":"k84", "x":11.5, "y":3}, {"label":"k83", "x":12.5, "y":3}, {"label":"k82", "x":13.5, "y":3}, {"label":"k81", "x":14.5, "y":3}, {"label":"k80", "x":15.5, "y":3, "w":1.5}, {"label":"k40", "x":0, "y":4, "w":1.5}, {"label":"k41", "x":1.5, "y":4}, {"label":"k42", "x":2.5, "y":4}, {"label":"k43", "x":3.5, "y":4}, {"label":"k44", "x":4.5, "y":4}, {"label":"k45", "x":6, "y":4.5, "h":2}, {"label":"k46", "x":7, "y":4.5, "h":2}, {"label":"k96", "x":9, "y":4.5, "h":2}, {"label":"k95", "x":10, "y":4.5, "h":2}, {"label":"k94", "x":11.5, "y":4}, {"label":"k93", "x":12.5, "y":4}, {"label":"k92", "x":13.5, "y":4}, {"label":"k91", "x":14.5, "y":4}, {"label":"k90", "x":15.5, "y":4, "w":1.5}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [5, 5], "x": 10.5, "y": 0}, + {"matrix": [5, 4], "x": 11.5, "y": 0}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0}, + {"matrix": [5, 1], "x": 14.5, "y": 0}, + {"matrix": [5, 0], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 5], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1}, + {"matrix": [6, 1], "x": 14.5, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + + {"matrix": [7, 5], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2}, + {"matrix": [7, 1], "x": 14.5, "y": 2}, + {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + + {"matrix": [8, 5], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3}, + {"matrix": [8, 1], "x": 14.5, "y": 3}, + {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 6, "y": 4.5, "h": 2}, + {"matrix": [4, 6], "x": 7, "y": 4.5, "h": 2}, + + {"matrix": [9, 6], "x": 9, "y": 4.5, "h": 2}, + {"matrix": [9, 5], "x": 10, "y": 4.5, "h": 2}, + {"matrix": [9, 4], "x": 11.5, "y": 4}, + {"matrix": [9, 3], "x": 12.5, "y": 4}, + {"matrix": [9, 2], "x": 13.5, "y": 4}, + {"matrix": [9, 1], "x": 14.5, "y": 4}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/rgbkb/zen/rev1/rev1.h b/keyboards/rgbkb/zen/rev1/rev1.h deleted file mode 100644 index 3b437c459ca9..000000000000 --- a/keyboards/rgbkb/zen/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ - k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ - k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ - k30, k31, k32, k33, k34, k35, k85, k84, k83, k82, k81, k80, \ - k40, k41, k42, k43, k44, k45, k46, k96, k95, k94, k93, k92, k91, k90 \ - ) \ - { \ - { k00, k01, k02, k03, k04, k05, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { k50, k51, k52, k53, k54, k55, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, KC_NO }, \ - { k70, k71, k72, k73, k74, k75, KC_NO }, \ - { k80, k81, k82, k83, k84, k85, KC_NO }, \ - { k90, k91, k92, k93, k94, k95, k96 } \ - } diff --git a/keyboards/rgbkb/zen/rev2/info.json b/keyboards/rgbkb/zen/rev2/info.json index ef91fd30d18d..eed39e56287a 100644 --- a/keyboards/rgbkb/zen/rev2/info.json +++ b/keyboards/rgbkb/zen/rev2/info.json @@ -29,354 +29,85 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "k00", - "x": 0.5, - "y": 0 - }, - { - "label": "k01", - "x": 1.5, - "y": 0 - }, - { - "label": "k02", - "x": 2.5, - "y": 0 - }, - { - "label": "k03", - "x": 3.5, - "y": 0 - }, - { - "label": "k04", - "x": 4.5, - "y": 0 - }, - { - "label": "k05", - "x": 5.5, - "y": 0 - }, - { - "label": "k55", - "x": 10.5, - "y": 0 - }, - { - "label": "k54", - "x": 11.5, - "y": 0 - }, - { - "label": "k53", - "x": 12.5, - "y": 0 - }, - { - "label": "k52", - "x": 13.5, - "y": 0 - }, - { - "label": "k51", - "x": 14.5, - "y": 0 - }, - { - "label": "k50", - "x": 15.5, - "y": 0 - }, - { - "label": "k10", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "k11", - "x": 1.5, - "y": 1 - }, - { - "label": "k12", - "x": 2.5, - "y": 1 - }, - { - "label": "k13", - "x": 3.5, - "y": 1 - }, - { - "label": "k14", - "x": 4.5, - "y": 1 - }, - { - "label": "k15", - "x": 5.5, - "y": 1 - }, - { - "label": "k65", - "x": 10.5, - "y": 1 - }, - { - "label": "k64", - "x": 11.5, - "y": 1 - }, - { - "label": "k63", - "x": 12.5, - "y": 1 - }, - { - "label": "k62", - "x": 13.5, - "y": 1 - }, - { - "label": "k61", - "x": 14.5, - "y": 1 - }, - { - "label": "k60", - "x": 15.5, - "y": 1, - "w": 1.5 - }, - { - "label": "k20", - "x": 0, - "y": 2, - "w": 1.5 - }, - { - "label": "k21", - "x": 1.5, - "y": 2 - }, - { - "label": "k22", - "x": 2.5, - "y": 2 - }, - { - "label": "k23", - "x": 3.5, - "y": 2 - }, - { - "label": "k24", - "x": 4.5, - "y": 2 - }, - { - "label": "k25", - "x": 5.5, - "y": 2 - }, - { - "label": "k75", - "x": 10.5, - "y": 2 - }, - { - "label": "k74", - "x": 11.5, - "y": 2 - }, - { - "label": "k73", - "x": 12.5, - "y": 2 - }, - { - "label": "k72", - "x": 13.5, - "y": 2 - }, - { - "label": "k71", - "x": 14.5, - "y": 2 - }, - { - "label": "k70", - "x": 15.5, - "y": 2, - "w": 1.5 - }, - { - "label": "k30", - "x": 0, - "y": 3, - "w": 1.5 - }, - { - "label": "k31", - "x": 1.5, - "y": 3 - }, - { - "label": "k32", - "x": 2.5, - "y": 3 - }, - { - "label": "k33", - "x": 3.5, - "y": 3 - }, - { - "label": "k34", - "x": 4.5, - "y": 3 - }, - { - "label": "k35", - "x": 5.5, - "y": 3 - }, - { - "label": "k16", - "x": 6.5, - "y": 3 - }, - { - "label": "k66", - "x": 9.5, - "y": 3 - }, - { - "label": "k85", - "x": 10.5, - "y": 3 - }, - { - "label": "k84", - "x": 11.5, - "y": 3 - }, - { - "label": "k83", - "x": 12.5, - "y": 3 - }, - { - "label": "k82", - "x": 13.5, - "y": 3 - }, - { - "label": "k81", - "x": 14.5, - "y": 3 - }, - { - "label": "k80", - "x": 15.5, - "y": 3, - "w": 1.5 - }, - { - "label": "k40", - "x": 0, - "y": 4, - "w": 1.5 - }, - { - "label": "k41", - "x": 1.5, - "y": 4 - }, - { - "label": "k42", - "x": 2.5, - "y": 4 - }, - { - "label": "k43", - "x": 3.5, - "y": 4 - }, - { - "label": "k44", - "x": 4.5, - "y": 4 - }, - { - "label": "k36", - "x": 6, - "y": 4.5 - }, - { - "label": "k26", - "x": 7, - "y": 4.5 - }, - { - "label": "k76", - "x": 9, - "y": 4.5 - }, - { - "label": "k86", - "x": 10, - "y": 4.5 - }, - { - "label": "k94", - "x": 11.5, - "y": 4 - }, - { - "label": "k93", - "x": 12.5, - "y": 4 - }, - { - "label": "k92", - "x": 13.5, - "y": 4 - }, - { - "label": "k91", - "x": 14.5, - "y": 4 - }, - { - "label": "k90", - "x": 15.5, - "y": 4, - "w": 1.5 - }, - { - "label": "k45", - "x": 6, - "y": 5.5 - }, - { - "label": "k46", - "x": 7, - "y": 5.5 - }, - { - "label": "k96", - "x": 9, - "y": 5.5 - }, - { - "label": "k95", - "x": 10, - "y": 5.5 - } + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [5, 5], "x": 10.5, "y": 0}, + {"matrix": [5, 4], "x": 11.5, "y": 0}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0}, + {"matrix": [5, 1], "x": 14.5, "y": 0}, + {"matrix": [5, 0], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 5], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1}, + {"matrix": [6, 1], "x": 14.5, "y": 1}, + {"matrix": [6, 0], "x": 15.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + + {"matrix": [7, 5], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2}, + {"matrix": [7, 1], "x": 14.5, "y": 2}, + {"matrix": [7, 0], "x": 15.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [1, 6], "x": 6.5, "y": 3}, + + {"matrix": [6, 6], "x": 9.5, "y": 3}, + {"matrix": [8, 5], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3}, + {"matrix": [8, 1], "x": 14.5, "y": 3}, + {"matrix": [8, 0], "x": 15.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + + {"matrix": [3, 6], "x": 6, "y": 4.5}, + {"matrix": [2, 6], "x": 7, "y": 4.5}, + {"matrix": [7, 6], "x": 9, "y": 4.5}, + {"matrix": [8, 6], "x": 10, "y": 4.5}, + + {"matrix": [9, 4], "x": 11.5, "y": 4}, + {"matrix": [9, 3], "x": 12.5, "y": 4}, + {"matrix": [9, 2], "x": 13.5, "y": 4}, + {"matrix": [9, 1], "x": 14.5, "y": 4}, + {"matrix": [9, 0], "x": 15.5, "y": 4, "w": 1.5}, + + {"matrix": [4, 5], "x": 6, "y": 5.5}, + {"matrix": [4, 6], "x": 7, "y": 5.5}, + {"matrix": [9, 6], "x": 9, "y": 5.5}, + {"matrix": [9, 5], "x": 10, "y": 5.5} ] } } diff --git a/keyboards/rgbkb/zen/rev2/rev2.c b/keyboards/rgbkb/zen/rev2/rev2.c index 70e55316739e..4c308264d679 100644 --- a/keyboards/rgbkb/zen/rev2/rev2.c +++ b/keyboards/rgbkb/zen/rev2/rev2.c @@ -1,4 +1,4 @@ -#include "rev2.h" +#include "quantum.h" #ifdef OLED_ENABLE #include "split_util.h" diff --git a/keyboards/rgbkb/zen/rev2/rev2.h b/keyboards/rgbkb/zen/rev2/rev2.h deleted file mode 100644 index c7a06d176775..000000000000 --- a/keyboards/rgbkb/zen/rev2/rev2.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k55, k54, k53, k52, k51, k50, \ - k10, k11, k12, k13, k14, k15, k65, k64, k63, k62, k61, k60, \ - k20, k21, k22, k23, k24, k25, k75, k74, k73, k72, k71, k70, \ - k30, k31, k32, k33, k34, k35, k16, k66, k85, k84, k83, k82, k81, k80, \ - k40, k41, k42, k43, k44, k36, k26, k76, k86, k94, k93, k92, k91, k90, \ - k45, k46, k96, k95 \ - ) \ - { \ - { k00, k01, k02, k03, k04, k05, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { k50, k51, k52, k53, k54, k55, KC_NO }, \ - { k60, k61, k62, k63, k64, k65, k66 }, \ - { k70, k71, k72, k73, k74, k75, k76 }, \ - { k80, k81, k82, k83, k84, k85, k86 }, \ - { k90, k91, k92, k93, k94, k95, k96 } \ - } diff --git a/keyboards/ristretto/info.json b/keyboards/ristretto/info.json index 5906cc9f1468..3853accd9b76 100644 --- a/keyboards/ristretto/info.json +++ b/keyboards/ristretto/info.json @@ -23,58 +23,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0.25}, - {"label":"Q", "x":1, "y":0.25}, - {"label":"W", "x":2, "y":0.25}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.25}, - {"label":"T", "x":5, "y":0.25}, - {"label":"Y", "x":9, "y":0.25}, - {"label":"U", "x":10, "y":0.25}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.25}, - {"label":"P", "x":13, "y":0.25}, - {"label":"BKSP", "x":14, "y":0.25}, + {"matrix": [0, 0], "x": 0, "y": 0.25}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, - {"label":"TAB", "x":0, "y":1.25}, - {"label":"A", "x":1, "y":1.25}, - {"label":"S", "x":2, "y":1.25}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.25}, - {"label":"G", "x":5, "y":1.25}, - {"label":"H", "x":9, "y":1.25}, - {"label":"J", "x":10, "y":1.25}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.25}, - {"label":";", "x":13, "y":1.25}, - {"label":"'", "x":14, "y":1.25}, + {"matrix": [0, 7], "x": 9, "y": 0.25}, + {"matrix": [0, 8], "x": 10, "y": 0.25}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0.25}, + {"matrix": [0, 11], "x": 13, "y": 0.25}, + {"matrix": [0, 12], "x": 14, "y": 0.25}, - {"label":"LSFT", "x":0, "y":2.25}, - {"label":"Z", "x":1, "y":2.25}, - {"label":"X", "x":2, "y":2.25}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.25}, - {"label":"B", "x":5, "y":2.25}, - {"label":"N", "x":9, "y":2.25}, - {"label":"M", "x":10, "y":2.25}, - {"label":"<", "x":11, "y":2}, - {"label":">", "x":12, "y":2.25}, - {"label":"?", "x":13, "y":2.25}, - {"label":"ENTR", "x":14, "y":2.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}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"label":"LCTL", "x":0, "y":3.25}, - {"label":"LGUI", "x":1, "y":3.25}, - {"label":"LALT", "x":2, "y":3.25}, - {"label":"LOWER", "x":3, "y":3, "h":1.25}, - {"label":"Enter", "x":4, "y":3.25}, - {"label":"SPACE", "x":5, "y":3.25, "w":1.5}, - {"label":"Rotary", "x":7, "y":3.25}, - {"label":"SPACE", "x":8.5, "y":3.25, "w":1.5}, - {"label":"SHIFT", "x":10, "y":3.25}, - {"label":"RAISE", "x":11, "y":3, "h":1.25}, - {"label":"RALT", "x":12, "y":3.25}, - {"label":"RGUI", "x":13, "y":3.25}, - {"label":"RCTL", "x":14, "y":3.25} + {"matrix": [1, 7], "x": 9, "y": 1.25}, + {"matrix": [1, 8], "x": 10, "y": 1.25}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1.25}, + {"matrix": [1, 11], "x": 13, "y": 1.25}, + {"matrix": [1, 12], "x": 14, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [2, 7], "x": 9, "y": 2.25}, + {"matrix": [2, 8], "x": 10, "y": 2.25}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2.25}, + {"matrix": [2, 11], "x": 13, "y": 2.25}, + {"matrix": [2, 12], "x": 14, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 1.25}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.25, "w": 1.5}, + + {"matrix": [3, 6], "x": 7, "y": 3.25}, + + {"matrix": [3, 7], "x": 8.5, "y": 3.25, "w": 1.5}, + {"matrix": [3, 8], "x": 10, "y": 3.25}, + {"matrix": [3, 9], "x": 11, "y": 3, "h": 1.25}, + {"matrix": [3, 10], "x": 12, "y": 3.25}, + {"matrix": [3, 11], "x": 13, "y": 3.25}, + {"matrix": [3, 12], "x": 14, "y": 3.25} ] } } diff --git a/keyboards/ristretto/ristretto.c b/keyboards/ristretto/ristretto.c index d004b3dffe34..1d4ed69d0f2e 100644 --- a/keyboards/ristretto/ristretto.c +++ b/keyboards/ristretto/ristretto.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "ristretto.h" +#include "quantum.h" enum layers { _BASE, diff --git a/keyboards/ristretto/ristretto.h b/keyboards/ristretto/ristretto.h deleted file mode 100644 index 66be57b18ba0..000000000000 --- a/keyboards/ristretto/ristretto.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Brandon Lewis - * - * 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( \ - K000, K001, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, \ - K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312 \ -) { \ - {K000, K001, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012}, \ - {K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112}, \ - {K200, K201, K202, K203, K204, K205, KC_NO, K207, K208, K209, K210, K211, K212}, \ - {K300, K301, K302, K303, K304, K305, K306 , K307, K308, K309, K310, K311, K312} \ -} diff --git a/keyboards/rominronin/katana60/rev1/info.json b/keyboards/rominronin/katana60/rev1/info.json index 8f91d5863ea3..f3e827cf85a9 100644 --- a/keyboards/rominronin/katana60/rev1/info.json +++ b/keyboards/rominronin/katana60/rev1/info.json @@ -18,76 +18,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k40", "x":0, "y":0}, - {"label":"k41", "x":1, "y":0}, - {"label":"k42", "x":2, "y":0}, - {"label":"k43", "x":3, "y":0}, - {"label":"k44", "x":4, "y":0}, - {"label":"k45", "x":5, "y":0}, - {"label":"k46", "x":6, "y":0}, - {"label":"k47", "x":7, "y":0}, - {"label":"k48", "x":8, "y":0}, - {"label":"k49", "x":9, "y":0}, - {"label":"k4a", "x":10, "y":0}, - {"label":"k4b", "x":11, "y":0}, - {"label":"k4c", "x":12, "y":0}, - {"label":"k4d", "x":13, "y":0}, - {"label":"k4e", "x":14, "y":0}, - {"label":"k30", "x":0, "y":1, "w":1.5}, - {"label":"k31", "x":1.5, "y":1}, - {"label":"k32", "x":2.5, "y":1}, - {"label":"k33", "x":3.5, "y":1}, - {"label":"k34", "x":4.5, "y":1}, - {"label":"k35", "x":5.5, "y":1}, - {"label":"k36", "x":6.5, "y":1}, - {"label":"k37", "x":7.5, "y":1}, - {"label":"k38", "x":8.5, "y":1}, - {"label":"k39", "x":9.5, "y":1}, - {"label":"k3a", "x":10.5, "y":1}, - {"label":"k3b", "x":11.5, "y":1}, - {"label":"k3c", "x":12.5, "y":1}, - {"label":"k3d", "x":13.5, "y":1, "w":1.5}, - {"label":"k20", "x":0, "y":2, "w":1.25}, - {"label":"k21", "x":1.25, "y":2}, - {"label":"k22", "x":2.25, "y":2}, - {"label":"k23", "x":3.25, "y":2}, - {"label":"k24", "x":4.25, "y":2}, - {"label":"k25", "x":5.25, "y":2}, - {"label":"k26", "x":6.25, "y":2}, - {"label":"k27", "x":7.75, "y":2}, - {"label":"k28", "x":8.75, "y":2}, - {"label":"k29", "x":9.75, "y":2}, - {"label":"k2a", "x":10.75, "y":2}, - {"label":"k2b", "x":11.75, "y":2}, - {"label":"k2c", "x":12.75, "y":2}, - {"label":"k2d", "x":13.75, "y":2, "w":1.25}, - {"label":"k10", "x":0, "y":3}, - {"label":"k11", "x":1, "y":3}, - {"label":"k12", "x":2, "y":3}, - {"label":"k13", "x":3, "y":3}, - {"label":"k14", "x":4, "y":3}, - {"label":"k15", "x":5, "y":3}, - {"label":"k16", "x":6, "y":3}, - {"label":"k17", "x":7, "y":3}, - {"label":"k18", "x":8, "y":3}, - {"label":"k19", "x":9, "y":3}, - {"label":"k1a", "x":10, "y":3}, - {"label":"k1b", "x":11, "y":3}, - {"label":"k1c", "x":12, "y":3}, - {"label":"k1d", "x":13, "y":3}, - {"label":"k1e", "x":14, "y":3}, - {"label":"k00", "x":0, "y":4}, - {"label":"k01", "x":1, "y":4, "w":1.25}, - {"label":"k02", "x":2.25, "y":4, "w":1.25}, - {"label":"k03", "x":3.5, "y":4, "w":1.25}, - {"label":"k04", "x":4.75, "y":4, "w":2.25}, - {"label":"k05", "x":7, "y":4}, - {"label":"k06", "x":8, "y":4, "w":2}, - {"label":"k09", "x":10, "y":4}, - {"label":"k0a", "x":11, "y":4}, - {"label":"k0b", "x":12, "y":4}, - {"label":"k0c", "x":13, "y":4}, - {"label":"k0d", "x":14, "y":4} + {"matrix": [4, 0], "x": 0, "y": 0}, + {"matrix": [4, 1], "x": 1, "y": 0}, + {"matrix": [4, 2], "x": 2, "y": 0}, + {"matrix": [4, 3], "x": 3, "y": 0}, + {"matrix": [4, 4], "x": 4, "y": 0}, + {"matrix": [4, 5], "x": 5, "y": 0}, + {"matrix": [4, 6], "x": 6, "y": 0}, + {"matrix": [4, 7], "x": 7, "y": 0}, + {"matrix": [4, 8], "x": 8, "y": 0}, + {"matrix": [4, 9], "x": 9, "y": 0}, + {"matrix": [4, 10], "x": 10, "y": 0}, + {"matrix": [4, 11], "x": 11, "y": 0}, + {"matrix": [4, 12], "x": 12, "y": 0}, + {"matrix": [4, 13], "x": 13, "y": 0}, + {"matrix": [4, 14], "x": 14, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 1}, + {"matrix": [3, 2], "x": 2.5, "y": 1}, + {"matrix": [3, 3], "x": 3.5, "y": 1}, + {"matrix": [3, 4], "x": 4.5, "y": 1}, + {"matrix": [3, 5], "x": 5.5, "y": 1}, + {"matrix": [3, 6], "x": 6.5, "y": 1}, + {"matrix": [3, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 8], "x": 8.5, "y": 1}, + {"matrix": [3, 9], "x": 9.5, "y": 1}, + {"matrix": [3, 10], "x": 10.5, "y": 1}, + {"matrix": [3, 11], "x": 11.5, "y": 1}, + {"matrix": [3, 12], "x": 12.5, "y": 1}, + {"matrix": [3, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 3}, + {"matrix": [1, 1], "x": 1, "y": 3}, + {"matrix": [1, 2], "x": 2, "y": 3}, + {"matrix": [1, 3], "x": 3, "y": 3}, + {"matrix": [1, 4], "x": 4, "y": 3}, + {"matrix": [1, 5], "x": 5, "y": 3}, + {"matrix": [1, 6], "x": 6, "y": 3}, + {"matrix": [1, 7], "x": 7, "y": 3}, + {"matrix": [1, 8], "x": 8, "y": 3}, + {"matrix": [1, 9], "x": 9, "y": 3}, + {"matrix": [1, 10], "x": 10, "y": 3}, + {"matrix": [1, 11], "x": 11, "y": 3}, + {"matrix": [1, 12], "x": 12, "y": 3}, + {"matrix": [1, 13], "x": 13, "y": 3}, + {"matrix": [1, 14], "x": 14, "y": 3}, + + {"matrix": [0, 0], "x": 0, "y": 4}, + {"matrix": [0, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [0, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [0, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [0, 4], "x": 4.75, "y": 4, "w": 2.25}, + {"matrix": [0, 5], "x": 7, "y": 4}, + {"matrix": [0, 6], "x": 8, "y": 4, "w": 2}, + {"matrix": [0, 9], "x": 10, "y": 4}, + {"matrix": [0, 10], "x": 11, "y": 4}, + {"matrix": [0, 11], "x": 12, "y": 4}, + {"matrix": [0, 12], "x": 13, "y": 4}, + {"matrix": [0, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/rominronin/katana60/rev1/rev1.h b/keyboards/rominronin/katana60/rev1/rev1.h deleted file mode 100644 index 52926cc35e00..000000000000 --- a/keyboards/rominronin/katana60/rev1/rev1.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2017 Baris Tosun - * - * 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" - -// This a shortcut to help you visually see your layout. -// The following is an example using the Planck MIT layout -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \ - k00, k01, k02, k03, k04, k05, k06, k09, k0a, k0b, k0c, k0d \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, KC_NO, KC_NO, k09, k0a, k0b, k0c, k0d, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ -} diff --git a/keyboards/roseslite/info.json b/keyboards/roseslite/info.json index 69766a6d8ba4..0d8931301c67 100644 --- a/keyboards/roseslite/info.json +++ b/keyboards/roseslite/info.json @@ -18,93 +18,93 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "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": 16, "y": 0}, - {"x": 17, "y": 0}, - - {"x": 18.5, "y": 0}, - - {"x": 0, "y": 1}, - - {"x": 1.5, "y": 1, "w": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "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}, - {"x": 14.5, "y": 1}, - {"x": 15.5, "y": 1}, - {"x": 16.5, "y": 1, "w": 1.5}, - - {"x": 18.5, "y": 1}, - - {"x": 0, "y": 2}, - - {"x": 1.5, "y": 2, "w": 1.75}, - {"x": 3.25, "y": 2}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "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}, - {"x": 14.75, "y": 2}, - {"x": 15.75, "y": 2, "w": 2.25}, - - {"x": 18.5, "y": 2}, - - {"x": 1.5, "y": 3, "w": 2}, - {"x": 3.5, "y": 3}, - {"x": 4.5, "y": 3}, - {"x": 5.5, "y": 3}, - {"x": 6.5, "y": 3}, - {"x": 7.5, "y": 3}, - - {"x": 10.25, "y": 3}, - {"x": 11.25, "y": 3}, - {"x": 12.25, "y": 3}, - {"x": 13.25, "y": 3}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3, "w": 1.75}, - - {"x": 17.5, "y": 3}, - - {"x": 1.5, "y": 4, "w": 1.25}, - {"x": 3.75, "y": 4, "w": 1.25}, - {"x": 5, "y": 4, "w": 2.75}, - {"x": 7.75, "y": 4}, - - {"x": 10.25, "y": 4, "w": 2.75}, - {"x": 13, "y": 4, "w": 1.25}, - - {"x": 16.5, "y": 4}, - {"x": 17.5, "y": 4}, - {"x": 18.5, "y": 4} + {"matrix": [4, 0], "x": 0, "y": 0}, + + {"matrix": [0, 0], "x": 1.5, "y": 0}, + {"matrix": [0, 1], "x": 2.5, "y": 0}, + {"matrix": [0, 2], "x": 3.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + + {"matrix": [0, 7], "x": 10, "y": 0}, + {"matrix": [0, 8], "x": 11, "y": 0}, + {"matrix": [0, 9], "x": 12, "y": 0}, + {"matrix": [0, 10], "x": 13, "y": 0}, + {"matrix": [0, 11], "x": 14, "y": 0}, + {"matrix": [0, 12], "x": 15, "y": 0}, + {"matrix": [0, 13], "x": 16, "y": 0}, + {"matrix": [0, 14], "x": 17, "y": 0}, + + {"matrix": [1, 14], "x": 18.5, "y": 0}, + + {"matrix": [4, 1], "x": 0, "y": 1}, + + {"matrix": [1, 0], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1}, + {"matrix": [1, 3], "x": 5, "y": 1}, + {"matrix": [1, 4], "x": 6, "y": 1}, + {"matrix": [1, 5], "x": 7, "y": 1}, + + {"matrix": [1, 6], "x": 9.5, "y": 1}, + {"matrix": [1, 7], "x": 10.5, "y": 1}, + {"matrix": [1, 8], "x": 11.5, "y": 1}, + {"matrix": [1, 9], "x": 12.5, "y": 1}, + {"matrix": [1, 10], "x": 13.5, "y": 1}, + {"matrix": [1, 11], "x": 14.5, "y": 1}, + {"matrix": [1, 12], "x": 15.5, "y": 1}, + {"matrix": [1, 13], "x": 16.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 18.5, "y": 1}, + + {"matrix": [4, 2], "x": 0, "y": 2}, + + {"matrix": [2, 0], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 3.25, "y": 2}, + {"matrix": [2, 2], "x": 4.25, "y": 2}, + {"matrix": [2, 3], "x": 5.25, "y": 2}, + {"matrix": [2, 4], "x": 6.25, "y": 2}, + {"matrix": [2, 5], "x": 7.25, "y": 2}, + + {"matrix": [2, 6], "x": 9.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [2, 8], "x": 11.75, "y": 2}, + {"matrix": [2, 9], "x": 12.75, "y": 2}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + {"matrix": [2, 11], "x": 14.75, "y": 2}, + {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 18.5, "y": 2}, + + {"matrix": [3, 0], "x": 1.5, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 3.5, "y": 3}, + {"matrix": [3, 2], "x": 4.5, "y": 3}, + {"matrix": [3, 3], "x": 5.5, "y": 3}, + {"matrix": [3, 4], "x": 6.5, "y": 3}, + {"matrix": [3, 5], "x": 7.5, "y": 3}, + + {"matrix": [3, 6], "x": 10.25, "y": 3}, + {"matrix": [3, 7], "x": 11.25, "y": 3}, + {"matrix": [3, 8], "x": 12.25, "y": 3}, + {"matrix": [3, 9], "x": 13.25, "y": 3}, + {"matrix": [3, 10], "x": 14.25, "y": 3}, + {"matrix": [3, 11], "x": 15.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 17.5, "y": 3}, + + {"matrix": [4, 5], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 5, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 7.75, "y": 4}, + + {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 2.75}, + {"matrix": [4, 11], "x": 13, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 16.5, "y": 4}, + {"matrix": [4, 13], "x": 17.5, "y": 4}, + {"matrix": [4, 14], "x": 18.5, "y": 4} ] } } diff --git a/keyboards/roseslite/roseslite.h b/keyboards/roseslite/roseslite.h deleted file mode 100644 index 1fcaaffa13b3..000000000000 --- a/keyboards/roseslite/roseslite.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 vk2fgav - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define XXX KC_NO -#define LAYOUT( \ - k40, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \ - k41, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \ - k42, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, \ - k45, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E }, \ - { k40, k41, k42, XXX, XXX, k45, XXX, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/rpiguy9907/southpaw66/info.json b/keyboards/rpiguy9907/southpaw66/info.json index c16624d8edee..3cebdcb4a8c0 100644 --- a/keyboards/rpiguy9907/southpaw66/info.json +++ b/keyboards/rpiguy9907/southpaw66/info.json @@ -20,73 +20,79 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [ - {"label":"Insert", "x":0, "y":0}, - {"label":"Esc", "x":1.5, "y":0}, - {"label":"1", "x":2.5, "y":0}, - {"label":"2", "x":3.5, "y":0}, - {"label":"3", "x":4.5, "y":0}, - {"label":"4", "x":5.5, "y":0}, - {"label":"5", "x":6.5, "y":0}, - {"label":"6", "x":7.5, "y":0}, - {"label":"7", "x":8.5, "y":0}, - {"label":"8", "x":9.5, "y":0}, - {"label":"9", "x":10.5, "y":0}, - {"label":"0", "x":11.5, "y":0}, - {"label":"-", "x":12.5, "y":0}, - {"label":"=", "x":13.5, "y":0}, - {"label":"Backspace", "x":14.5, "y":0, "w":2}, - {"label":"Delete", "x":0, "y":1}, - {"label":"Tab", "x":1.5, "y":1, "w":1.5}, - {"label":"Q", "x":3, "y":1}, - {"label":"W", "x":4, "y":1}, - {"label":"E", "x":5, "y":1}, - {"label":"R", "x":6, "y":1}, - {"label":"T", "x":7, "y":1}, - {"label":"Y", "x":8, "y":1}, - {"label":"U", "x":9, "y":1}, - {"label":"I", "x":10, "y":1}, - {"label":"O", "x":11, "y":1}, - {"label":"P", "x":12, "y":1}, - {"label":"[", "x":13, "y":1}, - {"label":"]", "x":14, "y":1}, - {"label":"|", "x":15, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75}, - {"label":"A", "x":3.25, "y":2}, - {"label":"S", "x":4.25, "y":2}, - {"label":"D", "x":5.25, "y":2}, - {"label":"F", "x":6.25, "y":2}, - {"label":"G", "x":7.25, "y":2}, - {"label":"H", "x":8.25, "y":2}, - {"label":"J", "x":9.25, "y":2}, - {"label":"K", "x":10.25, "y":2}, - {"label":"L", "x":11.25, "y":2}, - {"label":":", "x":12.25, "y":2}, - {"label":"\"", "x":13.25, "y":2}, - {"label":"Enter", "x":14.25, "y":2, "w":2.25}, - {"label":"Up", "x":1, "y":3}, - {"label":"Shift", "x":2, "y":3, "w":1.75}, - {"label":"Z", "x":3.75, "y":3}, - {"label":"X", "x":4.75, "y":3}, - {"label":"C", "x":5.75, "y":3}, - {"label":"V", "x":6.75, "y":3}, - {"label":"B", "x":7.75, "y":3}, - {"label":"N", "x":8.75, "y":3}, - {"label":"M", "x":9.75, "y":3}, - {"label":",", "x":10.75, "y":3}, - {"label":".", "x":11.75, "y":3}, - {"label":"/", "x":12.75, "y":3}, - {"label":"Shift", "x":13.75, "y":3, "w":2.75}, - {"label":"Left", "x":0, "y":4}, - {"label":"Down", "x":1, "y":4}, - {"label":"Right", "x":2, "y":4}, - {"label":"Ctrl", "x":3, "y":4, "w":1.5}, - {"label":"Alt", "x":4.5, "y":4}, - {"label":"Space", "x":5.5, "y":4, "w":7}, - {"label":"Win", "x":12.5, "y":4}, - {"label":"Alt", "x":13.5, "y":4, "w":1.5}, - {"label":"Ctrl", "x":15, "y":4, "w":1.5}] + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 1.5, "y": 0}, + {"matrix": [2, 0], "x": 2.5, "y": 0}, + {"matrix": [3, 0], "x": 3.5, "y": 0}, + {"matrix": [4, 0], "x": 4.5, "y": 0}, + {"matrix": [5, 0], "x": 5.5, "y": 0}, + {"matrix": [6, 0], "x": 6.5, "y": 0}, + {"matrix": [0, 1], "x": 7.5, "y": 0}, + {"matrix": [1, 1], "x": 8.5, "y": 0}, + {"matrix": [2, 1], "x": 9.5, "y": 0}, + {"matrix": [3, 1], "x": 10.5, "y": 0}, + {"matrix": [4, 1], "x": 11.5, "y": 0}, + {"matrix": [5, 1], "x": 12.5, "y": 0}, + {"matrix": [6, 1], "x": 13.5, "y": 0}, + {"matrix": [0, 2], "x": 14.5, "y": 0, "w": 2}, + + {"matrix": [1, 2], "x": 0, "y": 1}, + + {"matrix": [2, 2], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [3, 2], "x": 3, "y": 1}, + {"matrix": [4, 2], "x": 4, "y": 1}, + {"matrix": [5, 2], "x": 5, "y": 1}, + {"matrix": [6, 2], "x": 6, "y": 1}, + {"matrix": [0, 3], "x": 7, "y": 1}, + {"matrix": [1, 3], "x": 8, "y": 1}, + {"matrix": [2, 3], "x": 9, "y": 1}, + {"matrix": [3, 3], "x": 10, "y": 1}, + {"matrix": [4, 3], "x": 11, "y": 1}, + {"matrix": [5, 3], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [0, 4], "x": 14, "y": 1}, + {"matrix": [1, 4], "x": 15, "y": 1, "w": 1.5}, + + {"matrix": [2, 4], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [3, 4], "x": 3.25, "y": 2}, + {"matrix": [4, 4], "x": 4.25, "y": 2}, + {"matrix": [5, 4], "x": 5.25, "y": 2}, + {"matrix": [6, 4], "x": 6.25, "y": 2}, + {"matrix": [0, 5], "x": 7.25, "y": 2}, + {"matrix": [1, 5], "x": 8.25, "y": 2}, + {"matrix": [2, 5], "x": 9.25, "y": 2}, + {"matrix": [3, 5], "x": 10.25, "y": 2}, + {"matrix": [4, 5], "x": 11.25, "y": 2}, + {"matrix": [5, 5], "x": 12.25, "y": 2}, + {"matrix": [6, 5], "x": 13.25, "y": 2}, + {"matrix": [0, 6], "x": 14.25, "y": 2, "w": 2.25}, + + {"matrix": [1, 6], "x": 1, "y": 3}, + {"matrix": [2, 6], "x": 2, "y": 3, "w": 1.75}, + {"matrix": [3, 6], "x": 3.75, "y": 3}, + {"matrix": [4, 6], "x": 4.75, "y": 3}, + {"matrix": [5, 6], "x": 5.75, "y": 3}, + {"matrix": [6, 6], "x": 6.75, "y": 3}, + {"matrix": [0, 7], "x": 7.75, "y": 3}, + {"matrix": [1, 7], "x": 8.75, "y": 3}, + {"matrix": [2, 7], "x": 9.75, "y": 3}, + {"matrix": [3, 7], "x": 10.75, "y": 3}, + {"matrix": [4, 7], "x": 11.75, "y": 3}, + {"matrix": [5, 7], "x": 12.75, "y": 3}, + {"matrix": [6, 7], "x": 13.75, "y": 3, "w": 2.75}, + + {"matrix": [0, 8], "x": 0, "y": 4}, + {"matrix": [1, 8], "x": 1, "y": 4}, + {"matrix": [2, 8], "x": 2, "y": 4}, + {"matrix": [3, 8], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 8], "x": 4.5, "y": 4}, + {"matrix": [5, 8], "x": 5.5, "y": 4, "w": 7}, + {"matrix": [6, 8], "x": 12.5, "y": 4}, + {"matrix": [0, 9], "x": 13.5, "y": 4, "w": 1.5}, + {"matrix": [1, 9], "x": 15, "y": 4, "w": 1.5} + ] } } } diff --git a/keyboards/rpiguy9907/southpaw66/southpaw66.h b/keyboards/rpiguy9907/southpaw66/southpaw66.h deleted file mode 100644 index 11f1fc7e8f09..000000000000 --- a/keyboards/rpiguy9907/southpaw66/southpaw66.h +++ /dev/null @@ -1,37 +0,0 @@ - /* Copyright 2020 gooberpsycho - * - * 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" - -// The first section contains all of the arguments -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k00, k10, k20, k30, k40, k50, k60, k01, k11, k21, k31, k41, k51, k61, k02, \ - k12, k22, k32, k42, k52, k62, k03, k13, k23, k33, k43, k53, k63, k04, k14, \ - k24, k34, k44, k54, k64, k05, k15, k25, k35, k45, k55, k65, k06, \ - k16, k26, k36, k46, k56, k66, k07, k17, k27, k37, k47, k57, k67, \ - k08, k18, k28, k38, k48, k58, k68, k09, k19 \ -) \ -{ \ - {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09}, \ - {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19}, \ - {k20, k21, k22, k23, k24, k25, k26, k27, k28, KC_NO}, \ - {k30, k31, k32, k33, k34, k35, k36, k37, k38, KC_NO}, \ - {k40, k41, k42, k43, k44, k45, k46, k47, k48, KC_NO}, \ - {k50, k51, k52, k53, k54, k55, k56, k57, k58, KC_NO}, \ - {k60, k61, k62, k63, k64, k65, k66, k67, k68, KC_NO} \ -} diff --git a/keyboards/runes/vaengr/info.json b/keyboards/runes/vaengr/info.json index fb23385a4989..94d325f9d46a 100644 --- a/keyboards/runes/vaengr/info.json +++ b/keyboards/runes/vaengr/info.json @@ -21,65 +21,69 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "K00", "x": 0, "y": 0}, - {"label": "K10", "x": 1, "y": 0}, - {"label": "K20", "x": 2, "y": 0}, - {"label": "K30", "x": 3, "y": 0}, - {"label": "K40", "x": 4, "y": 0}, - {"label": "K50", "x": 5, "y": 0}, - {"label": "K60", "x": 6, "y": 0}, - {"label": "K70", "x": 7, "y": 0}, - {"label": "K80", "x": 8, "y": 0}, - {"label": "K90", "x": 9, "y": 0}, - {"label": "K100", "x": 10, "y": 0}, - {"label": "K110", "x": 11, "y": 0}, - {"label": "K01", "x": 0, "y": 1}, - {"label": "K11", "x": 1, "y": 1}, - {"label": "K21", "x": 2, "y": 1}, - {"label": "K31", "x": 3, "y": 1}, - {"label": "K41", "x": 4, "y": 1}, - {"label": "K51", "x": 5, "y": 1}, - {"label": "K61", "x": 6, "y": 1}, - {"label": "K71", "x": 7, "y": 1}, - {"label": "K81", "x": 8, "y": 1}, - {"label": "K91", "x": 9, "y": 1}, - {"label": "K101", "x": 10, "y": 1}, - {"label": "K111", "x": 11, "y": 1}, - {"label": "K02", "x": 0, "y": 2}, - {"label": "K12", "x": 1, "y": 2}, - {"label": "K22", "x": 2, "y": 2}, - {"label": "K32", "x": 3, "y": 2}, - {"label": "K42", "x": 4, "y": 2}, - {"label": "K52", "x": 5, "y": 2}, - {"label": "K62", "x": 6, "y": 2}, - {"label": "K72", "x": 7, "y": 2}, - {"label": "K82", "x": 8, "y": 2}, - {"label": "K92", "x": 9, "y": 2}, - {"label": "K102", "x": 10, "y": 2}, - {"label": "K112", "x": 11, "y": 2}, - {"label": "K03", "x": 0, "y": 3}, - {"label": "K13", "x": 1, "y": 3}, - {"label": "K23", "x": 2, "y": 3}, - {"label": "K33", "x": 3, "y": 3}, - {"label": "K43", "x": 4, "y": 3}, - {"label": "K53", "x": 5, "y": 3}, - {"label": "K63", "x": 6, "y": 3}, - {"label": "K73", "x": 7, "y": 3}, - {"label": "K83", "x": 8, "y": 3}, - {"label": "K93", "x": 9, "y": 3}, - {"label": "K103", "x": 10, "y": 3}, - {"label": "K113", "x": 11, "y": 3}, - {"label": "K04", "x": 0, "y": 4}, - {"label": "K14", "x": 1, "y": 4}, - {"label": "K24", "x": 2, "y": 4}, - {"label": "K34", "x": 3, "y": 4}, - {"label": "K44", "x": 4, "y": 4}, - {"label": "K54", "x": 5, "y": 4, "w":2}, - {"label": "K74", "x": 7, "y": 4}, - {"label": "K84", "x": 8, "y": 4}, - {"label": "K94", "x": 9, "y": 4}, - {"label": "K104", "x": 10, "y": 4}, - {"label": "K114", "x": 11, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 6], "x": 5, "y": 4, "w": 2}, + {"matrix": [4, 7], "x": 7, "y": 4}, + {"matrix": [4, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4} ] } } diff --git a/keyboards/runes/vaengr/vaengr.h b/keyboards/runes/vaengr/vaengr.h deleted file mode 100644 index db035a1a8b6e..000000000000 --- a/keyboards/runes/vaengr/vaengr.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Vicktor - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, \ - K40, K41, K42, K43, K44, K46, K47, K48, K49, K410, K411 \ -) { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011 }, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111 }, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211 }, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311 }, \ - {K40, K41, K42, K43, K44, KC_NO, K46, K47, K48, K49, K410, K411 } \ -} diff --git a/keyboards/rura66/rev1/info.json b/keyboards/rura66/rev1/info.json index 33557ff84fea..de1578cc83ff 100644 --- a/keyboards/rura66/rev1/info.json +++ b/keyboards/rura66/rev1/info.json @@ -27,11 +27,81 @@ "layouts": { "LAYOUT": { "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":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}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":15, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"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": [5, 5], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 2], "x": 13, "y": 0}, + {"matrix": [5, 1], "x": 14, "y": 0}, + {"matrix": [5, 0], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [6, 5], "x": 10, "y": 1}, + {"matrix": [6, 4], "x": 11, "y": 1}, + {"matrix": [6, 3], "x": 12, "y": 1}, + {"matrix": [6, 2], "x": 13, "y": 1}, + {"matrix": [6, 1], "x": 14, "y": 1}, + {"matrix": [6, 0], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [7, 6], "x": 9, "y": 2}, + {"matrix": [7, 5], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 3], "x": 12, "y": 2}, + {"matrix": [7, 2], "x": 13, "y": 2}, + {"matrix": [7, 1], "x": 14, "y": 2}, + {"matrix": [7, 0], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [0, 6], "x": 7, "y": 3}, + {"matrix": [5, 6], "x": 8, "y": 3}, + {"matrix": [8, 6], "x": 9, "y": 3}, + {"matrix": [8, 5], "x": 10, "y": 3}, + {"matrix": [8, 4], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 2], "x": 13, "y": 3}, + {"matrix": [8, 1], "x": 14, "y": 3}, + {"matrix": [8, 0], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + {"matrix": [1, 6], "x": 7, "y": 4}, + {"matrix": [6, 6], "x": 8, "y": 4}, + {"matrix": [9, 6], "x": 9, "y": 4}, + {"matrix": [9, 5], "x": 10, "y": 4}, + + {"matrix": [9, 2], "x": 13, "y": 4}, + {"matrix": [9, 1], "x": 14, "y": 4}, + {"matrix": [9, 0], "x": 15, "y": 4} ] } } diff --git a/keyboards/rura66/rev1/rev1.h b/keyboards/rura66/rev1/rev1.h index 70f793ca3da7..c843f6b7168b 100644 --- a/keyboards/rura66/rev1/rev1.h +++ b/keyboards/rura66/rev1/rev1.h @@ -20,31 +20,3 @@ bool is_mac_mode(void); void set_mac_mode(bool macmode); - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, L06, R06, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L45, L46, L16, R16, R46, R45, R42, R41, R40 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, KC_NO, KC_NO, L45, L46 }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, KC_NO, KC_NO, R45, R46 } \ -} diff --git a/keyboards/ryanbaekr/rb69/info.json b/keyboards/ryanbaekr/rb69/info.json index a0340ed5999f..0b514a46f677 100644 --- a/keyboards/ryanbaekr/rb69/info.json +++ b/keyboards/ryanbaekr/rb69/info.json @@ -21,84 +21,84 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, - {"x":15.25, "y":0}, + {"matrix": [0, 15], "x": 15.25, "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}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, - {"x":15.25, "y":1}, + {"matrix": [1, 15], "x": 15.25, "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, "w":2.25}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, - {"x":15.25, "y":2}, + {"matrix": [2, 15], "x": 15.25, "y": 2}, - {"x":0, "y":3, "w":2.25}, - {"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.5}, + {"matrix": [3, 1], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.5}, - {"x":14, "y":3.25}, + {"matrix": [3, 14], "x": 14, "y": 3.25}, - {"x":15.25, "y":3}, + {"matrix": [3, 15], "x": 15.25, "y": 3}, - {"x":0, "y":4, "w":1.5}, - {"x":1.5, "y":4, "w":1.25}, - {"x":2.75, "y":4, "w":1.25}, - {"x":4, "y":4, "w":6.25}, - {"x":10.25, "y":4, "w":1.25}, - {"x":11.5, "y":4, "w":1.25}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 4, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 11.5, "y": 4, "w": 1.25}, - {"x":13, "y":4.25}, - {"x":14, "y":4.25}, - {"x":15, "y":4.25} + {"matrix": [4, 13], "x": 13, "y": 4.25}, + {"matrix": [4, 14], "x": 14, "y": 4.25}, + {"matrix": [4, 15], "x": 15, "y": 4.25} ] } } diff --git a/keyboards/ryanbaekr/rb69/rb69.h b/keyboards/ryanbaekr/rb69/rb69.h deleted file mode 100644 index 6ae6e1ac9368..000000000000 --- a/keyboards/ryanbaekr/rb69/rb69.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2021 ryanbaekr - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2f, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, k3f, \ - k40, k42, k43, k47, k4a, k4c, k4d, k4e, k4f \ -){ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \ - { k10, ___, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \ - { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, ___, k2f }, \ - { ___, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, k3d, k3e, k3f }, \ - { k40, ___, k42, k43, ___, ___, ___, k47, ___, ___, k4a, ___, k4c, k4d, k4e, k4f } \ -} diff --git a/keyboards/ryanbaekr/rb86/info.json b/keyboards/ryanbaekr/rb86/info.json index 5407b5dff434..5c4c3485dff7 100644 --- a/keyboards/ryanbaekr/rb86/info.json +++ b/keyboards/ryanbaekr/rb86/info.json @@ -20,7 +20,104 @@ }, "layouts": { "LAYOUT": { - "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.25, "y":0}, {"x":16.25, "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.25, "y":1.25}, {"x":16.25, "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.25, "y":2.25}, {"x":16.25, "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":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":2.75}, {"x":15.25, "y":4.25}, {"x":0, "y":5.25}, {"x":1, "y":5.25}, {"x":2, "y":5.25}, {"x":3, "y":5.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":12.75, "y":5.25, "w":1.25}, {"x":14.25, "y":5.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.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, 14], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2.25}, + {"matrix": [2, 3], "x": 2.5, "y": 2.25}, + {"matrix": [2, 4], "x": 3.5, "y": 2.25}, + {"matrix": [2, 5], "x": 4.5, "y": 2.25}, + {"matrix": [2, 6], "x": 5.5, "y": 2.25}, + {"matrix": [2, 7], "x": 6.5, "y": 2.25}, + {"matrix": [2, 8], "x": 7.5, "y": 2.25}, + {"matrix": [2, 9], "x": 8.5, "y": 2.25}, + {"matrix": [2, 10], "x": 9.5, "y": 2.25}, + {"matrix": [2, 11], "x": 10.5, "y": 2.25}, + {"matrix": [2, 12], "x": 11.5, "y": 2.25}, + {"matrix": [2, 13], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3.25}, + {"matrix": [3, 7], "x": 6.75, "y": 3.25}, + {"matrix": [3, 8], "x": 7.75, "y": 3.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3.25}, + {"matrix": [3, 12], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 1], "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": 15.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + {"matrix": [5, 3], "x": 3, "y": 5.25}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25} + ] } } } diff --git a/keyboards/ryanbaekr/rb86/rb86.h b/keyboards/ryanbaekr/rb86/rb86.h deleted file mode 100644 index 29f5a82f8360..000000000000 --- a/keyboards/ryanbaekr/rb86/rb86.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 ryanbaekr - * - * 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( \ - k000, k001, 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, k114, k115, k116, \ - k200, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216, \ - k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \ - k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k413, k415, \ - k500, k501, k502, k503, k507, k510, k512, k513, k514, k515, k516 \ -){ \ - { k000, k001, 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, ____, k114, k115, k116 }, \ - { k200, ____, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, k216 }, \ - { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____, ____ }, \ - { ____, k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, ____, k413, ____, k415, ____ }, \ - { k500, k501, k502, k503, ____, ____, ____, k507, ____, ____, k510, ____, k512, k513, k514, k515, k516 } \ -} diff --git a/keyboards/ryanbaekr/rb87/info.json b/keyboards/ryanbaekr/rb87/info.json index 777cd1e7a046..8741408aaa17 100644 --- a/keyboards/ryanbaekr/rb87/info.json +++ b/keyboards/ryanbaekr/rb87/info.json @@ -20,7 +20,108 @@ "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1.5, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.75, "y":0}, {"x":6.75, "y":0}, {"x":7.75, "y":0}, {"x":8.75, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "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.25, "y":1.25}, {"x":16.25, "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.25, "y":2.25}, {"x":16.25, "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.25, "y":3.25}, {"x":16.25, "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":2.75}, {"x":15.25, "y":4.5}, {"x":0, "y":5.25, "w":1.5}, {"x":1.5, "y":5.25, "w":1.25}, {"x":2.75, "y":5.25, "w":1.25}, {"x":4, "y":5.25, "w":6.25}, {"x":10.25, "y":5.25, "w":1.25}, {"x":11.5, "y":5.25, "w":1.25}, {"x":12.75, "y":5.25, "w":1.25}, {"x":14.25, "y":5.5}, {"x":15.25, "y":5.5}, {"x":16.25, "y":5.5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 2], "x": 1.5, "y": 0}, + {"matrix": [0, 3], "x": 2.5, "y": 0}, + {"matrix": [0, 4], "x": 3.5, "y": 0}, + {"matrix": [0, 5], "x": 4.5, "y": 0}, + + {"matrix": [0, 6], "x": 5.75, "y": 0}, + {"matrix": [0, 7], "x": 6.75, "y": 0}, + {"matrix": [0, 8], "x": 7.75, "y": 0}, + {"matrix": [0, 9], "x": 8.75, "y": 0}, + + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + + {"matrix": [0, 14], "x": 14.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.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, 14], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 2], "x": 1.5, "y": 2.25}, + {"matrix": [2, 3], "x": 2.5, "y": 2.25}, + {"matrix": [2, 4], "x": 3.5, "y": 2.25}, + {"matrix": [2, 5], "x": 4.5, "y": 2.25}, + {"matrix": [2, 6], "x": 5.5, "y": 2.25}, + {"matrix": [2, 7], "x": 6.5, "y": 2.25}, + {"matrix": [2, 8], "x": 7.5, "y": 2.25}, + {"matrix": [2, 9], "x": 8.5, "y": 2.25}, + {"matrix": [2, 10], "x": 9.5, "y": 2.25}, + {"matrix": [2, 11], "x": 10.5, "y": 2.25}, + {"matrix": [2, 12], "x": 11.5, "y": 2.25}, + {"matrix": [2, 13], "x": 12.5, "y": 2.25}, + {"matrix": [2, 14], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 2], "x": 1.75, "y": 3.25}, + {"matrix": [3, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3.25}, + {"matrix": [3, 5], "x": 4.75, "y": 3.25}, + {"matrix": [3, 6], "x": 5.75, "y": 3.25}, + {"matrix": [3, 7], "x": 6.75, "y": 3.25}, + {"matrix": [3, 8], "x": 7.75, "y": 3.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3.25}, + {"matrix": [3, 10], "x": 9.75, "y": 3.25}, + {"matrix": [3, 11], "x": 10.75, "y": 3.25}, + {"matrix": [3, 12], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [3, 15], "x": 15.25, "y": 3.25}, + {"matrix": [3, 16], "x": 16.25, "y": 3.25}, + + {"matrix": [4, 1], "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": 15.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [5, 2], "x": 1.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 2.75, "y": 5.25, "w": 1.25}, + {"matrix": [5, 7], "x": 4, "y": 5.25, "w": 6.25}, + {"matrix": [5, 10], "x": 10.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 13], "x": 12.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 14], "x": 14.25, "y": 5.5}, + {"matrix": [5, 15], "x": 15.25, "y": 5.5}, + {"matrix": [5, 16], "x": 16.25, "y": 5.5} + ] } } } diff --git a/keyboards/ryanbaekr/rb87/rb87.h b/keyboards/ryanbaekr/rb87/rb87.h deleted file mode 100644 index b5fc15bfe2db..000000000000 --- a/keyboards/ryanbaekr/rb87/rb87.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2022 ryanbaekr - * - * 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( \ - k00, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e, k1f, k1g, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3f, k3g, \ - k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4d, k4f, \ - k50, k52, k53, k57, k5a, k5c, k5d, k5e, k5f, k5g \ -){ \ - { k00, ___, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, k1f, k1g }, \ - { k20, ___, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \ - { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, ___, k3f, k3g }, \ - { ___, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, ___, k4d, ___, k4f, ___ }, \ - { k50, ___, k52, k53, ___, ___, ___, k57, ___, ___, k5a, ___, k5c, k5d, k5e, k5f, k5g } \ -} diff --git a/keyboards/salicylic_acid3/7skb/rev1/info.json b/keyboards/salicylic_acid3/7skb/rev1/info.json index 3aab9303992e..da6acd3a3a41 100644 --- a/keyboards/salicylic_acid3/7skb/rev1/info.json +++ b/keyboards/salicylic_acid3/7skb/rev1/info.json @@ -24,69 +24,78 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":7, "y":0}, - {"label":"7", "x":8, "y":0}, - {"label":"8", "x":9, "y":0}, - {"label":"9", "x":10, "y":0}, - {"label":"0", "x":11, "y":0}, - {"label":"-", "x":12, "y":0}, - {"label":"=", "x":13, "y":0}, - {"label":"\\", "x":14, "y":0}, - {"label":"`", "x":15, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"[", "x":12.5, "y":1}, - {"label":"]", "x":13.5, "y":1}, - {"label":"Delete", "x":14.5, "y":1, "w":1.5}, - {"label":"Control", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":";", "x":11.75, "y":2}, - {"label":"'", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8.25, "y":3}, - {"label":"M", "x":9.25, "y":3}, - {"label":",", "x":10.25, "y":3}, - {"label":".", "x":11.25, "y":3}, - {"label":"/", "x":12.25, "y":3}, - {"label":"Shift", "x":13.25, "y":3, "w":1.75}, - {"label":"Fn", "x":15, "y":3}, - {"label":"Alt", "x":1.5, "y":4}, - {"label":"GUI", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":1.5}, - {"x":5.5, "y":4, "w":1.25}, - {"x":7.75, "y":4, "w":1.25}, - {"x":9, "y":4, "w":2}, - {"label":"GUI", "x":11, "y":4, "w":1.5}, - {"label":"Alt", "x":12.5, "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": [5, 0], "x": 7, "y": 0}, + {"matrix": [5, 1], "x": 8, "y": 0}, + {"matrix": [5, 2], "x": 9, "y": 0}, + {"matrix": [5, 3], "x": 10, "y": 0}, + {"matrix": [5, 4], "x": 11, "y": 0}, + {"matrix": [5, 5], "x": 12, "y": 0}, + {"matrix": [5, 6], "x": 13, "y": 0}, + {"matrix": [5, 7], "x": 14, "y": 0}, + {"matrix": [6, 7], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.5, "y": 1}, + {"matrix": [6, 1], "x": 8.5, "y": 1}, + {"matrix": [6, 2], "x": 9.5, "y": 1}, + {"matrix": [6, 3], "x": 10.5, "y": 1}, + {"matrix": [6, 4], "x": 11.5, "y": 1}, + {"matrix": [6, 5], "x": 12.5, "y": 1}, + {"matrix": [6, 6], "x": 13.5, "y": 1}, + {"matrix": [7, 7], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.75, "y": 2}, + {"matrix": [7, 1], "x": 8.75, "y": 2}, + {"matrix": [7, 2], "x": 9.75, "y": 2}, + {"matrix": [7, 3], "x": 10.75, "y": 2}, + {"matrix": [7, 4], "x": 11.75, "y": 2}, + {"matrix": [7, 5], "x": 12.75, "y": 2}, + {"matrix": [7, 6], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 8.25, "y": 3}, + {"matrix": [8, 1], "x": 9.25, "y": 3}, + {"matrix": [8, 2], "x": 10.25, "y": 3}, + {"matrix": [8, 3], "x": 11.25, "y": 3}, + {"matrix": [8, 4], "x": 12.25, "y": 3}, + {"matrix": [8, 5], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 15, "y": 3}, + + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 7.75, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 9, "y": 4, "w": 2}, + {"matrix": [9, 3], "x": 11, "y": 4, "w": 1.5}, + {"matrix": [9, 4], "x": 12.5, "y": 4} ] } } diff --git a/keyboards/salicylic_acid3/7skb/rev1/rev1.h b/keyboards/salicylic_acid3/7skb/rev1/rev1.h deleted file mode 100644 index d523bf96e5fe..000000000000 --- a/keyboards/salicylic_acid3/7skb/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -#include "quantum.h" - -////////////////////////////////////////////////////////////////////////////// -// When only use 7skb. -////////////////////////////////////////////////////////////////////////////// -/* - * ,------------------------------------ ------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R17 | - * |---------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R27 | - * |---------------------------------------- ---------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | - * |---------------------------------------------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | - * |------------------------------------------- -----------------------------------------------' - * | L41 | L42 | L43 | L44 | | R40 | R41 | R43 | R44 | - * |------------------------------ ---------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R17, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R27, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, \ - L41, L42, L43, L44, R40, R41, R43, R44 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - {KC_NO, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, KC_NO }, \ - { R40, R41, KC_NO, R43, R44, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/7splus/7splus.h b/keyboards/salicylic_acid3/7splus/7splus.h deleted file mode 100644 index 55b9c24f9cd1..000000000000 --- a/keyboards/salicylic_acid3/7splus/7splus.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright 2020 Salicylic_Acid - -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" - -/* - * ,-------------------------------------- ----------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R60 | - * |-------------------------------------- ------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R62 | - * |---------------------------------------------------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 | - * |---------------------------------------------------------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R47 | R57 | - * |---------------------------------------------------------------------------------------------------+ - * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R53 | R54 | R55 | R56 | R64 | - * |---------------------------------------- ------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R62, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R47, R57, \ - L50, L51, L52, L54, L55, R50, R51, R53, R54, R55, R56, R64 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \ - { L50, L51, L52, KC_NO, L54, L55, KC_NO, KC_NO }, \ - {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, KC_NO, R47 }, \ - { R50, R51, KC_NO, R53, R54, R55, R56, R57 }, \ - { R60, KC_NO, R62, R63, R64, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/7splus/info.json b/keyboards/salicylic_acid3/7splus/info.json index 47f3bcc5c2f3..40f449c12601 100644 --- a/keyboards/salicylic_acid3/7splus/info.json +++ b/keyboards/salicylic_acid3/7splus/info.json @@ -24,91 +24,105 @@ "layouts": { "LAYOUT": { "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":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":10.75, "y":0}, - {"label":"F10", "x":11.75, "y":0}, - {"label":"F11", "x":12.75, "y":0}, - {"label":"F12", "x":13.75, "y":0}, - {"label":"PrtScr", "x":15, "y":0}, - {"label":"Delete", "x":16, "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":7, "y":1.25}, - {"label":"7", "x":8, "y":1.25}, - {"label":"8", "x":9, "y":1.25}, - {"label":"9", "x":10, "y":1.25}, - {"label":"0", "x":11, "y":1.25}, - {"label":"-", "x":12, "y":1.25}, - {"label":"=", "x":13, "y":1.25}, - {"label":"Back Space", "x":14, "y":1.25, "w":2}, - {"label":"Home", "x":16, "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":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"[", "x":12.5, "y":2.25}, - {"label":"]", "x":13.5, "y":2.25}, - {"label":"\"", "x":14.5, "y":2.25, "w":1.5}, - {"label":"Page Up", "x":16, "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":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":":", "x":11.75, "y":3.25}, - {"label":"'", "x":12.75, "y":3.25}, - {"label":"Enter", "x":13.75, "y":3.25, "w":2.25}, - {"label":"Page Down", "x":16, "y":3.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":8.25, "y":4.25}, - {"label":"M", "x":9.25, "y":4.25}, - {"label":"<", "x":10.25, "y":4.25}, - {"label":">", "x":11.25, "y":4.25}, - {"label":"?", "x":12.25, "y":4.25}, - {"label":"Shift","x":13.25, "y":4.25, "w":1.75}, - {"label":"Up", "x":15, "y":4.25}, - {"label":"End", "x":16, "y":4.25}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, - {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, - {"x":3.75, "y":5.25, "w":2}, - {"x":5.75, "y":5.25}, - {"x":7.75, "y":5.25}, - {"x":8.75, "y":5.25, "w":2.75}, - {"label":"Alt", "x":11.5, "y":5.25, "w":1.25}, - {"label":"App", "x":12.75, "y":5.25, "w":1.25}, - {"label":"Left", "x":14, "y":5.25}, - {"label":"Down", "x":15, "y":5.25}, - {"label":"Right", "x":16, "y":5.25} + {"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": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [7, 1], "x": 8.5, "y": 0}, + {"matrix": [7, 2], "x": 9.5, "y": 0}, + + {"matrix": [7, 3], "x": 10.75, "y": 0}, + {"matrix": [7, 4], "x": 11.75, "y": 0}, + {"matrix": [7, 5], "x": 12.75, "y": 0}, + {"matrix": [7, 6], "x": 13.75, "y": 0}, + + {"matrix": [7, 7], "x": 15, "y": 0}, + {"matrix": [13, 0], "x": 16, "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": [8, 0], "x": 7, "y": 1.25}, + {"matrix": [8, 1], "x": 8, "y": 1.25}, + {"matrix": [8, 2], "x": 9, "y": 1.25}, + {"matrix": [8, 3], "x": 10, "y": 1.25}, + {"matrix": [8, 4], "x": 11, "y": 1.25}, + {"matrix": [8, 5], "x": 12, "y": 1.25}, + {"matrix": [8, 6], "x": 13, "y": 1.25}, + {"matrix": [8, 7], "x": 14, "y": 1.25, "w": 2}, + {"matrix": [13, 2], "x": 16, "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": [9, 0], "x": 7.5, "y": 2.25}, + {"matrix": [9, 1], "x": 8.5, "y": 2.25}, + {"matrix": [9, 2], "x": 9.5, "y": 2.25}, + {"matrix": [9, 3], "x": 10.5, "y": 2.25}, + {"matrix": [9, 4], "x": 11.5, "y": 2.25}, + {"matrix": [9, 5], "x": 12.5, "y": 2.25}, + {"matrix": [9, 6], "x": 13.5, "y": 2.25}, + {"matrix": [9, 7], "x": 14.5, "y": 2.25, "w": 1.5}, + {"matrix": [13, 3], "x": 16, "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": [10, 0], "x": 7.75, "y": 3.25}, + {"matrix": [10, 1], "x": 8.75, "y": 3.25}, + {"matrix": [10, 2], "x": 9.75, "y": 3.25}, + {"matrix": [10, 3], "x": 10.75, "y": 3.25}, + {"matrix": [10, 4], "x": 11.75, "y": 3.25}, + {"matrix": [10, 5], "x": 12.75, "y": 3.25}, + {"matrix": [10, 6], "x": 13.75, "y": 3.25, "w": 2.25}, + {"matrix": [10, 7], "x": 16, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [11, 0], "x": 8.25, "y": 4.25}, + {"matrix": [11, 1], "x": 9.25, "y": 4.25}, + {"matrix": [11, 2], "x": 10.25, "y": 4.25}, + {"matrix": [11, 3], "x": 11.25, "y": 4.25}, + {"matrix": [11, 4], "x": 12.25, "y": 4.25}, + {"matrix": [11, 5], "x": 13.25, "y": 4.25, "w": 1.75}, + {"matrix": [11, 7], "x": 15, "y": 4.25}, + {"matrix": [12, 7], "x": 16, "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, 4], "x": 3.75, "y": 5.25, "w": 2}, + {"matrix": [5, 5], "x": 5.75, "y": 5.25}, + + {"matrix": [12, 0], "x": 7.75, "y": 5.25}, + {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 2.75}, + {"matrix": [12, 3], "x": 11.5, "y": 5.25, "w": 1.25}, + {"matrix": [12, 4], "x": 12.75, "y": 5.25, "w": 1.25}, + {"matrix": [12, 5], "x": 14, "y": 5.25}, + {"matrix": [12, 6], "x": 15, "y": 5.25}, + {"matrix": [13, 4], "x": 16, "y": 5.25} ] } } diff --git a/keyboards/salicylic_acid3/ajisai74/ajisai74.h b/keyboards/salicylic_acid3/ajisai74/ajisai74.h deleted file mode 100644 index 40c7d8b31bc1..000000000000 --- a/keyboards/salicylic_acid3/ajisai74/ajisai74.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2020 Salicylic_Acid - -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" - -/* - * ,------------------------------------ ------------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R08 | R18 | - * |---------------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R28 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R38 | - * |---------------------------------------------------------------------------------------------------+ - * | L30 | L45 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37 | - * |------------------------------------------- -----------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | | R40 | R41 | R42 | R43 | R44 | | R46 | R47 | R48 | - * |---------------------------------------- --------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, R18, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R28, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R38, \ - L30, L45, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, R40, R41, R42, R43, R44, R46, R47, R48 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, R41, R42, R43, R44, KC_NO, R46, R47, R48 } \ - } diff --git a/keyboards/salicylic_acid3/ajisai74/info.json b/keyboards/salicylic_acid3/ajisai74/info.json index 8378a1cd5dbd..681737a06958 100644 --- a/keyboards/salicylic_acid3/ajisai74/info.json +++ b/keyboards/salicylic_acid3/ajisai74/info.json @@ -21,80 +21,91 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6.75, "y":0}, - {"label":"7", "x":7.75, "y":0}, - {"label":"8", "x":8.75, "y":0}, - {"label":"9", "x":9.75, "y":0}, - {"label":"0", "x":10.75, "y":0}, - {"label":"-", "x":11.75, "y":0}, - {"label":"=", "x":12.75, "y":0}, - {"label":"Back", "x":13.75, "y":0}, - {"label":"Back", "x":14.75, "y":0}, - {"label":"Insert", "x":15.75, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.25, "y":1}, - {"label":"U", "x":8.25, "y":1}, - {"label":"I", "x":9.25, "y":1}, - {"label":"O", "x":10.25, "y":1}, - {"label":"P", "x":11.25, "y":1}, - {"label":"[", "x":12.25, "y":1}, - {"label":"]", "x":13.25, "y":1}, - {"label":"\"", "x":14.25, "y":1, "w":1.5}, - {"label":"Del", "x":15.75, "y":1}, - {"label":"CapsLock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.5, "y":2}, - {"label":"J", "x":8.5, "y":2}, - {"label":"K", "x":9.5, "y":2}, - {"label":"L", "x":10.5, "y":2}, - {"label":":", "x":11.5, "y":2}, - {"label":"'", "x":12.5, "y":2}, - {"label":"Return", "x":13.5, "y":2}, - {"label":"Return", "x":14.5, "y":2, "w":1.25}, - {"label":"PgUp", "x":15.75, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"Shift", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3, "w":1.75}, - {"label":"Up", "x":14.75, "y":3}, - {"label":"PgDwn", "x":15.75, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4}, - {"label":"Alt", "x":2.5, "y":4, "w":1.5}, - {"x":4, "y":4, "w":1.5}, - {"x":5.5, "y":4, "w":1.25}, - {"x":7.5, "y":4, "w":1.25}, - {"x":8.75, "y":4, "w":1.25}, - {"label":"Alt", "x":10, "y":4, "w":1.25}, - {"label":"Win", "x":11.25, "y":4}, - {"label":"Fn", "x":12.25, "y":4}, - {"label":"Left", "x":13.75, "y":4}, - {"label":"Down", "x":14.75, "y":4}, - {"label":"Right", "x":15.75, "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": [5, 0], "x": 6.75, "y": 0}, + {"matrix": [5, 1], "x": 7.75, "y": 0}, + {"matrix": [5, 2], "x": 8.75, "y": 0}, + {"matrix": [5, 3], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 5], "x": 11.75, "y": 0}, + {"matrix": [5, 6], "x": 12.75, "y": 0}, + {"matrix": [5, 7], "x": 13.75, "y": 0}, + {"matrix": [5, 8], "x": 14.75, "y": 0}, + {"matrix": [6, 8], "x": 15.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.25, "y": 1}, + {"matrix": [6, 1], "x": 8.25, "y": 1}, + {"matrix": [6, 2], "x": 9.25, "y": 1}, + {"matrix": [6, 3], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 5], "x": 12.25, "y": 1}, + {"matrix": [6, 6], "x": 13.25, "y": 1}, + {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5}, + {"matrix": [7, 8], "x": 15.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.5, "y": 2}, + {"matrix": [7, 1], "x": 8.5, "y": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 2}, + {"matrix": [7, 3], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 12.5, "y": 2}, + {"matrix": [7, 6], "x": 13.5, "y": 2}, + {"matrix": [7, 7], "x": 14.5, "y": 2, "w": 1.25}, + {"matrix": [8, 8], "x": 15.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [4, 5], "x": 1.25, "y": 3}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 8, "y": 3}, + {"matrix": [8, 1], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75}, + {"matrix": [8, 6], "x": 14.75, "y": 3}, + {"matrix": [8, 7], "x": 15.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 5.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.25, "y": 4}, + {"matrix": [9, 4], "x": 12.25, "y": 4}, + + {"matrix": [9, 6], "x": 13.75, "y": 4}, + {"matrix": [9, 7], "x": 14.75, "y": 4}, + {"matrix": [9, 8], "x": 15.75, "y": 4} + ] } } } diff --git a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h b/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h deleted file mode 100644 index 7944337b4e08..000000000000 --- a/keyboards/salicylic_acid3/ergoarrows/ergoarrows.h +++ /dev/null @@ -1,59 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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" - -/* - * ,------------------------------------------ ------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | L06 | | R06 | R05 | R04 | R03 | R02 | R01 | R00 | - * |------------------------------------------ ------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | L16 | | R16 | R15 | R14 | R13 | R12 | R11 | R10 | - * |------------------------------------------ ------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | L26 | | R26 | R25 | R24 | R23 | R22 | R21 | R20 | - * |------------------------------------------ ------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | L36 | | R36 | R35 | R34 | R33 | R32 | R31 | R30 | - * |------------------------------------------ ------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | L46 | | R46 | R45 | R44 | R43 | R42 | R41 | R40 | - * |------------------------------------------ ------------------------------------------+ - * | L51 | L52 | L53 | | R53 | R52 | R51 | - * ------------------- ------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R06, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, L16, R16, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, L26, R26, R25, R24, R23, R22, R21, R20, \ - L30, L31, L32, L33, L34, L35, L36, R36, R35, R34, R33, R32, R31, R30, \ - L40, L41, L42, L43, L44, L45, L46, R46, R45, R44, R43, R42, R41, R40, \ - L51, L52, L53, R53, R52, R51 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { L40, L41, L42, L43, L44, L45, L46 }, \ - {KC_NO, L51, L52, L53, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { R40, R41, R42, R43, R44, R45, R46 }, \ - {KC_NO, R51, R52, R53, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/ergoarrows/info.json b/keyboards/salicylic_acid3/ergoarrows/info.json index 415a7e1945ab..0957f6628df9 100644 --- a/keyboards/salicylic_acid3/ergoarrows/info.json +++ b/keyboards/salicylic_acid3/ergoarrows/info.json @@ -24,94 +24,95 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0.375}, - {"label":"1", "x":1, "y":0.375}, - {"label":"2", "x":2, "y":0.125}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0.125}, - {"label":"5", "x":5, "y":0.25}, - {"label":"6", "x":6, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.375}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, - {"label":"5", "x":8.8, "y":0.5}, - {"label":"6", "x":9.8, "y":0.25}, - {"label":"7", "x":10.8, "y":0.125}, - {"label":"8", "x":11.8, "y":0}, - {"label":"9", "x":12.8, "y":0.125}, - {"label":"0", "x":13.8, "y":0.375}, - {"label":"PrtScr", "x":14.8, "y":0.375}, + {"matrix": [6, 6], "x": 8.8, "y": 0.5}, + {"matrix": [6, 5], "x": 9.8, "y": 0.25}, + {"matrix": [6, 4], "x": 10.8, "y": 0.125}, + {"matrix": [6, 3], "x": 11.8, "y": 0}, + {"matrix": [6, 2], "x": 12.8, "y": 0.125}, + {"matrix": [6, 1], "x": 13.8, "y": 0.375}, + {"matrix": [6, 0], "x": 14.8, "y": 0.375}, - {"label":"Tab", "x":0, "y":1.375}, - {"label":"Q", "x":1, "y":1.375}, - {"label":"W", "x":2, "y":1.125}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1.125}, - {"label":"T", "x":5, "y":1.25}, - {"label":"Y", "x":6, "y":1.5}, + {"matrix": [1, 0], "x": 0, "y": 1.375}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, - {"label":"T", "x":8.8, "y":1.5}, - {"label":"Y", "x":9.8, "y":1.25}, - {"label":"U", "x":10.8, "y":1.125}, - {"label":"I", "x":11.8, "y":1}, - {"label":"O", "x":12.8, "y":1.125}, - {"label":"P", "x":13.8, "y":1.375}, - {"label":"[", "x":14.8, "y":1.375}, + {"matrix": [7, 6], "x": 8.8, "y": 1.5}, + {"matrix": [7, 5], "x": 9.8, "y": 1.25}, + {"matrix": [7, 4], "x": 10.8, "y": 1.125}, + {"matrix": [7, 3], "x": 11.8, "y": 1}, + {"matrix": [7, 2], "x": 12.8, "y": 1.125}, + {"matrix": [7, 1], "x": 13.8, "y": 1.375}, + {"matrix": [7, 0], "x": 14.8, "y": 1.375}, - {"label":"Caps", "x":0, "y":2.375}, - {"label":"A", "x":1, "y":2.375}, - {"label":"S", "x":2, "y":2.125}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2.125}, - {"label":"G", "x":5, "y":2.25}, - {"label":"H", "x":6, "y":2.5}, + {"matrix": [2, 0], "x": 0, "y": 2.375}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, - {"label":"G", "x":8.8, "y":2.5}, - {"label":"H", "x":9.8, "y":2.25}, - {"label":"J", "x":10.8, "y":2.125}, - {"label":"K", "x":11.8, "y":2}, - {"label":"L", "x":12.8, "y":2.125}, - {"label":":", "x":13.8, "y":2.375}, - {"label":"Ent", "x":14.8, "y":2.375}, + {"matrix": [8, 6], "x": 8.8, "y": 2.5}, + {"matrix": [8, 5], "x": 9.8, "y": 2.25}, + {"matrix": [8, 4], "x": 10.8, "y": 2.125}, + {"matrix": [8, 3], "x": 11.8, "y": 2}, + {"matrix": [8, 2], "x": 12.8, "y": 2.125}, + {"matrix": [8, 1], "x": 13.8, "y": 2.375}, + {"matrix": [8, 0], "x": 14.8, "y": 2.375}, - {"label":"Shift", "x":0, "y":3.375}, - {"label":"Z", "x":1, "y":3.375}, - {"label":"X", "x":2, "y":3.125}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3.125}, - {"label":"B", "x":5, "y":3.25}, - {"label":"N", "x":6, "y":3.5}, + {"matrix": [3, 0], "x": 0, "y": 3.375}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, - {"label":"B", "x":8.8, "y":3.5}, - {"label":"N", "x":9.8, "y":3.25}, - {"label":"M", "x":10.8, "y":3.125}, - {"label":"<", "x":11.8, "y":3}, - {"label":">", "x":12.8, "y":3.125}, - {"label":"?", "x":13.8, "y":3.375}, - {"label":"_", "x":14.8, "y":3.375}, + {"matrix": [9, 6], "x": 8.8, "y": 3.5}, + {"matrix": [9, 5], "x": 9.8, "y": 3.25}, + {"matrix": [9, 4], "x": 10.8, "y": 3.125}, + {"matrix": [9, 3], "x": 11.8, "y": 3}, + {"matrix": [9, 2], "x": 12.8, "y": 3.125}, + {"matrix": [9, 1], "x": 13.8, "y": 3.375}, + {"matrix": [9, 0], "x": 14.8, "y": 3.375}, - {"label":"Ctrl", "x":0, "y":4.375}, - {"label":"Win", "x":1, "y":4.375}, - {"label":"↑", "x":2.125, "y":4.5}, - {"label":"Alt", "x":3.25, "y":4.375}, - {"label":"Ent", "x":4.25, "y":4.375}, - {"label":"BS", "x":5.35, "y":4.625}, - {"label":"Del", "x":6.4, "y":5.125}, + {"matrix": [4, 0], "x": 0, "y": 4.375}, + {"matrix": [4, 1], "x": 1, "y": 4.375}, + {"matrix": [4, 2], "x": 2.125, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.375}, + {"matrix": [4, 4], "x": 4.25, "y": 4.375}, + {"matrix": [4, 5], "x": 5.35, "y": 4.625}, + {"matrix": [4, 6], "x": 6.4, "y": 5.125}, - {"label":"BS", "x":8.4, "y":5.125}, - {"label":"Del", "x":9.45, "y":4.625}, - {"label":"Spc", "x":10.55, "y":4.375}, - {"label":"Alt", "x":11.55, "y":4.375}, - {"label":"↑", "x":12.675, "y":4.5}, - {"label":"Alt", "x":13.8, "y":4.375}, - {"label":"App", "x":14.8, "y":4.375}, + {"matrix": [10, 6], "x": 8.4, "y": 5.125}, + {"matrix": [10, 5], "x": 9.45, "y": 4.625}, + {"matrix": [10, 4], "x": 10.55, "y": 4.375}, + {"matrix": [10, 3], "x": 11.55, "y": 4.375}, + {"matrix": [10, 2], "x": 12.675, "y": 4.5}, + {"matrix": [10, 1], "x": 13.8, "y": 4.375}, + {"matrix": [10, 0], "x": 14.8, "y": 4.375}, - {"label":"←", "x":1.125, "y":5.5}, - {"label":"⇓", "x":2.125, "y":5.5}, - {"label":"→", "x":3.125, "y":5.5}, + {"matrix": [5, 1], "x": 1.125, "y": 5.5}, + {"matrix": [5, 2], "x": 2.125, "y": 5.5}, + {"matrix": [5, 3], "x": 3.125, "y": 5.5}, - {"label":"←", "x":11.675, "y":5.5}, - {"label":"⇓", "x":12.675, "y":5.5}, - {"label":"→", "x":13.675, "y":5.5} + {"matrix": [11, 3], "x": 11.675, "y": 5.5}, + {"matrix": [11, 2], "x": 12.675, "y": 5.5}, + {"matrix": [11, 1], "x": 13.675, "y": 5.5} ] } } + } diff --git a/keyboards/salicylic_acid3/getta25/rev1/info.json b/keyboards/salicylic_acid3/getta25/rev1/info.json index c63baa894266..c128df0f791f 100644 --- a/keyboards/salicylic_acid3/getta25/rev1/info.json +++ b/keyboards/salicylic_acid3/getta25/rev1/info.json @@ -21,31 +21,36 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"F2", "x":1, "y":0}, - {"label":"=", "x":2, "y":0}, - {"label":"DEL", "x":3, "y":0}, - {"label":"Num Lock", "x":0, "y":1.25}, - {"label":"/", "x":1, "y":1.25}, - {"label":"*", "x":2, "y":1.25}, - {"label":"-", "x":3, "y":1.25}, - {"label":"7", "x":0, "y":2.25}, - {"label":"8", "x":1, "y":2.25}, - {"label":"9", "x":2, "y":2.25}, - {"label":"ESC", "x":4.25, "y":2.25}, - {"label":"4", "x":0, "y":3.25}, - {"label":"5", "x":1, "y":3.25}, - {"label":"6", "x":2, "y":3.25}, - {"label":"+", "x":3, "y":2.25, "h":2}, - {"label":"F2", "x":4.25, "y":3.25}, - {"label":"1", "x":0, "y":4.25}, - {"label":"2", "x":1, "y":4.25}, - {"label":"3", "x":2, "y":4.25}, - {"label":"DEL", "x":4.25, "y":4.25}, - {"label":"0", "x":0, "y":5.25, "w":2}, - {"label":".", "x":2, "y":5.25}, - {"label":"Enter", "x":3, "y":4.25, "h":2}, - {"label":"BSPC", "x":4.25, "y":5.25} + {"matrix": [0, 5], "x": 0, "y": 0}, + {"matrix": [1, 5], "x": 1, "y": 0}, + {"matrix": [2, 5], "x": 2, "y": 0}, + {"matrix": [3, 5], "x": 3, "y": 0}, + + {"matrix": [0, 4], "x": 0, "y": 1.25}, + {"matrix": [1, 4], "x": 1, "y": 1.25}, + {"matrix": [2, 4], "x": 2, "y": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 1.25}, + + {"matrix": [0, 3], "x": 0, "y": 2.25}, + {"matrix": [1, 3], "x": 1, "y": 2.25}, + {"matrix": [2, 3], "x": 2, "y": 2.25}, + {"matrix": [4, 3], "x": 4.25, "y": 2.25}, + + {"matrix": [0, 2], "x": 0, "y": 3.25}, + {"matrix": [1, 2], "x": 1, "y": 3.25}, + {"matrix": [2, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 2], "x": 3, "y": 2.25, "h": 2}, + {"matrix": [4, 2], "x": 4.25, "y": 3.25}, + + {"matrix": [0, 1], "x": 0, "y": 4.25}, + {"matrix": [1, 1], "x": 1, "y": 4.25}, + {"matrix": [2, 1], "x": 2, "y": 4.25}, + {"matrix": [4, 1], "x": 4.25, "y": 4.25}, + + {"matrix": [0, 0], "x": 0, "y": 5.25, "w": 2}, + {"matrix": [2, 0], "x": 2, "y": 5.25}, + {"matrix": [3, 0], "x": 3, "y": 4.25, "h": 2}, + {"matrix": [4, 0], "x": 4.25, "y": 5.25} ] } } diff --git a/keyboards/salicylic_acid3/getta25/rev1/rev1.h b/keyboards/salicylic_acid3/getta25/rev1/rev1.h deleted file mode 100644 index f2c5b9b8eda1..000000000000 --- a/keyboards/salicylic_acid3/getta25/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* - * ,-----------------------. - * | L05 | L15 | L25 | L35 | - * |-----------------------+ - * | L04 | L14 | L24 | L34 | - * |-----------------------------+ - * | L03 | L13 | L23 | | L43 | - * |-----------------------------+ - * | L02 | L12 | L22 | L32 | L42 | - * |-----------------------------+ - * | L01 | L11 | L21 | | L41 | - * |-----------------------------+ - * | L00 | | L20 | L30 | L40 | - * ,-----------------------------' - */ - -#define LAYOUT( \ - L05, L15, L25, L35, \ - L04, L14, L24, L34, \ - L03, L13, L23, L43, \ - L02, L12, L22, L32, L42, \ - L01, L11, L21, L41, \ - L00, L20, L30, L40 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - {KC_NO, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30,KC_NO, L32,KC_NO, L34, L35 }, \ - { L40, L41, L42, L43,KC_NO,KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/info.json b/keyboards/salicylic_acid3/jisplit89/rev1/info.json index c362ba54e121..d0d3f1df63a6 100644 --- a/keyboards/salicylic_acid3/jisplit89/rev1/info.json +++ b/keyboards/salicylic_acid3/jisplit89/rev1/info.json @@ -24,95 +24,111 @@ "layouts": { "LAYOUT": { "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":7.5, "y":0}, - {"label":"F7", "x":8.5, "y":0}, - {"label":"F8", "x":9.5, "y":0}, - {"label":"F9", "x":10.75, "y":0}, - {"label":"F10", "x":11.75, "y":0}, - {"label":"F11", "x":12.75, "y":0}, - {"label":"F12", "x":13.75, "y":0}, - {"label":"Insert", "x":15, "y":0}, - {"label":"Print Screen", "x":16, "y":0}, - {"label":"Hankaku/Zenkaku", "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":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":"~", "x":13, "y":1.25}, - {"label":"|", "x":14, "y":1.25}, - {"label":"Back", "x":15, "y":1.25}, - {"label":"Del", "x":16, "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":7.5, "y":2.25}, - {"label":"U", "x":8.5, "y":2.25}, - {"label":"I", "x":9.5, "y":2.25}, - {"label":"O", "x":10.5, "y":2.25}, - {"label":"P", "x":11.5, "y":2.25}, - {"label":"`", "x":12.5, "y":2.25}, - {"label":"{", "x":13.5, "y":2.25}, - {"label":"Return", "x":14.75, "y":2.25, "w":1.25, "h":2}, - {"label":"Home", "x":16, "y":2.25}, - {"label":"Caps", "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":7.75, "y":3.25}, - {"label":"J", "x":8.75, "y":3.25}, - {"label":"K", "x":9.75, "y":3.25}, - {"label":"L", "x":10.75, "y":3.25}, - {"label":"+", "x":11.75, "y":3.25}, - {"label":"*", "x":12.75, "y":3.25}, - {"label":"}", "x":13.75, "y":3.25}, - {"label":"End", "x":16, "y":3.25}, - {"label":"Shift", "x":0, "y":4.25, "w":2}, - {"label":"Z", "x":2, "y":4.25}, - {"label":"X", "x":3, "y":4.25}, - {"label":"C", "x":4, "y":4.25}, - {"label":"V", "x":5, "y":4.25}, - {"label":"B", "x":6, "y":4.25}, - {"label":"N", "x":8, "y":4.25}, - {"label":"M", "x":9, "y":4.25}, - {"label":"<", "x":10, "y":4.25}, - {"label":">", "x":11, "y":4.25}, - {"label":"?", "x":12, "y":4.25}, - {"label":"_", "x":13, "y":4.25}, - {"label":"PgDwn", "x":14, "y":4.25}, - {"label":"Up", "x":15, "y":4.25}, - {"label":"PgUp", "x":16, "y":4.25}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "x":1.25, "y":5.25}, - {"label":"Alt", "x":2.25, "y":5.25, "w":1.25}, - {"label":"Muhenkan", "x":3.5, "y":5.25}, - {"label":"Alt", "x":4.5, "y":5.25, "w":1.25}, - {"label":"1", "x":5.75, "y":5.25}, - {"label":"2", "x":7.75, "y":5.25}, - {"label":"Ctrl", "x":8.75, "y":5.25, "w":1.25}, - {"label":"Henkan", "x":10, "y":5.25, "w":1.25}, - {"label":"Kana", "x":11.25, "y":5.25, "w":1.25}, - {"label":"App", "x":12.5, "y":5.25}, - {"label":"Left", "x":14, "y":5.25}, - {"label":"Down", "x":15, "y":5.25}, - {"label":"Right", "x":16, "y":5.25} + {"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": [7, 0], "x": 7.5, "y": 0}, + {"matrix": [7, 1], "x": 8.5, "y": 0}, + {"matrix": [7, 2], "x": 9.5, "y": 0}, + + {"matrix": [7, 3], "x": 10.75, "y": 0}, + {"matrix": [7, 4], "x": 11.75, "y": 0}, + {"matrix": [7, 5], "x": 12.75, "y": 0}, + {"matrix": [7, 6], "x": 13.75, "y": 0}, + + {"matrix": [7, 7], "x": 15, "y": 0}, + {"matrix": [13, 0], "x": 16, "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": [8, 0], "x": 7, "y": 1.25}, + {"matrix": [8, 1], "x": 8, "y": 1.25}, + {"matrix": [8, 2], "x": 9, "y": 1.25}, + {"matrix": [8, 3], "x": 10, "y": 1.25}, + {"matrix": [8, 4], "x": 11, "y": 1.25}, + {"matrix": [8, 5], "x": 12, "y": 1.25}, + {"matrix": [8, 6], "x": 13, "y": 1.25}, + {"matrix": [8, 7], "x": 14, "y": 1.25}, + {"matrix": [13, 1], "x": 15, "y": 1.25}, + {"matrix": [13, 2], "x": 16, "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": [9, 0], "x": 7.5, "y": 2.25}, + {"matrix": [9, 1], "x": 8.5, "y": 2.25}, + {"matrix": [9, 2], "x": 9.5, "y": 2.25}, + {"matrix": [9, 3], "x": 10.5, "y": 2.25}, + {"matrix": [9, 4], "x": 11.5, "y": 2.25}, + {"matrix": [9, 5], "x": 12.5, "y": 2.25}, + {"matrix": [9, 6], "x": 13.5, "y": 2.25}, + {"matrix": [9, 7], "x": 14.75, "y": 2.25, "w": 1.25, "h": 2}, + {"matrix": [13, 3], "x": 16, "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": [10, 0], "x": 7.75, "y": 3.25}, + {"matrix": [10, 1], "x": 8.75, "y": 3.25}, + {"matrix": [10, 2], "x": 9.75, "y": 3.25}, + {"matrix": [10, 3], "x": 10.75, "y": 3.25}, + {"matrix": [10, 4], "x": 11.75, "y": 3.25}, + {"matrix": [10, 5], "x": 12.75, "y": 3.25}, + {"matrix": [10, 6], "x": 13.75, "y": 3.25}, + {"matrix": [10, 7], "x": 16, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4.25}, + {"matrix": [4, 2], "x": 3, "y": 4.25}, + {"matrix": [4, 3], "x": 4, "y": 4.25}, + {"matrix": [4, 4], "x": 5, "y": 4.25}, + {"matrix": [4, 5], "x": 6, "y": 4.25}, + + {"matrix": [11, 0], "x": 8, "y": 4.25}, + {"matrix": [11, 1], "x": 9, "y": 4.25}, + {"matrix": [11, 2], "x": 10, "y": 4.25}, + {"matrix": [11, 3], "x": 11, "y": 4.25}, + {"matrix": [11, 4], "x": 12, "y": 4.25}, + {"matrix": [11, 5], "x": 13, "y": 4.25}, + {"matrix": [11, 6], "x": 14, "y": 4.25}, + {"matrix": [11, 7], "x": 15, "y": 4.25}, + {"matrix": [12, 7], "x": 16, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25}, + {"matrix": [5, 2], "x": 2.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 3], "x": 3.5, "y": 5.25}, + {"matrix": [5, 4], "x": 4.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 5.75, "y": 5.25}, + + {"matrix": [12, 0], "x": 7.75, "y": 5.25}, + {"matrix": [12, 1], "x": 8.75, "y": 5.25, "w": 1.25}, + {"matrix": [12, 2], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [12, 3], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [12, 4], "x": 12.5, "y": 5.25}, + + {"matrix": [12, 5], "x": 14, "y": 5.25}, + {"matrix": [12, 6], "x": 15, "y": 5.25}, + {"matrix": [13, 4], "x": 16, "y": 5.25} ] } } diff --git a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h b/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h deleted file mode 100644 index 7a1887dc2d79..000000000000 --- a/keyboards/salicylic_acid3/jisplit89/rev1/rev1.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright 2020 Salicylic_Acid - -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" - -/* - * ,-------------------------------------- ----------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R60 | - * |-------------------------------------- ------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R61 | R62 | - * |---------------------------------------------------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | R63 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | | R37 | - * |---------------------------------------------------------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R45 | R46 | R47 | R57 | - * |------------------------------------------- -----------------------------------------------------+ - * | L50 | L51 | L52 | L53 | L54 | L55 | | R50 | R51 | R52 | R53 | R54 | | R55 | R56 | R64 | - * |---------------------------------------- ------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R60, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R61, R62, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, R63, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R45, R46, R47, R57, \ - L50, L51, L52, L53, L54, L55, R50, R51, R52, R53, R54, R55, R56, R64 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO }, \ - { L50, L51, L52, L53, L54, L55, KC_NO, KC_NO }, \ - {KC_NO,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, R44, R45, R46, R47 }, \ - { R50, R51, R52, R53, R54, R55, R56, R57 }, \ - { R60, R61, R62, R63, R64, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/nknl7en/info.json b/keyboards/salicylic_acid3/nknl7en/info.json index 0777289c5cc4..9dfb147f42bd 100644 --- a/keyboards/salicylic_acid3/nknl7en/info.json +++ b/keyboards/salicylic_acid3/nknl7en/info.json @@ -24,76 +24,92 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"0,0", "x":0, "y":0}, - {"label":"0,1", "x":1, "y":0}, - {"label":"0,2", "x":2, "y":0}, - {"label":"0,3", "x":3, "y":0}, - {"label":"0,4", "x":4, "y":0}, - {"label":"0,5", "x":5, "y":0}, - {"label":"5,0", "x":6.75, "y":0}, - {"label":"5,1", "x":7.75, "y":0}, - {"label":"5,2", "x":8.75, "y":0}, - {"label":"5,3", "x":9.75, "y":0}, - {"label":"5,4", "x":10.75, "y":0}, - {"label":"5,5", "x":11.75, "y":0}, - {"label":"5,6", "x":12.75, "y":0}, - {"label":"5,7", "x":13.75, "y":0, "w":2}, - {"label":"5,8", "x":16.25, "y":0}, - {"label":"1,0", "x":0, "y":1, "w":1.5}, - {"label":"1,1", "x":1.5, "y":1}, - {"label":"1,2", "x":2.5, "y":1}, - {"label":"1,3", "x":3.5, "y":1}, - {"label":"1,4", "x":4.5, "y":1}, - {"label":"1,5", "x":5.5, "y":1}, - {"label":"6,0", "x":7.25, "y":1}, - {"label":"6,1", "x":8.25, "y":1}, - {"label":"6,2", "x":9.25, "y":1}, - {"label":"6,3", "x":10.25, "y":1}, - {"label":"6,4", "x":11.25, "y":1}, - {"label":"6,5", "x":12.25, "y":1}, - {"label":"6,6", "x":13.25, "y":1}, - {"label":"6,7", "x":14.25, "y":1, "w":1.5}, - {"label":"6,8", "x":16.25, "y":1}, - {"label":"2,0", "x":0, "y":2, "w":1.75}, - {"label":"2,1", "x":1.75, "y":2}, - {"label":"2,2", "x":2.75, "y":2}, - {"label":"2,3", "x":3.75, "y":2}, - {"label":"2,4", "x":4.75, "y":2}, - {"label":"2,5", "x":5.75, "y":2}, - {"label":"7,0", "x":7.5, "y":2}, - {"label":"7,1", "x":8.5, "y":2}, - {"label":"7,2", "x":9.5, "y":2}, - {"label":"7,3", "x":10.5, "y":2}, - {"label":"7,4", "x":11.5, "y":2}, - {"label":"7,5", "x":12.5, "y":2}, - {"label":"7,6", "x":13.5, "y":2, "w":2.25}, - {"label":"7,8", "x":16.25, "y":2}, - {"label":"3,0", "x":0, "y":3, "w":2.25}, - {"label":"3,1", "x":2.25, "y":3}, - {"label":"3,2", "x":3.25, "y":3}, - {"label":"3,3", "x":4.25, "y":3}, - {"label":"3,4", "x":5.25, "y":3}, - {"label":"3,5", "x":6.25, "y":3}, - {"label":"8,0", "x":8, "y":3}, - {"label":"8,1", "x":9, "y":3}, - {"label":"8,2", "x":10, "y":3}, - {"label":"8,3", "x":11, "y":3}, - {"label":"8,4", "x":12, "y":3}, - {"label":"8,5", "x":13, "y":3, "w":1.75}, - {"label":"8,6", "x":15, "y":3.25}, - {"label":"8,8", "x":16.25, "y":3}, - {"label":"4,0", "x":0, "y":4, "w":1.25}, - {"label":"4,1", "x":1.25, "y":4, "w":1.25}, - {"label":"4,2", "x":2.5, "y":4, "w":1.25}, - {"label":"4,3", "x":3.75, "y":4, "w":2}, - {"label":"4,4", "x":5.75, "y":4}, - {"label":"9,0", "x":7.5, "y":4, "w":2.75}, - {"label":"9,2", "x":10.25, "y":4, "w":1.25}, - {"label":"9,3", "x":11.5, "y":4, "w":1.25}, - {"label":"9,4", "x":12.75, "y":4}, - {"label":"9,6", "x":14, "y":4.25}, - {"label":"8,7", "x":15, "y":4.25}, - {"label":"9,7", "x":16, "y":4.25}] + {"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": [5, 0], "x": 6.75, "y": 0}, + {"matrix": [5, 1], "x": 7.75, "y": 0}, + {"matrix": [5, 2], "x": 8.75, "y": 0}, + {"matrix": [5, 3], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 5], "x": 11.75, "y": 0}, + {"matrix": [5, 6], "x": 12.75, "y": 0}, + {"matrix": [5, 7], "x": 13.75, "y": 0, "w": 2}, + + {"matrix": [5, 8], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.25, "y": 1}, + {"matrix": [6, 1], "x": 8.25, "y": 1}, + {"matrix": [6, 2], "x": 9.25, "y": 1}, + {"matrix": [6, 3], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 5], "x": 12.25, "y": 1}, + {"matrix": [6, 6], "x": 13.25, "y": 1}, + {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5}, + + {"matrix": [6, 8], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.5, "y": 2}, + {"matrix": [7, 1], "x": 8.5, "y": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 2}, + {"matrix": [7, 3], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 12.5, "y": 2}, + {"matrix": [7, 6], "x": 13.5, "y": 2, "w": 2.25}, + + {"matrix": [7, 8], "x": 16.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 8, "y": 3}, + {"matrix": [8, 1], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 5], "x": 13, "y": 3, "w": 1.75}, + + {"matrix": [8, 6], "x": 15, "y": 3.25}, + + {"matrix": [8, 8], "x": 16.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 5.75, "y": 4}, + + {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 2.75}, + {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.75, "y": 4}, + + {"matrix": [9, 6], "x": 14, "y": 4.25}, + {"matrix": [8, 7], "x": 15, "y": 4.25}, + {"matrix": [9, 7], "x": 16, "y": 4.25} + ] } } } diff --git a/keyboards/salicylic_acid3/nknl7en/nknl7en.h b/keyboards/salicylic_acid3/nknl7en/nknl7en.h deleted file mode 100644 index 945e42956f69..000000000000 --- a/keyboards/salicylic_acid3/nknl7en/nknl7en.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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" - -/* - * ,------------------------------------ ------------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R08 | - * |---------------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R18 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R28 | - * |---------------------------------------------------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R38 | - * |------------------------------------------- -----------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | | R40 | R42 | R43 | R44 | R46 | R37 | R47 | - * |---------------------------------------- --------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R18, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R28, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R38, \ - L40, L41, L42, L43, L44, R40, R42, R43, R44, R46, R37, R47 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, KC_NO, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, KC_NO, R42, R43, R44, KC_NO, R46, R47, KC_NO } \ - } diff --git a/keyboards/salicylic_acid3/nknl7jp/info.json b/keyboards/salicylic_acid3/nknl7jp/info.json index 83505e513cd4..3eb51b49650d 100644 --- a/keyboards/salicylic_acid3/nknl7jp/info.json +++ b/keyboards/salicylic_acid3/nknl7jp/info.json @@ -24,77 +24,94 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"ESC", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"\"", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"&", "x":6.75, "y":0}, - {"label":"'", "x":7.75, "y":0}, - {"label":"(", "x":8.75, "y":0}, - {"label":")", "x":9.75, "y":0}, - {"label":"", "x":10.75, "y":0}, - {"label":"=", "x":11.75, "y":0}, - {"label":"~", "x":12.75, "y":0}, - {"label":"|", "x":13.75, "y":0}, - {"label":"Back", "x":14.75, "y":0}, - {"label":"Del", "x":16.25, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.25, "y":1}, - {"label":"U", "x":8.25, "y":1}, - {"label":"I", "x":9.25, "y":1}, - {"label":"O", "x":10.25, "y":1}, - {"label":"P", "x":11.25, "y":1}, - {"label":"`", "x":12.25, "y":1}, - {"label":"{", "x":13.25, "y":1}, - {"label":"Return", "x":14.5, "y":1, "w":1.25, "h":2}, - {"label":"Page", "x":16.25, "y":1}, - {"label":"CapsLock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.5, "y":2}, - {"label":"J", "x":8.5, "y":2}, - {"label":"K", "x":9.5, "y":2}, - {"label":"L", "x":10.5, "y":2}, - {"label":":", "x":11.5, "y":2}, - {"label":"\"", "x":12.5, "y":2}, - {"label":"}", "x":13.5, "y":2}, - {"label":"Page", "x":16.25, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"_", "x":13, "y":3}, - {"label":"App", "x":14, "y":3}, - {"label":"\u2191", "x":15.25, "y":3.25}, - {"label":"Control", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4, "w":1.25}, - {"label":"\u7121\u5909", "x":3.5, "y":4}, - {"x":4.5, "y":4, "w":1.25}, {"x":5.75, "y":4}, - {"x":7.5, "y":4}, {"x":8.5, "y":4, "w":1.75}, - {"label":"\u5909\u63db", "x":10.25, "y":4, "w":1.25}, - {"label":"\u304b\u306a", "x":11.5, "y":4, "w":1.25}, - {"label":"Alt", "x":12.75, "y":4, "w":1.25}, - {"label":"\u2190", "x":14.25, "y":4.25}, - {"label":"\u2193", "x":15.25, "y":4.25}, - {"label":"\u2192", "x":16.25, "y":4.25}] + {"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": [5, 0], "x": 6.75, "y": 0}, + {"matrix": [5, 1], "x": 7.75, "y": 0}, + {"matrix": [5, 2], "x": 8.75, "y": 0}, + {"matrix": [5, 3], "x": 9.75, "y": 0}, + {"matrix": [5, 4], "x": 10.75, "y": 0}, + {"matrix": [5, 5], "x": 11.75, "y": 0}, + {"matrix": [5, 6], "x": 12.75, "y": 0}, + {"matrix": [5, 7], "x": 13.75, "y": 0}, + {"matrix": [5, 8], "x": 14.75, "y": 0}, + + {"matrix": [6, 8], "x": 16.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.25, "y": 1}, + {"matrix": [6, 1], "x": 8.25, "y": 1}, + {"matrix": [6, 2], "x": 9.25, "y": 1}, + {"matrix": [6, 3], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 5], "x": 12.25, "y": 1}, + {"matrix": [6, 6], "x": 13.25, "y": 1}, + {"matrix": [6, 7], "x": 14.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [7, 8], "x": 16.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.5, "y": 2}, + {"matrix": [7, 1], "x": 8.5, "y": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 2}, + {"matrix": [7, 3], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 12.5, "y": 2}, + {"matrix": [7, 6], "x": 13.5, "y": 2}, + + {"matrix": [7, 7], "x": 16.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 8, "y": 3}, + {"matrix": [8, 1], "x": 9, "y": 3}, + {"matrix": [8, 2], "x": 10, "y": 3}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 5], "x": 13, "y": 3}, + {"matrix": [8, 6], "x": 14, "y": 3}, + + {"matrix": [8, 7], "x": 15.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4}, + + {"matrix": [9, 0], "x": 7.5, "y": 4}, + {"matrix": [9, 1], "x": 8.5, "y": 4, "w": 1.75}, + {"matrix": [9, 2], "x": 10.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.5, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25}, + + {"matrix": [9, 7], "x": 14.25, "y": 4.25}, + {"matrix": [8, 8], "x": 15.25, "y": 4.25}, + {"matrix": [9, 8], "x": 16.25, "y": 4.25} + ] } } } diff --git a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h b/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h deleted file mode 100644 index 3984ac778845..000000000000 --- a/keyboards/salicylic_acid3/nknl7jp/nknl7jp.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2021 Salicylic_Acid - -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" - -/* - * ,------------------------------------ ------------------------------------------------------------. - * | L00 | L01 | L02 | L03 | L04 | L05 | | R00 | R01 | R02 | R03 | R04 | R05 | R06 | R07 | R08 | R18 | - * |---------------------------------------------------------------------------------------------------+ - * | L10 | L11 | L12 | L13 | L14 | L15 | | R10 | R11 | R12 | R13 | R14 | R15 | R16 | R17 | R28 | - * |---------------------------------------- ---------------------------------------------------------+ - * | L20 | L21 | L22 | L23 | L24 | L25 | | R20 | R21 | R22 | R23 | R24 | R25 | R26 | R27 | - * |---------------------------------------------------------------------------------------------------+ - * | L30 | L31 | L32 | L33 | L34 | L35 | | R30 | R31 | R32 | R33 | R34 | R35 | R36 | R37| - * |------------------------------------------- -----------------------------------------------------+ - * | L40 | L41 | L42 | L43 | L44 | L45 | | R40 | R41 | R42 | R43 | R44 | R47 | R38 | R48 | - * |---------------------------------------- --------------------------------------------------------' - */ - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, R06, R07, R08, R18, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, R16, R17, R28, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L41, L42, L43, L44, L45, R40, R41, R42, R43, R44, R47, R38, R48 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, KC_NO, KC_NO, KC_NO }, \ - { L10, L11, L12, L13, L14, L15, KC_NO, KC_NO, KC_NO }, \ - { L20, L21, L22, L23, L24, L25, KC_NO, KC_NO, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, KC_NO, KC_NO, KC_NO }, \ - { L40, L41, L42, L43, L44, L45, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38 }, \ - { R40, R41, R42, R43, R44, KC_NO, KC_NO, R47, R48 } \ - } diff --git a/keyboards/sam/s80/info.json b/keyboards/sam/s80/info.json index ff069c000e9a..f36541a08720 100644 --- a/keyboards/sam/s80/info.json +++ b/keyboards/sam/s80/info.json @@ -24,96 +24,109 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (E6,D0)", "x":0, "y":0}, - {"label":"K02 (E6,D2)", "x":2, "y":0}, - {"label":"K03 (E6,D3)", "x":3, "y":0}, - {"label":"K04 (E6,D5)", "x":4, "y":0}, - {"label":"K05 (E6,D4)", "x":5, "y":0}, - {"label":"K06 (E6,D6)", "x":6.5, "y":0}, - {"label":"K07 (E6,D7)", "x":7.5, "y":0}, - {"label":"K08 (E6,B4)", "x":8.5, "y":0}, - {"label":"K68 (F7,B4)", "x":9.5, "y":0}, - {"label":"K67 (F7,D7)", "x":11, "y":0}, - {"label":"K65 (F7,D4)", "x":12, "y":0}, - {"label":"K64 (F7,D5)", "x":13, "y":0}, - {"label":"K63 (F7,D3)", "x":14, "y":0}, - {"label":"K66 (F7,D6)", "x":15.25, "y":0}, - {"label":"K62 (F7,D2)", "x":16.25, "y":0}, - {"label":"K61 (F7,D1)", "x":17.25, "y":0}, - {"label":"K10 (B0,D0)", "x":0, "y":1.5}, - {"label":"K11 (B0,D1)", "x":1, "y":1.5}, - {"label":"K12 (B0,D2)", "x":2, "y":1.5}, - {"label":"K13 (B0,D3)", "x":3, "y":1.5}, - {"label":"K14 (B0,D5)", "x":4, "y":1.5}, - {"label":"K15 (B0,D4)", "x":5, "y":1.5}, - {"label":"K16 (B0,D6)", "x":6, "y":1.5}, - {"label":"K17 (B0,D7)", "x":7, "y":1.5}, - {"label":"K18 (B0,B4)", "x":8, "y":1.5}, - {"label":"K78 (F6,B4)", "x":9, "y":1.5}, - {"label":"K70 (F6,D0)", "x":10, "y":1.5}, - {"label":"K77 (F6,D7)", "x":11, "y":1.5}, - {"label":"K75 (F6,D4)", "x":12, "y":1.5}, - {"label":"K74 (F6,D5)", "x":13, "y":1.5}, - {"label":"K73 (F6,D3)", "x":14, "y":1.5}, - {"label":"K76 (F6,D6)", "x":15.25, "y":1.5}, - {"label":"K72 (F6,D2)", "x":16.25, "y":1.5}, - {"label":"K71 (F6,D1)", "x":17.25, "y":1.5}, - {"label":"K20 (B1,D0)", "x":0, "y":2.5, "w":1.5}, - {"label":"K21 (B1,D1)", "x":1.5, "y":2.5}, - {"label":"K22 (B1,D2)", "x":2.5, "y":2.5}, - {"label":"K23 (B1,D3)", "x":3.5, "y":2.5}, - {"label":"K24 (B1,D5)", "x":4.5, "y":2.5}, - {"label":"K25 (B1,D4)", "x":5.5, "y":2.5}, - {"label":"K26 (B1,D6)", "x":6.5, "y":2.5}, - {"label":"K27 (B1,D7)", "x":7.5, "y":2.5}, - {"label":"K28 (B1,B4)", "x":8.5, "y":2.5}, - {"label":"K88 (F5,B4)", "x":9.5, "y":2.5}, - {"label":"K87 (F5,D7)", "x":10.5, "y":2.5}, - {"label":"K85 (F5,D4)", "x":11.5, "y":2.5}, - {"label":"K84 (F5,D5)", "x":12.5, "y":2.5}, - {"label":"K94 (F4,D5)", "x":13.5, "y":2.5, "w":1.5}, - {"label":"K86 (F5,D6)", "x":15.25, "y":2.5}, - {"label":"K82 (F5,D2)", "x":16.25, "y":2.5}, - {"label":"K81 (F5,D1)", "x":17.25, "y":2.5}, - {"label":"K30 (B2,D0)", "x":0, "y":3.5, "w":1.75}, - {"label":"K31 (B2,D1)", "x":1.75, "y":3.5}, - {"label":"K32 (B2,D2)", "x":2.75, "y":3.5}, - {"label":"K33 (B2,D3)", "x":3.75, "y":3.5}, - {"label":"K34 (B2,D5)", "x":4.75, "y":3.5}, - {"label":"K35 (B2,D4)", "x":5.75, "y":3.5}, - {"label":"K36 (B2,D6)", "x":6.75, "y":3.5}, - {"label":"K37 (B2,D7)", "x":7.75, "y":3.5}, - {"label":"K38 (B2,B4)", "x":8.75, "y":3.5}, - {"label":"K98 (F4,B4)", "x":9.75, "y":3.5}, - {"label":"K97 (F4,D7)", "x":10.75, "y":3.5}, - {"label":"K95 (F4,D4)", "x":11.75, "y":3.5}, - {"label":"K83 (F5,D3)", "x":12.75, "y":3.5, "w":2.25}, - {"label":"K40 (B3,D0)", "x":0, "y":4.5, "w":1.25}, - {"label":"K41 (B3,D1)", "x":1.25, "y":4.5}, - {"label":"K42 (B3,D2)", "x":2.25, "y":4.5}, - {"label":"K43 (B3,D3)", "x":3.25, "y":4.5}, - {"label":"K44 (B3,D5)", "x":4.25, "y":4.5}, - {"label":"K45 (B3,D4)", "x":5.25, "y":4.5}, - {"label":"K46 (B3,D6)", "x":6.25, "y":4.5}, - {"label":"K47 (B3,D7)", "x":7.25, "y":4.5}, - {"label":"K48 (B3,B4)", "x":8.25, "y":4.5}, - {"label":"KA8 (F1,B4)", "x":9.25, "y":4.5}, - {"label":"KA7 (F1,D7)", "x":10.25, "y":4.5}, - {"label":"KA5 (F1,D4)", "x":11.25, "y":4.5}, - {"label":"KA4 (F1,D5)", "x":12.25, "y":4.5, "w":1.75}, - {"label":"KA3 (F1,D3)", "x":14, "y":4.5}, - {"label":"K92 (F4,D2)", "x":16.25, "y":4.5}, - {"label":"K50 (B7,D0)", "x":0, "y":5.5, "w":1.25}, - {"label":"K51 (B7,D1)", "x":1.25, "y":5.5, "w":1.25}, - {"label":"K52 (B7,D2)", "x":2.5, "y":5.5, "w":1.25}, - {"label":"K56 (B7,D6)", "x":3.75, "y":5.5, "w":6.25}, - {"label":"K58 (B7,B4)", "x":10, "y":5.5, "w":1.25}, - {"label":"K57 (B7,D7)", "x":11.25, "y":5.5, "w":1.25}, - {"label":"K54 (B7,D5)", "x":12.5, "y":5.5, "w":1.25}, - {"label":"K53 (B7,D3)", "x":13.75, "y":5.5, "w":1.25}, - {"label":"KA6 (F1,D6)", "x":15.25, "y":5.5}, - {"label":"KA2 (F1,D2)", "x":16.25, "y":5.5}, - {"label":"KA1 (F1,D1)", "x":17.25, "y":5.5} + {"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": [6, 8], "x": 9.5, "y": 0}, + + {"matrix": [6, 7], "x": 11, "y": 0}, + {"matrix": [6, 5], "x": 12, "y": 0}, + {"matrix": [6, 4], "x": 13, "y": 0}, + {"matrix": [6, 3], "x": 14, "y": 0}, + + {"matrix": [6, 6], "x": 15.25, "y": 0}, + {"matrix": [6, 2], "x": 16.25, "y": 0}, + {"matrix": [6, 1], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [7, 8], "x": 9, "y": 1.5}, + {"matrix": [7, 0], "x": 10, "y": 1.5}, + {"matrix": [7, 7], "x": 11, "y": 1.5}, + {"matrix": [7, 5], "x": 12, "y": 1.5}, + {"matrix": [7, 4], "x": 13, "y": 1.5}, + {"matrix": [7, 3], "x": 14, "y": 1.5}, + + {"matrix": [7, 6], "x": 15.25, "y": 1.5}, + {"matrix": [7, 2], "x": 16.25, "y": 1.5}, + {"matrix": [7, 1], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [8, 8], "x": 9.5, "y": 2.5}, + {"matrix": [8, 7], "x": 10.5, "y": 2.5}, + {"matrix": [8, 5], "x": 11.5, "y": 2.5}, + {"matrix": [8, 4], "x": 12.5, "y": 2.5}, + {"matrix": [9, 4], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [8, 6], "x": 15.25, "y": 2.5}, + {"matrix": [8, 2], "x": 16.25, "y": 2.5}, + {"matrix": [8, 1], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [9, 8], "x": 9.75, "y": 3.5}, + {"matrix": [9, 7], "x": 10.75, "y": 3.5}, + {"matrix": [9, 5], "x": 11.75, "y": 3.5}, + {"matrix": [8, 3], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [10, 8], "x": 9.25, "y": 4.5}, + {"matrix": [10, 7], "x": 10.25, "y": 4.5}, + {"matrix": [10, 5], "x": 11.25, "y": 4.5}, + {"matrix": [10, 4], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [10, 3], "x": 14, "y": 4.5}, + + {"matrix": [9, 2], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 8], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 7], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 6], "x": 15.25, "y": 5.5}, + {"matrix": [10, 2], "x": 16.25, "y": 5.5}, + {"matrix": [10, 1], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/sam/s80/s80.h b/keyboards/sam/s80/s80.h deleted file mode 100644 index 482688b0a18b..000000000000 --- a/keyboards/sam/s80/s80.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2020 CMM.Studio Freather - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K68, K67, K65, K64, K63, K66, K62, K61, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K78, K70, K77, K75, K74, K73, K76, K72, K71, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84, K94, K86, K82, K81, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K83, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA3, K92, \ - K50, K51, K52, K56, K58, K57, K54, K53, KA6, KA2, KA1 \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \ - { K50, K51, K52, K53, K54, KC_NO, K56, K57, K58 }, \ - { KC_NO, K61, K62, K63, K64, K65, K66, K67, K68 }, \ - { K70, K71, K72, K73, K74, K75, K76, K77, K78 }, \ - { KC_NO, K81, K82, K83, K84, K85, K86, K87, K88 }, \ - { KC_NO, KC_NO, K92, KC_NO, K94, K95, KC_NO, K97, K98 }, \ - { KC_NO, KA1, KA2, KA3, KA4, KA5, KA6, KA7, KA8 }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/satt/comet46/comet46.h b/keyboards/satt/comet46/comet46.h deleted file mode 100644 index 094d960e2000..000000000000 --- a/keyboards/satt/comet46/comet46.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The first section contains all of the arguements -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - k04, k01, k13, k10, k22, k33, k36, k27, k19, k16, k08, k05, \ - k03, k00, k12, k24, k21, k32, k43, k46, k37, k28, k25, k17, k09, k06, \ - k02, k14, k11, k23, k20, k31, k42, k47, k38, k29, k26, k18, k15, k07, \ - k34, k44, k41, k48, k45, k35 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { XXX, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \ - { XXX, k41, k42, k43, k44, k45, k46, k47, k48, XXX } \ -} diff --git a/keyboards/satt/comet46/info.json b/keyboards/satt/comet46/info.json index e8169348b634..5b11be662e53 100644 --- a/keyboards/satt/comet46/info.json +++ b/keyboards/satt/comet46/info.json @@ -13,55 +13,59 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"TAB", "x":0, "y":0.45}, - {"label":"Q", "x":1, "y":0.45}, - {"label":"W", "x":2, "y":0.15}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.3}, - {"label":"T", "x":5, "y":0.45}, - {"label":"Y", "x":9, "y":0.45}, - {"label":"U", "x":10, "y":0.3}, - {"label":"I", "x":11, "y":0}, - {"label":"O", "x":12, "y":0.15}, - {"label":"P", "x":13, "y":0.45}, - {"label":"BSPC", "x":14, "y":0.45}, + {"matrix": [0, 4], "x": 0, "y": 0.45}, + {"matrix": [0, 1], "x": 1, "y": 0.45}, + {"matrix": [1, 3], "x": 2, "y": 0.15}, + {"matrix": [1, 0], "x": 3, "y": 0}, + {"matrix": [2, 2], "x": 4, "y": 0.3}, + {"matrix": [3, 3], "x": 5, "y": 0.45}, - {"label":"LCTL", "x":0, "y":1.45}, - {"label":"A", "x":1, "y":1.45}, - {"label":"S", "x":2, "y":1.15}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.3}, - {"label":"G", "x":5, "y":1.45}, - {"label":"ESC", "x":6, "y":1}, - {"label":"DEL", "x":8, "y":1}, - {"label":"H", "x":9, "y":1.45}, - {"label":"J", "x":10, "y":1.3}, - {"label":"K", "x":11, "y":1}, - {"label":"L", "x":12, "y":1.15}, - {"label":"SCLN", "x":13, "y":1.45}, - {"label":"QUOT", "x":14, "y":1.45}, + {"matrix": [3, 6], "x": 9, "y": 0.45}, + {"matrix": [2, 7], "x": 10, "y": 0.3}, + {"matrix": [1, 9], "x": 11, "y": 0}, + {"matrix": [1, 6], "x": 12, "y": 0.15}, + {"matrix": [0, 8], "x": 13, "y": 0.45}, + {"matrix": [0, 5], "x": 14, "y": 0.45}, - {"label":"LSFT", "x":0, "y":2.45}, - {"label":"Z", "x":1, "y":2.45}, - {"label":"X", "x":2, "y":2.15}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.3}, - {"label":"B", "x":5, "y":2.45}, - {"label":"LCBR", "x":6, "y":2}, - {"label":"RCBR", "x":8, "y":2}, - {"label":"N", "x":9, "y":2.45}, - {"label":"M", "x":10, "y":2.3}, - {"label":"COMM", "x":11, "y":2}, - {"label":"DOT", "x":12, "y":2.15}, - {"label":"SLSH", "x":13, "y":2.45}, - {"label":"RSFT", "x":14, "y":2.45}, + {"matrix": [0, 3], "x": 0, "y": 1.45}, + {"matrix": [0, 0], "x": 1, "y": 1.45}, + {"matrix": [1, 2], "x": 2, "y": 1.15}, + {"matrix": [2, 4], "x": 3, "y": 1}, + {"matrix": [2, 1], "x": 4, "y": 1.3}, + {"matrix": [3, 2], "x": 5, "y": 1.45}, + {"matrix": [4, 3], "x": 6, "y": 1}, - {"label":"LGUI", "x":4, "y":3.9}, - {"label":"LOWER", "x":5, "y":3.9}, - {"label":"SPACE", "x":6, "y":3.4, "h":1.5}, - {"label":"ENTER", "x":8, "y":3.4, "h":1.5}, - {"label":"RAISE", "x":9, "y":3.9}, - {"label":"LALT", "x":10, "y":3.9} + {"matrix": [4, 6], "x": 8, "y": 1}, + {"matrix": [3, 7], "x": 9, "y": 1.45}, + {"matrix": [2, 8], "x": 10, "y": 1.3}, + {"matrix": [2, 5], "x": 11, "y": 1}, + {"matrix": [1, 7], "x": 12, "y": 1.15}, + {"matrix": [0, 9], "x": 13, "y": 1.45}, + {"matrix": [0, 6], "x": 14, "y": 1.45}, + + {"matrix": [0, 2], "x": 0, "y": 2.45}, + {"matrix": [1, 4], "x": 1, "y": 2.45}, + {"matrix": [1, 1], "x": 2, "y": 2.15}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 4, "y": 2.3}, + {"matrix": [3, 1], "x": 5, "y": 2.45}, + {"matrix": [4, 2], "x": 6, "y": 2}, + + {"matrix": [4, 7], "x": 8, "y": 2}, + {"matrix": [3, 8], "x": 9, "y": 2.45}, + {"matrix": [2, 9], "x": 10, "y": 2.3}, + {"matrix": [2, 6], "x": 11, "y": 2}, + {"matrix": [1, 8], "x": 12, "y": 2.15}, + {"matrix": [1, 5], "x": 13, "y": 2.45}, + {"matrix": [0, 7], "x": 14, "y": 2.45}, + + {"matrix": [3, 4], "x": 4, "y": 3.9}, + {"matrix": [4, 4], "x": 5, "y": 3.9}, + {"matrix": [4, 1], "x": 6, "y": 3.4, "h": 1.5}, + + {"matrix": [4, 8], "x": 8, "y": 3.4, "h": 1.5}, + {"matrix": [4, 5], "x": 9, "y": 3.9}, + {"matrix": [3, 5], "x": 10, "y": 3.9} ] } } diff --git a/keyboards/satt/comet46/lib/host_led_state_reader.c b/keyboards/satt/comet46/lib/host_led_state_reader.c index 864b1e24475f..758fc4c1dcb6 100644 --- a/keyboards/satt/comet46/lib/host_led_state_reader.c +++ b/keyboards/satt/comet46/lib/host_led_state_reader.c @@ -1,5 +1,5 @@ #include -#include "comet46.h" +#include "quantum.h" char host_led_state_str[22]; diff --git a/keyboards/satt/comet46/lib/modifier_state_reader.c b/keyboards/satt/comet46/lib/modifier_state_reader.c index 518eef92a623..c85c83b1dea0 100644 --- a/keyboards/satt/comet46/lib/modifier_state_reader.c +++ b/keyboards/satt/comet46/lib/modifier_state_reader.c @@ -1,5 +1,5 @@ #include -#include "comet46.h" +#include "quantum.h" char modifier_state_str[22]; diff --git a/keyboards/satt/vision/info.json b/keyboards/satt/vision/info.json index 15977a589280..90dad63451dc 100644 --- a/keyboards/satt/vision/info.json +++ b/keyboards/satt/vision/info.json @@ -17,7 +17,65 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"PgUp", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"Q", "x":2.25, "y":0}, {"label":"W", "x":3.25, "y":0}, {"label":"E", "x":4.25, "y":0}, {"label":"R", "x":5.25, "y":0}, {"label":"T", "x":6.25, "y":0}, {"label":"Y", "x":9, "y":0}, {"label":"U", "x":10, "y":0}, {"label":"I", "x":11, "y":0}, {"label":"O", "x":12, "y":0}, {"label":"P", "x":13, "y":0}, {"label":"Back", "x":14, "y":0}, {"label":"Del", "x":15, "y":0}, {"label":"PgDn", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.25}, {"label":"A", "x":2.5, "y":1}, {"label":"S", "x":3.5, "y":1}, {"label":"D", "x":4.5, "y":1}, {"label":"F", "x":5.5, "y":1}, {"label":"G", "x":6.5, "y":1}, {"label":"H", "x":9.25, "y":1}, {"label":"J", "x":10.25, "y":1}, {"label":"K", "x":11.25, "y":1}, {"label":"L", "x":12.25, "y":1}, {"label":":", "x":13.25, "y":1}, {"label":"\"", "x":14.25, "y":1, "w":1.75}, {"label":"Shift", "x":1.25, "y":2, "w":1.75}, {"label":"Z", "x":3, "y":2}, {"label":"X", "x":4, "y":2}, {"label":"C", "x":5, "y":2}, {"label":"V", "x":6, "y":2}, {"label":"B", "x":7, "y":2}, {"label":"B", "x":8.75, "y":2}, {"label":"N", "x":9.75, "y":2}, {"label":"M", "x":10.75, "y":2}, {"label":"<", "x":11.75, "y":2}, {"label":">", "x":12.75, "y":2}, {"label":"?", "x":13.75, "y":2, "w":1.25}, {"label":"Adjust", "x":15, "y":2}, {"label":"Win", "x":1.25, "y":3, "w":1.5}, {"label":"Alt", "x":3.75, "y":3, "w":1.5}, {"label":"Lower", "x":5.25, "y":3, "w":2}, {"x":7.25, "y":3}, {"label":"Raise", "x":8.75, "y":3, "w":1.75}, {"label":"Enter", "x":10.5, "y":3}, {"label":"Alt", "x":11.5, "y":3, "w":1.5}, {"label":"Ctrl", "x":14.5, "y":3, "w":1.5}] + "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "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, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1, "w": 1.25}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [1, 7], "x": 9.25, "y": 1}, + {"matrix": [1, 8], "x": 10.25, "y": 1}, + {"matrix": [1, 9], "x": 11.25, "y": 1}, + {"matrix": [1, 10], "x": 12.25, "y": 1}, + {"matrix": [1, 11], "x": 13.25, "y": 1}, + {"matrix": [1, 13], "x": 14.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 1], "x": 1.25, "y": 2, "w": 1.75}, + {"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.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 13], "x": 15, "y": 2}, + + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.5}, + {"matrix": [3, 5], "x": 5.25, "y": 3, "w": 2}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + + {"matrix": [3, 7], "x": 8.75, "y": 3, "w": 1.75}, + {"matrix": [3, 9], "x": 10.5, "y": 3}, + {"matrix": [3, 10], "x": 11.5, "y": 3, "w": 1.5}, + {"matrix": [3, 13], "x": 14.5, "y": 3, "w": 1.5} + ] } } } diff --git a/keyboards/satt/vision/vision.h b/keyboards/satt/vision/vision.h deleted file mode 100644 index 4906d4fcd1c5..000000000000 --- a/keyboards/satt/vision/vision.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 SatT - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K113, \ - K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K301, K303, K305, K306, K307, K309, K310, K313 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, KC_NO, K113 }, \ - { KC_NO, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { KC_NO, K301, KC_NO, K303, KC_NO, K305, K306, K307, KC_NO, K309, K310, KC_NO, KC_NO, K313 }, \ -} diff --git a/keyboards/scatter42/info.json b/keyboards/scatter42/info.json index 748093a516ec..7c76e98f6448 100644 --- a/keyboards/scatter42/info.json +++ b/keyboards/scatter42/info.json @@ -21,216 +21,55 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Q", - "x": 0, - "y": 0.5 - }, - { - "label": "W", - "x": 1, - "y": 0.25 - }, - { - "label": "E", - "x": 2, - "y": 0 - }, - { - "label": "R", - "x": 3, - "y": 0.25 - }, - { - "label": "T", - "x": 4, - "y": 0.5 - }, - { - "label": "Y", - "x": 9, - "y": 0.5 - }, - { - "label": "U", - "x": 10, - "y": 0.25 - }, - { - "label": "I", - "x": 11, - "y": 0 - }, - { - "label": "O", - "x": 12, - "y": 0.25 - }, - { - "label": "P", - "x": 13, - "y": 0.5 - }, - { - "label": "A", - "x": 0, - "y": 1.5 - }, - { - "label": "S", - "x": 1, - "y": 1.25 - }, - { - "label": "D", - "x": 2, - "y": 1 - }, - { - "label": "F", - "x": 3, - "y": 1.25 - }, - { - "label": "G", - "x": 4, - "y": 1.5 - }, - { - "label": "H", - "x": 9, - "y": 1.5 - }, - { - "label": "J", - "x": 10, - "y": 1.25 - }, - { - "label": "K", - "x": 11, - "y": 1 - }, - { - "label": "L", - "x": 12, - "y": 1.25 - }, - { - "label": ";", - "x": 13, - "y": 1.5 - }, - { - "label": "Z", - "x": 0, - "y": 2.5 - }, - { - "label": "X", - "x": 1, - "y": 2.25 - }, - { - "label": "C", - "x": 2, - "y": 2 - }, - { - "label": "V", - "x": 3, - "y": 2.25 - }, - { - "label": "B", - "x": 4, - "y": 2.5 - }, - { - "label": "N", - "x": 9, - "y": 2.5 - }, - { - "label": "M", - "x": 10, - "y": 2.25 - }, - { - "label": ",", - "x": 11, - "y": 2 - }, - { - "label": ".", - "x": 12, - "y": 2.25 - }, - { - "label": "/", - "x": 13, - "y": 2.5 - }, - { - "label": "Ctrl", - "x": 0, - "y": 3.5 - }, - { - "label": "Shift", - "x": 1, - "y": 3.25 - }, - { - "label": "Tab", - "x": 2, - "y": 3 - }, - { - "label": "Super", - "x": 3.5, - "y": 3.625 - }, - { - "label": "Lower", - "x": 4.5, - "y": 3.875 - }, - { - "label": "Space", - "x": 5.5, - "y": 4.125 - }, - { - "label": "Enter", - "x": 7.45, - "y": 4.125 - }, - { - "label": "Raise", - "x": 8.45, - "y": 3.875 - }, - { - "label": "Alt", - "x": 9.45, - "y": 3.625 - }, - { - "label": "Back", - "x": 11, - "y": 3 - }, - { - "label": "Shift", - "x": 12, - "y": 3.25 - }, - { - "label": "Ctrl", - "x": 13, - "y": 3.5 - } + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.25}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, + + {"matrix": [4, 4], "x": 9, "y": 0.5}, + {"matrix": [4, 3], "x": 10, "y": 0.25}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + + {"matrix": [5, 4], "x": 9, "y": 1.5}, + {"matrix": [5, 3], "x": 10, "y": 1.25}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.25}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 4], "x": 9, "y": 2.5}, + {"matrix": [6, 3], "x": 10, "y": 2.25}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.25}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3.625}, + {"matrix": [3, 4], "x": 4.5, "y": 3.875}, + {"matrix": [3, 5], "x": 5.5, "y": 4.125}, + + {"matrix": [7, 5], "x": 7.45, "y": 4.125}, + {"matrix": [7, 4], "x": 8.45, "y": 3.875}, + {"matrix": [7, 3], "x": 9.45, "y": 3.625}, + {"matrix": [7, 2], "x": 11, "y": 3}, + {"matrix": [7, 1], "x": 12, "y": 3.25}, + {"matrix": [7, 0], "x": 13, "y": 3.5} ] } } diff --git a/keyboards/scatter42/scatter42.h b/keyboards/scatter42/scatter42.h deleted file mode 100644 index 2aae6a5e9ac5..000000000000 --- a/keyboards/scatter42/scatter42.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2020 bbrfkr - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04, KC_NO }, \ - { L10, L11, L12, L13, L14, KC_NO }, \ - { L20, L21, L22, L23, L24, KC_NO }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R04, R03, R02, R01, R00, KC_NO }, \ - { R14, R13, R12, R11, R10, KC_NO }, \ - { R24, R23, R22, R21, R20, KC_NO }, \ - { R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/sekigon/grs_70ec/grs_70ec.h b/keyboards/sekigon/grs_70ec/grs_70ec.h index 7b2b0c596ca0..9f0c9e2545cb 100644 --- a/keyboards/sekigon/grs_70ec/grs_70ec.h +++ b/keyboards/sekigon/grs_70ec/grs_70ec.h @@ -20,30 +20,3 @@ void led_on(void); void led_off(void); - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, R07, \ - L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, R17, \ - L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, R27, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, R37, \ - L40, L42, L43, L45, L46, R40, R41, R42, R43, R45, R46, R47 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, KC_NO }, \ - { KC_NO, L11, L12, L13, L14, L15, L16, KC_NO }, \ - { KC_NO, L21, L22, L23, L24, L25, L26, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36, KC_NO }, \ - { L40, KC_NO, L42, L43, KC_NO, L45, L46, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37 }, \ - { R40, R41, R42, R43, KC_NO, R45, R46, R47 } \ -} diff --git a/keyboards/sekigon/grs_70ec/info.json b/keyboards/sekigon/grs_70ec/info.json index 44a9e30493dd..c213e1e26f81 100644 --- a/keyboards/sekigon/grs_70ec/info.json +++ b/keyboards/sekigon/grs_70ec/info.json @@ -16,76 +16,86 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "k00", "x": 0, "y": 0 }, - { "label": "k01", "x": 1, "y": 0 }, - { "label": "k02", "x": 2, "y": 0 }, - { "label": "k03", "x": 3, "y": 0 }, - { "label": "k04", "x": 4, "y": 0 }, - { "label": "k05", "x": 5, "y": 0 }, - { "label": "k06", "x": 6, "y": 0 }, - { "label": "k50", "x": 7.75, "y": 0 }, - { "label": "k51", "x": 8.75, "y": 0 }, - { "label": "k52", "x": 9.75, "y": 0 }, - { "label": "k53", "x": 10.75, "y": 0 }, - { "label": "k54", "x": 11.75, "y": 0 }, - { "label": "k55", "x": 12.75, "y": 0 }, - { "label": "k56", "x": 13.75, "y": 0 }, - { "label": "k57", "x": 14.75, "y": 0 }, - { "label": "k11", "x": 0, "y": 1, "w": 1.5 }, - { "label": "k12", "x": 1.5, "y": 1 }, - { "label": "k13", "x": 2.5, "y": 1 }, - { "label": "k14", "x": 3.5, "y": 1 }, - { "label": "k15", "x": 4.5, "y": 1 }, - { "label": "k16", "x": 5.5, "y": 1 }, - { "label": "k60", "x": 7.25, "y": 1 }, - { "label": "k61", "x": 8.25, "y": 1 }, - { "label": "k62", "x": 9.25, "y": 1 }, - { "label": "k63", "x": 10.25, "y": 1 }, - { "label": "k64", "x": 11.25, "y": 1 }, - { "label": "k65", "x": 12.25, "y": 1 }, - { "label": "k66", "x": 13.25, "y": 1 }, - { "label": "k67", "x": 14.25, "y": 1, "w": 1.5 }, - { "label": "k21", "x": 0, "y": 2, "w": 1.75 }, - { "label": "k22", "x": 1.75, "y": 2 }, - { "label": "k23", "x": 2.75, "y": 2 }, - { "label": "k24", "x": 3.75, "y": 2 }, - { "label": "k25", "x": 4.75, "y": 2 }, - { "label": "k26", "x": 5.75, "y": 2 }, - { "label": "k70", "x": 7.5, "y": 2 }, - { "label": "k71", "x": 8.5, "y": 2 }, - { "label": "k72", "x": 9.5, "y": 2 }, - { "label": "k73", "x": 10.5, "y": 2 }, - { "label": "k74", "x": 11.5, "y": 2 }, - { "label": "k75", "x": 12.5, "y": 2 }, - { "label": "k76", "x": 13.5, "y": 2 }, - { "label": "k77", "x": 14.5, "y": 2 }, - { "label": "k30", "x": 0, "y": 3 }, - { "label": "k31", "x": 1, "y": 3 }, - { "label": "k32", "x": 2, "y": 3 }, - { "label": "k33", "x": 3, "y": 3 }, - { "label": "k34", "x": 4, "y": 3 }, - { "label": "k35", "x": 5, "y": 3 }, - { "label": "k36", "x": 6, "y": 3 }, - { "label": "k80", "x": 7.75, "y": 3 }, - { "label": "k81", "x": 8.75, "y": 3 }, - { "label": "k82", "x": 9.75, "y": 3 }, - { "label": "k83", "x": 10.75, "y": 3 }, - { "label": "k84", "x": 11.75, "y": 3 }, - { "label": "k85", "x": 12.75, "y": 3 }, - { "label": "k86", "x": 13.75, "y": 3 }, - { "label": "k87", "x": 14.75, "y": 3 }, - { "label": "k40", "x": 0, "y": 4, "w": 1.25 }, - { "label": "k42", "x": 2, "y": 4 }, - { "label": "k43", "x": 3, "y": 4, "w": 1.25 }, - { "label": "k45", "x": 4.25, "y": 4, "w": 1.25 }, - { "label": "k46", "x": 5.5, "y": 4, "w": 1.25 }, - { "label": "k90", "x": 7.5, "y": 4, "w": 1.25 }, - { "label": "k91", "x": 8.75, "y": 4, "w": 1.25 }, - { "label": "k92", "x": 10, "y": 4, "w": 1.25 }, - { "label": "k93", "x": 11.25, "y": 4 }, - { "label": "k95", "x": 12.75, "y": 4 }, - { "label": "k96", "x": 13.75, "y": 4 }, - { "label": "k97", "x": 14.75, "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": [5, 0], "x": 7.75, "y": 0}, + {"matrix": [5, 1], "x": 8.75, "y": 0}, + {"matrix": [5, 2], "x": 9.75, "y": 0}, + {"matrix": [5, 3], "x": 10.75, "y": 0}, + {"matrix": [5, 4], "x": 11.75, "y": 0}, + {"matrix": [5, 5], "x": 12.75, "y": 0}, + {"matrix": [5, 6], "x": 13.75, "y": 0}, + {"matrix": [5, 7], "x": 14.75, "y": 0}, + + {"matrix": [1, 1], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.25, "y": 1}, + {"matrix": [6, 1], "x": 8.25, "y": 1}, + {"matrix": [6, 2], "x": 9.25, "y": 1}, + {"matrix": [6, 3], "x": 10.25, "y": 1}, + {"matrix": [6, 4], "x": 11.25, "y": 1}, + {"matrix": [6, 5], "x": 12.25, "y": 1}, + {"matrix": [6, 6], "x": 13.25, "y": 1}, + {"matrix": [6, 7], "x": 14.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 1], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 7.5, "y": 2}, + {"matrix": [7, 1], "x": 8.5, "y": 2}, + {"matrix": [7, 2], "x": 9.5, "y": 2}, + {"matrix": [7, 3], "x": 10.5, "y": 2}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 12.5, "y": 2}, + {"matrix": [7, 6], "x": 13.5, "y": 2}, + {"matrix": [7, 7], "x": 14.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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": [8, 0], "x": 7.75, "y": 3}, + {"matrix": [8, 1], "x": 8.75, "y": 3}, + {"matrix": [8, 2], "x": 9.75, "y": 3}, + {"matrix": [8, 3], "x": 10.75, "y": 3}, + {"matrix": [8, 4], "x": 11.75, "y": 3}, + {"matrix": [8, 5], "x": 12.75, "y": 3}, + {"matrix": [8, 6], "x": 13.75, "y": 3}, + {"matrix": [8, 7], "x": 14.75, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 7.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 11.25, "y": 4}, + + {"matrix": [9, 5], "x": 12.75, "y": 4}, + {"matrix": [9, 6], "x": 13.75, "y": 4}, + {"matrix": [9, 7], "x": 14.75, "y": 4} ] } } diff --git a/keyboards/sendyyeah/bevi/bevi.h b/keyboards/sendyyeah/bevi/bevi.h deleted file mode 100644 index 0a963fe6d6ca..000000000000 --- a/keyboards/sendyyeah/bevi/bevi.h +++ /dev/null @@ -1,38 +0,0 @@ - /* Copyright 2021 sendyyeah - * - * 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(\ - K94 , K00 , K10 , K01 , K11 , K02 , K12 , K03 , K13 , K04 , K14 , K05 , K15 , K06 , K16 , K07 , K17 , K97 , K85 , \ - K84 , K20 , K30 , K21 , K31 , K22 , K32 , K23 , K33 , K24 , K34 , K25 , K35 , K26 , K36 , K27 , K37 , K77 , \ - K40 , K50 , K41 , K51 , K42 , K52 , K43 , K53 , K44 , K54 , K45 , K55 , K46 , K56 , K47 , K57 , \ - K93 , K60 , K70 , K61 , K71 , K62 , K72 , K63 , K73 , K64 , K74 , K65 , K75 , K66 , K76 , K67 , \ - K80 , K90 , K81 , K91 , K82 , K92 , K83 , K95 , K86 , K96 , K87 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17 }, \ - { K20, K21, K22, K23, 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, K84, K85, K86, K87 }, \ - { K90, K91, K92, K93, K94, K95, K96, K97 } \ -} diff --git a/keyboards/sendyyeah/bevi/info.json b/keyboards/sendyyeah/bevi/info.json index b4a62656a244..401d7b42b5b6 100644 --- a/keyboards/sendyyeah/bevi/info.json +++ b/keyboards/sendyyeah/bevi/info.json @@ -18,90 +18,90 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Num", "x":0, "y":0}, - {"label":"/", "x":1, "y":0}, - {"label":"*", "x":2, "y":0}, - {"label":"-", "x":3, "y":0}, - {"label":"`", "x":4, "y":0}, - {"label":"1", "x":5, "y":0}, - {"label":"2", "x":6, "y":0}, - {"label":"3", "x":7, "y":0}, - {"label":"4", "x":8, "y":0}, - {"label":"5", "x":9, "y":0}, - {"label":"6", "x":10, "y":0}, - {"label":"7", "x":11, "y":0}, - {"label":"8", "x":12, "y":0}, - {"label":"9", "x":13, "y":0}, - {"label":"0", "x":14, "y":0}, - {"label":"-", "x":15, "y":0}, - {"label":"=", "x":16, "y":0}, - {"label":"Bksp", "x":17, "y":0}, - {"x":18, "y":0}, + {"matrix": [9, 4], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + {"matrix": [1, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [1, 3], "x": 8, "y": 0}, + {"matrix": [0, 4], "x": 9, "y": 0}, + {"matrix": [1, 4], "x": 10, "y": 0}, + {"matrix": [0, 5], "x": 11, "y": 0}, + {"matrix": [1, 5], "x": 12, "y": 0}, + {"matrix": [0, 6], "x": 13, "y": 0}, + {"matrix": [1, 6], "x": 14, "y": 0}, + {"matrix": [0, 7], "x": 15, "y": 0}, + {"matrix": [1, 7], "x": 16, "y": 0}, + {"matrix": [9, 7], "x": 17, "y": 0}, + {"matrix": [8, 5], "x": 18, "y": 0}, - {"label":"+", "x":0, "y":1, "h":2}, - {"label":"7", "x":1, "y":1}, - {"label":"8", "x":2, "y":1}, - {"label":"9", "x":3, "y":1}, - {"label":"Tab", "x":4, "y":1, "w":1.5}, - {"label":"Q", "x":5.5, "y":1}, - {"label":"W", "x":6.5, "y":1}, - {"label":"E", "x":7.5, "y":1}, - {"label":"R", "x":8.5, "y":1}, - {"label":"T", "x":9.5, "y":1}, - {"label":"Y", "x":10.5, "y":1}, - {"label":"U", "x":11.5, "y":1}, - {"label":"I", "x":12.5, "y":1}, - {"label":"O", "x":13.5, "y":1}, - {"label":"P", "x":14.5, "y":1}, - {"label":"[", "x":15.5, "y":1}, - {"label":"]", "x":16.5, "y":1}, - {"label":"\\", "x":17.5, "y":1, "w":1.5}, + {"matrix": [8, 4], "x": 0, "y": 1, "h": 2}, + {"matrix": [2, 0], "x": 1, "y": 1}, + {"matrix": [3, 0], "x": 2, "y": 1}, + {"matrix": [2, 1], "x": 3, "y": 1}, + {"matrix": [3, 1], "x": 4, "y": 1, "w": 1.5}, + {"matrix": [2, 2], "x": 5.5, "y": 1}, + {"matrix": [3, 2], "x": 6.5, "y": 1}, + {"matrix": [2, 3], "x": 7.5, "y": 1}, + {"matrix": [3, 3], "x": 8.5, "y": 1}, + {"matrix": [2, 4], "x": 9.5, "y": 1}, + {"matrix": [3, 4], "x": 10.5, "y": 1}, + {"matrix": [2, 5], "x": 11.5, "y": 1}, + {"matrix": [3, 5], "x": 12.5, "y": 1}, + {"matrix": [2, 6], "x": 13.5, "y": 1}, + {"matrix": [3, 6], "x": 14.5, "y": 1}, + {"matrix": [2, 7], "x": 15.5, "y": 1}, + {"matrix": [3, 7], "x": 16.5, "y": 1}, + {"matrix": [7, 7], "x": 17.5, "y": 1, "w": 1.5}, - {"label":"4", "x":1, "y":2}, - {"label":"5", "x":2, "y":2}, - {"label":"6", "x":3, "y":2}, - {"label":"Caps", "x":4, "y":2, "w":1.75}, - {"label":"A", "x": 5.75, "y":2}, - {"label":"S", "x": 6.75, "y":2}, - {"label":"D", "x": 7.75, "y":2}, - {"label":"F", "x": 8.75, "y":2}, - {"label":"G", "x": 9.75, "y":2}, - {"label":"H", "x": 10.75, "y":2}, - {"label":"J", "x": 11.75, "y":2}, - {"label":"K", "x": 12.75, "y":2}, - {"label":"L", "x": 13.75, "y":2}, - {"label":";", "x": 14.75, "y":2}, - {"label":"'", "x": 15.75, "y":2}, - {"label":"Enter", "x": 16.75, "y":2, "w":2.25}, + {"matrix": [4, 0], "x": 1, "y": 2}, + {"matrix": [5, 0], "x": 2, "y": 2}, + {"matrix": [4, 1], "x": 3, "y": 2}, + {"matrix": [5, 1], "x": 4, "y": 2, "w": 1.75}, + {"matrix": [4, 2], "x": 5.75, "y": 2}, + {"matrix": [5, 2], "x": 6.75, "y": 2}, + {"matrix": [4, 3], "x": 7.75, "y": 2}, + {"matrix": [5, 3], "x": 8.75, "y": 2}, + {"matrix": [4, 4], "x": 9.75, "y": 2}, + {"matrix": [5, 4], "x": 10.75, "y": 2}, + {"matrix": [4, 5], "x": 11.75, "y": 2}, + {"matrix": [5, 5], "x": 12.75, "y": 2}, + {"matrix": [4, 6], "x": 13.75, "y": 2}, + {"matrix": [5, 6], "x": 14.75, "y": 2}, + {"matrix": [4, 7], "x": 15.75, "y": 2}, + {"matrix": [5, 7], "x": 16.75, "y": 2, "w": 2.25}, - {"label":"Enter", "x":0, "y":3, "h":2}, - {"label":"1", "x":1, "y":3}, - {"label":"2", "x":2, "y":3}, - {"label":"3", "x":3, "y":3}, - {"label":"Shift", "x":4, "y":3, "w":2.25}, - {"label":"Z", "x": 6.25, "y":3}, - {"label":"X", "x": 7.25, "y":3}, - {"label":"C", "x": 8.25, "y":3}, - {"label":"V", "x": 9.25, "y":3}, - {"label":"B", "x": 10.25, "y":3}, - {"label":"N", "x": 11.25, "y":3}, - {"label":"M", "x": 12.25, "y":3}, - {"label":",", "x": 13.25, "y":3}, - {"label":".", "x": 14.25, "y":3}, - {"label":"/", "x": 15.25, "y":3}, - {"label":"Shift", "x": 16.25, "y":3, "w":2.75}, + {"matrix": [9, 3], "x": 0, "y": 3, "h": 2}, + {"matrix": [6, 0], "x": 1, "y": 3}, + {"matrix": [7, 0], "x": 2, "y": 3}, + {"matrix": [6, 1], "x": 3, "y": 3}, + {"matrix": [7, 1], "x": 4, "y": 3, "w": 2.25}, + {"matrix": [6, 2], "x": 6.25, "y": 3}, + {"matrix": [7, 2], "x": 7.25, "y": 3}, + {"matrix": [6, 3], "x": 8.25, "y": 3}, + {"matrix": [7, 3], "x": 9.25, "y": 3}, + {"matrix": [6, 4], "x": 10.25, "y": 3}, + {"matrix": [7, 4], "x": 11.25, "y": 3}, + {"matrix": [6, 5], "x": 12.25, "y": 3}, + {"matrix": [7, 5], "x": 13.25, "y": 3}, + {"matrix": [6, 6], "x": 14.25, "y": 3}, + {"matrix": [7, 6], "x": 15.25, "y": 3}, + {"matrix": [6, 7], "x": 16.25, "y": 3, "w": 2.75}, - {"label":".", "x":1, "y":4}, - {"label":"00", "x":2, "y":4}, - {"label":"0", "x":3, "y":4}, - {"label":"Ctrl", "x":4, "y":4, "w":1.25}, - {"label":"Win", "x":5.25, "y":4, "w":1.25}, - {"label":"Alt", "x":6.5, "y":4, "w":1.25}, - {"label":"Space", "x":7.75, "y":4, "w":6.25}, - {"label":"Alt", "x":14, "y":4, "w":1.25}, - {"label":"Win", "x":15.25, "y":4, "w":1.25}, - {"label":"Fn", "x":16.5, "y":4, "w":1.25}, - {"label":"Ctrl", "x":17.75, "y":4, "w":1.25} + {"matrix": [8, 0], "x": 1, "y": 4}, + {"matrix": [9, 0], "x": 2, "y": 4}, + {"matrix": [8, 1], "x": 3, "y": 4}, + {"matrix": [9, 1], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [8, 2], "x": 5.25, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 7.75, "y": 4, "w": 6.25}, + {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [8, 6], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 16.5, "y": 4, "w": 1.25}, + {"matrix": [8, 7], "x": 17.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/senselessclay/gos65/gos65.c b/keyboards/senselessclay/gos65/gos65.c index fd77aa79ab5c..e769608c8999 100644 --- a/keyboards/senselessclay/gos65/gos65.c +++ b/keyboards/senselessclay/gos65/gos65.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "gos65.h" +#include "quantum.h" void eeconfig_init_kb(void) { // EEPROM is getting reset! rgblight_enable(); // Enable RGB by default diff --git a/keyboards/senselessclay/gos65/gos65.h b/keyboards/senselessclay/gos65/gos65.h deleted file mode 100644 index b8222688d259..000000000000 --- a/keyboards/senselessclay/gos65/gos65.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 Hadi Iskandarani - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K400, K401, K402, K406, K410, K411, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413, K414 } \ -} diff --git a/keyboards/senselessclay/gos65/info.json b/keyboards/senselessclay/gos65/info.json index d35d088a8bb5..170ab5d78cfb 100644 --- a/keyboards/senselessclay/gos65/info.json +++ b/keyboards/senselessclay/gos65/info.json @@ -20,7 +20,82 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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, "w":2.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}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } \ No newline at end of file diff --git a/keyboards/sets3n/kk980/info.json b/keyboards/sets3n/kk980/info.json index b71dff3ec83d..f2d1e4886beb 100644 --- a/keyboards/sets3n/kk980/info.json +++ b/keyboards/sets3n/kk980/info.json @@ -21,110 +21,120 @@ "layouts": { "LAYOUT": { "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":"DEL", "x": 15.5, "y": 0}, - {"label":"INSERT", "x": 16.5, "y": 0}, - {"label":"PGUP", "x": 17.5, "y": 0}, - {"label":"PGDN", "x": 18.5, "y": 0}, - - {"label":"`~", "x": 0, "y": 1.5}, - {"label":"1!", "x": 1, "y": 1.5}, - {"label":"2@", "x": 2, "y": 1.5}, - {"label":"3#", "x": 3, "y": 1.5}, - {"label":"4$", "x": 4, "y": 1.5}, - {"label":"5%", "x": 5, "y": 1.5}, - {"label":"6^", "x": 6, "y": 1.5}, - {"label":"7&", "x": 7, "y": 1.5}, - {"label":"8*", "x": 8, "y": 1.5}, - {"label":"9(", "x": 9, "y": 1.5}, - {"label":"0)", "x": 10, "y": 1.5}, - {"label":"-_", "x": 11, "y": 1.5}, - {"label":"+=", "x": 12, "y": 1.5}, - {"label":"BS", "x": 13, "y": 1.5, "w": 2}, - {"label":"NUML", "x": 15.5, "y": 1.5}, - {"label":"/", "x": 16.5, "y": 1.5}, - {"label":"*", "x": 17.5, "y": 1.5}, - {"label":"-", "x": 18.5, "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":"7", "x": 15.5, "y": 2.5}, - {"label":"8", "x": 16.5, "y": 2.5}, - {"label":"9", "x": 17.5, "y": 2.5}, - - {"label":"CAPS", "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":"RETURN", "x": 12.75, "y": 3.5, "w": 2.25}, - {"label":"4", "x": 15.5, "y": 3.5}, - {"label":"5", "x": 16.5, "y": 3.5}, - {"label":"6", "x": 17.5, "y": 3.5}, - {"label":"+", "x": 18.5, "y": 2.5, "h": 2}, - - {"label":"LSHIFT", "x": 0, "y": 4.5, "w": 2.25}, - {"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":"up", "x": 14.25, "y": 4.75}, - {"label":"1", "x": 15.5, "y": 4.5}, - {"label":"2", "x": 16.5, "y": 4.5}, - {"label":"3", "x": 17.5, "y": 4.5}, - - {"label":"LCTRL", "x": 0, "y": 5.5, "w": 1.25}, - {"label":"LWIN", "x": 1.25, "y": 5.5}, - {"label":"LALT", "x": 2.25, "y": 5.5, "w": 1.25}, - {"label":"SPACE", "x": 3.5, "y": 5.5, "w": 6.25}, - {"label":"RALT", "x": 9.75, "y": 5.5}, - {"label":"FN", "x": 10.75, "y": 5.5}, - {"label":"RCTRL", "x": 11.75, "y": 5.5, "w": 1.25}, - {"label":"LEFT", "x": 13.25, "y": 5.75}, - {"label":"DOWN", "x": 14.25, "y": 5.75}, - {"label":"RIGHT", "x": 15.25, "y": 5.75}, - {"label":"0", "x": 16.5, "y": 5.5}, - {"label":".DEL", "x": 17.5, "y": 5.5}, - {"label":"ENTER", "x": 18.5, "y": 4.5, "h": 2} + {"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.5, "y": 0}, + {"matrix": [0, 14], "x": 16.5, "y": 0}, + {"matrix": [0, 15], "x": 17.5, "y": 0}, + {"matrix": [0, 16], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [5, 6], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 13], "x": 15.5, "y": 1.5}, + {"matrix": [1, 14], "x": 16.5, "y": 1.5}, + {"matrix": [1, 15], "x": 17.5, "y": 1.5}, + {"matrix": [1, 16], "x": 18.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [5, 7], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 13], "x": 15.5, "y": 2.5}, + {"matrix": [2, 14], "x": 16.5, "y": 2.5}, + {"matrix": [2, 15], "x": 17.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [3, 13], "x": 15.5, "y": 3.5}, + {"matrix": [3, 14], "x": 16.5, "y": 3.5}, + {"matrix": [3, 15], "x": 17.5, "y": 3.5}, + {"matrix": [3, 16], "x": 18.5, "y": 2.5, "h": 2}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.5}, + {"matrix": [4, 2], "x": 3.25, "y": 4.5}, + {"matrix": [4, 3], "x": 4.25, "y": 4.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.5}, + {"matrix": [4, 5], "x": 6.25, "y": 4.5}, + {"matrix": [4, 6], "x": 7.25, "y": 4.5}, + {"matrix": [4, 7], "x": 8.25, "y": 4.5}, + {"matrix": [4, 8], "x": 9.25, "y": 4.5}, + {"matrix": [4, 9], "x": 10.25, "y": 4.5}, + {"matrix": [4, 10], "x": 11.25, "y": 4.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4.5, "w": 1.75}, + + {"matrix": [4, 12], "x": 14.25, "y": 4.75}, + + {"matrix": [4, 13], "x": 15.5, "y": 4.5}, + {"matrix": [4, 14], "x": 16.5, "y": 4.5}, + {"matrix": [4, 15], "x": 17.5, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5}, + {"matrix": [5, 2], "x": 2.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 5], "x": 3.5, "y": 5.5, "w": 6.25}, + {"matrix": [5, 8], "x": 9.75, "y": 5.5}, + {"matrix": [5, 9], "x": 10.75, "y": 5.5}, + {"matrix": [5, 10], "x": 11.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 11], "x": 13.25, "y": 5.75}, + {"matrix": [5, 12], "x": 14.25, "y": 5.75}, + {"matrix": [5, 13], "x": 15.25, "y": 5.75}, + + {"matrix": [5, 14], "x": 16.5, "y": 5.5}, + {"matrix": [5, 15], "x": 17.5, "y": 5.5}, + {"matrix": [5, 16], "x": 18.5, "y": 4.5, "h": 2} ] } } diff --git a/keyboards/sets3n/kk980/kk980.h b/keyboards/sets3n/kk980/kk980.h deleted file mode 100644 index c7589e8c4008..000000000000 --- a/keyboards/sets3n/kk980/kk980.h +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2021 Sets3n - * - * 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 XXX KC_NO - -/* - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ - * │00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0D │0E │0F │0G │ - * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┬───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │56 │ │1D │1E │1F │1G │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┼───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │57 │ │2D │2E │2F │ │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ ├───┼───┼───┤3G │ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │ │3D │3E │3F │ │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┘ ├───┼───┼───┼───┤ - * │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4B │┌───┐│4D │4E │4F │ │ - * ├────┬───┼───┴┬──┴───┴───┴───┴───┴───┴─┬─┴─┬─┴─┬─┴──┬───┘│4C │└───┼───┼───┤5G │ - * │50 │51 │52 │55 │58 │59 │5A │┌───┼───┼───┐│5E │5F │ │ - * └────┴───┴────┴────────────────────────┴───┴───┴────┘│5B │5C │5D │└───┴───┴───┘ - * └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K56, K1D, K1E, K1F, K1G, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K57, K2D, K2E, K2F, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, \ - K50, K51, K52, K55, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K5G \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, 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, XXX }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F, K3G }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, K4F, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5E, K5F, K5G } \ -} diff --git a/keyboards/shambles/info.json b/keyboards/shambles/info.json index b57cdd3a0083..b49849b5c6e3 100644 --- a/keyboards/shambles/info.json +++ b/keyboards/shambles/info.json @@ -17,7 +17,65 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1.5, "y":0}, {"label":"K02", "x":2.5, "y":0}, {"label":"K03", "x":3.5, "y":0}, {"label":"K04", "x":4.75, "y":0}, {"label":"K05", "x":5.75, "y":0}, {"label":"K06", "x":6.75, "y":0}, {"label":"K07", "x":8, "y":0}, {"label":"K08", "x":9, "y":0}, {"label":"K09", "x":10.25, "y":0}, {"label":"K10", "x":11.25, "y":0}, {"label":"K11", "x":12.25, "y":0}, {"label":"K12", "x":0, "y":1.5}, {"label":"K13", "x":1, "y":1.5}, {"label":"K14", "x":2, "y":1.5}, {"label":"K15", "x":3, "y":1.5}, {"label":"K16", "x":4, "y":1.5}, {"label":"K17", "x":5, "y":1.5}, {"label":"K18", "x":6, "y":1.5}, {"label":"K19", "x":7, "y":1.5}, {"label":"K20", "x":8, "y":1.5}, {"label":"K21", "x":9, "y":1.5}, {"label":"K22", "x":10.25, "y":1.25}, {"label":"K23", "x":11.25, "y":1.25}, {"label":"K24", "x":12.25, "y":1.25}, {"label":"K25", "x":0, "y":2.5}, {"label":"K26", "x":1, "y":2.5}, {"label":"K27", "x":2, "y":2.5}, {"label":"K28", "x":3, "y":2.5}, {"label":"K29", "x":4, "y":2.5}, {"label":"K30", "x":5, "y":2.5}, {"label":"K31", "x":6, "y":2.5}, {"label":"K32", "x":7, "y":2.5}, {"label":"K33", "x":8, "y":2.5}, {"label":"K34", "x":9, "y":2.5}, {"label":"K35", "x":11.25, "y":2.5}, {"label":"K36", "x":0.5, "y":3.5}, {"label":"K37", "x":1.5, "y":3.5}, {"label":"K38", "x":2.5, "y":3.5}, {"label":"K39", "x":3.5, "y":3.5}, {"label":"K40", "x":4.5, "y":3.5, "w":2}, {"label":"K41", "x":6.5, "y":3.5}, {"label":"K42", "x":7.5, "y":3.5}, {"label":"K43", "x":8.5, "y":3.5}, {"label":"K44", "x":10.25, "y":3.5}, {"label":"K45", "x":11.25, "y":3.5}, {"label":"K43", "x":12.25, "y":3.5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + + {"matrix": [0, 5], "x": 4.75, "y": 0}, + {"matrix": [0, 6], "x": 5.75, "y": 0}, + {"matrix": [0, 7], "x": 6.75, "y": 0}, + + {"matrix": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + + {"matrix": [1, 10], "x": 10.25, "y": 1.25}, + {"matrix": [1, 11], "x": 11.25, "y": 1.25}, + {"matrix": [1, 12], "x": 12.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2, "y": 2.5}, + {"matrix": [2, 3], "x": 3, "y": 2.5}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + {"matrix": [2, 7], "x": 7, "y": 2.5}, + {"matrix": [2, 8], "x": 8, "y": 2.5}, + {"matrix": [2, 9], "x": 9, "y": 2.5}, + + {"matrix": [2, 11], "x": 11.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0.5, "y": 3.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5}, + {"matrix": [3, 3], "x": 3.5, "y": 3.5}, + {"matrix": [3, 5], "x": 4.5, "y": 3.5, "w": 2}, + {"matrix": [3, 6], "x": 6.5, "y": 3.5}, + {"matrix": [3, 7], "x": 7.5, "y": 3.5}, + {"matrix": [3, 8], "x": 8.5, "y": 3.5}, + + {"matrix": [3, 10], "x": 10.25, "y": 3.5}, + {"matrix": [3, 11], "x": 11.25, "y": 3.5}, + {"matrix": [3, 12], "x": 12.25, "y": 3.5} + ] } } } diff --git a/keyboards/shambles/keymaps/default/keymap.c b/keyboards/shambles/keymaps/default/keymap.c index 6a076f7090c4..4ddda3b91949 100644 --- a/keyboards/shambles/keymaps/default/keymap.c +++ b/keyboards/shambles/keymaps/default/keymap.c @@ -1,4 +1,4 @@ -#include "shambles.h" +#include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/shambles/shambles.h b/keyboards/shambles/shambles.h deleted file mode 100644 index 5fb13b635800..000000000000 --- a/keyboards/shambles/shambles.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K005, K006, K007, K008, K009, K010, K011, K012, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K211, \ - K300, K301, K302, K303, K305, K306, K307, K308, K310, K311, K312 \ -) { \ - { K000, K001, K002, K003, KC_NO, K005, K006, K007, K008, K009, K010, K011, K012 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, KC_NO, K211, KC_NO }, \ - { K300, K301, K302, K303, KC_NO, K305, K306, K307, K308, KC_NO, K310, K311, K312 } \ -} diff --git a/keyboards/shapeshifter4060/info.json b/keyboards/shapeshifter4060/info.json index 13c77a9618ce..7f815832dd6f 100644 --- a/keyboards/shapeshifter4060/info.json +++ b/keyboards/shapeshifter4060/info.json @@ -18,57 +18,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.67}, - {"x":1, "y":0.67}, - {"x":2, "y":0.33}, - {"x":3, "y":0}, - {"x":4, "y":0.33}, - {"x":5, "y":0.33}, - {"x":8, "y":0.33}, - {"x":9, "y":0.33}, - {"x":10, "y":0}, - {"x":11, "y":0.33}, - {"x":12, "y":0.67}, - {"x":13, "y":0.67}, + {"matrix": [0, 0], "x": 0, "y": 0.67}, + {"matrix": [0, 1], "x": 1, "y": 0.67}, + {"matrix": [0, 2], "x": 2, "y": 0.33}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.33}, + {"matrix": [0, 5], "x": 5, "y": 0.33}, - {"x":0, "y":1.67}, - {"x":1, "y":1.67}, - {"x":2, "y":1.33}, - {"x":3, "y":1}, - {"x":4, "y":1.33}, - {"x":5, "y":1.33}, - {"x":8, "y":1.33}, - {"x":9, "y":1.33}, - {"x":10, "y":1}, - {"x":11, "y":1.33}, - {"x":12, "y":1.67}, - {"x":13, "y":1.67}, + {"matrix": [0, 6], "x": 8, "y": 0.33}, + {"matrix": [0, 7], "x": 9, "y": 0.33}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.33}, + {"matrix": [0, 10], "x": 12, "y": 0.67}, + {"matrix": [0, 11], "x": 13, "y": 0.67}, - {"x":0, "y":2.67}, - {"x":1, "y":2.67}, - {"x":2, "y":2.33}, - {"x":3, "y":2}, - {"x":4, "y":2.33}, - {"x":5, "y":2.33}, - {"x":8, "y":2.33}, - {"x":9, "y":2.33}, - {"x":10, "y":2}, - {"x":11, "y":2.33}, - {"x":12, "y":2.67}, - {"x":13, "y":2.67}, + {"matrix": [1, 0], "x": 0, "y": 1.67}, + {"matrix": [1, 1], "x": 1, "y": 1.67}, + {"matrix": [1, 2], "x": 2, "y": 1.33}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.33}, + {"matrix": [1, 5], "x": 5, "y": 1.33}, - {"x":0, "y":3.67}, - {"x":1, "y":3.67}, - {"x":2, "y":3.67}, - {"x":3, "y":3.67}, - {"x":4.5, "y":3.42}, - {"x":5.5, "y":3.67}, - {"x":7.5, "y":3.67}, - {"x":8.5, "y":3.42}, - {"x":10, "y":3.67}, - {"x":11, "y":3.67}, - {"x":12, "y":3.67}, - {"x":13, "y":3.67} + {"matrix": [1, 6], "x": 8, "y": 1.33}, + {"matrix": [1, 7], "x": 9, "y": 1.33}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.33}, + {"matrix": [1, 10], "x": 12, "y": 1.67}, + {"matrix": [1, 11], "x": 13, "y": 1.67}, + + {"matrix": [2, 0], "x": 0, "y": 2.67}, + {"matrix": [2, 1], "x": 1, "y": 2.67}, + {"matrix": [2, 2], "x": 2, "y": 2.33}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.33}, + {"matrix": [2, 5], "x": 5, "y": 2.33}, + + {"matrix": [2, 6], "x": 8, "y": 2.33}, + {"matrix": [2, 7], "x": 9, "y": 2.33}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.33}, + {"matrix": [2, 10], "x": 12, "y": 2.67}, + {"matrix": [2, 11], "x": 13, "y": 2.67}, + + {"matrix": [3, 0], "x": 0, "y": 3.67}, + {"matrix": [3, 1], "x": 1, "y": 3.67}, + {"matrix": [3, 2], "x": 2, "y": 3.67}, + {"matrix": [3, 3], "x": 3, "y": 3.67}, + {"matrix": [3, 4], "x": 4.5, "y": 3.42}, + {"matrix": [3, 5], "x": 5.5, "y": 3.67}, + + {"matrix": [3, 6], "x": 7.5, "y": 3.67}, + {"matrix": [3, 7], "x": 8.5, "y": 3.42}, + {"matrix": [3, 8], "x": 10, "y": 3.67}, + {"matrix": [3, 9], "x": 11, "y": 3.67}, + {"matrix": [3, 10], "x": 12, "y": 3.67}, + {"matrix": [3, 11], "x": 13, "y": 3.67} ] } } diff --git a/keyboards/shapeshifter4060/shapeshifter4060.h b/keyboards/shapeshifter4060/shapeshifter4060.h deleted file mode 100644 index 0c5bd7e089f1..000000000000 --- a/keyboards/shapeshifter4060/shapeshifter4060.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2021 Chuck "@vosechu" Lauer Vose - -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 XXX KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, \ - k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, \ - k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, \ - k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11 }, \ - { k12, k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23 }, \ - { k24, k25, k26, k27, k28, k29, k30, k31, k32, k33, k34, k35 }, \ - { k36, k37, k38, k39, k40, k41, k42, k43, k44, k45, k46, k47 }, \ -} diff --git a/keyboards/shoc/info.json b/keyboards/shoc/info.json index 8a4196375cba..2d414d5841aa 100644 --- a/keyboards/shoc/info.json +++ b/keyboards/shoc/info.json @@ -18,70 +18,70 @@ "layouts": { "LAYOUT": { "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": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 5, "y": 1 }, - { "x": 6, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 0, "y": 2, "w": 1.5 }, - { "x": 1.5, "y": 2 }, - { "x": 2.5, "y": 2 }, - { "x": 3.5, "y": 2 }, - { "x": 4.5, "y": 2 }, - { "x": 5.5, "y": 2 }, - { "x": 6.5, "y": 2 }, - { "x": 7.5, "y": 2 }, - { "x": 0, "y": 3, "w": 2 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 5, "y": 3 }, - { "x": 6, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 0, "y": 4, "w": 1.5 }, - { "x": 1.5, "y": 4 }, - { "x": 2.5, "y": 4, "w": 1.5 }, - { "x": 4, "y": 4, "w": 2 }, - { "x": 6, "y": 4 }, - { "x": 7, "y": 4, "w": 2 }, - { "x": 9, "y": 4 }, - { "x": 10, "y": 4 }, - { "x": 12, "y": 0, "w": 2 }, - { "x": 11, "y": 0 }, - { "x": 10, "y": 0 }, - { "x": 9, "y": 0 }, - { "x": 8, "y": 0 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 13, "y": 4 }, - { "x": 12, "y": 4 }, - { "x": 11, "y": 4 }, - { "x": 13, "y": 3 }, - { "x": 12, "y": 3 }, - { "x": 11, "y": 3 }, - { "x": 10, "y": 3 }, - { "x": 9, "y": 3 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 13, "y": 1 }, - { "x": 12.5, "y": 2, "w": 1.5 }, - { "x": 11.5, "y": 2 }, - { "x": 10.5, "y": 2 }, - { "x": 9.5, "y": 2 }, - { "x": 8.5, "y": 2 } + {"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": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 2}, + {"matrix": [4, 4], "x": 6, "y": 4}, + {"matrix": [4, 5], "x": 7, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 9, "y": 4}, + {"matrix": [4, 7], "x": 10, "y": 4}, + {"matrix": [5, 0], "x": 12, "y": 0, "w": 2}, + {"matrix": [5, 1], "x": 11, "y": 0}, + {"matrix": [5, 2], "x": 10, "y": 0}, + {"matrix": [5, 3], "x": 9, "y": 0}, + {"matrix": [5, 4], "x": 8, "y": 0}, + {"matrix": [5, 5], "x": 8, "y": 1}, + {"matrix": [5, 6], "x": 9, "y": 1}, + {"matrix": [5, 7], "x": 10, "y": 1}, + {"matrix": [6, 0], "x": 13, "y": 4}, + {"matrix": [6, 1], "x": 12, "y": 4}, + {"matrix": [6, 2], "x": 11, "y": 4}, + {"matrix": [6, 3], "x": 13, "y": 3}, + {"matrix": [6, 4], "x": 12, "y": 3}, + {"matrix": [6, 5], "x": 11, "y": 3}, + {"matrix": [6, 6], "x": 10, "y": 3}, + {"matrix": [6, 7], "x": 9, "y": 3}, + {"matrix": [7, 0], "x": 11, "y": 1}, + {"matrix": [7, 1], "x": 12, "y": 1}, + {"matrix": [7, 2], "x": 13, "y": 1}, + {"matrix": [7, 3], "x": 12.5, "y": 2, "w": 1.5}, + {"matrix": [7, 4], "x": 11.5, "y": 2}, + {"matrix": [7, 5], "x": 10.5, "y": 2}, + {"matrix": [7, 6], "x": 9.5, "y": 2}, + {"matrix": [7, 7], "x": 8.5, "y": 2} ] } } diff --git a/keyboards/shoc/shoc.h b/keyboards/shoc/shoc.h deleted file mode 100644 index 3ea48781e02a..000000000000 --- a/keyboards/shoc/shoc.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2022 JannikB5825 - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, \ - k10, k11, k12, k13, k14, k15, k16, k17, \ - k20, k21, k22, k23, 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 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17 }, \ - { k20, k21, k22, k23, 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 } \ -} - diff --git a/keyboards/sidderskb/majbritt/rev1/info.json b/keyboards/sidderskb/majbritt/rev1/info.json index aad1ca1a1ef4..bcbac9b10cc8 100644 --- a/keyboards/sidderskb/majbritt/rev1/info.json +++ b/keyboards/sidderskb/majbritt/rev1/info.json @@ -18,73 +18,87 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (D0,F0)", "x":0.75, "y":0.25}, - {"label":"K01 (D0,F1)", "x":1.75, "y":0.25}, - {"label":"K02 (D0,E6)", "x":2.75, "y":0.25}, - {"label":"K03 (D0,C7)", "x":4, "y":0.25}, - {"label":"K04 (D0,C6)", "x":5, "y":0.25}, - {"label":"K05 (D0,B6)", "x":6, "y":0.25}, - {"label":"K06 (D0,D4)", "x":7, "y":0.25}, - {"label":"K07 (D0,B1)", "x":8.75, "y":0.25}, - {"label":"K08 (D0,B0)", "x":9.75, "y":0.25}, - {"label":"K09 (D0,B7)", "x":10.75, "y":0.25}, - {"label":"K0A (D0,B5)", "x":11.75, "y":0.25}, - {"label":"K0B (D0,B4)", "x":13, "y":0.25}, - {"label":"K0C (D0,D7)", "x":14, "y":0.25}, - {"label":"K0D (D0,D6)", "x":15, "y":0.25, "w":2}, - {"label":"K1E (D1,B3)", "x":17.25, "y":0}, - {"label":"K10 (D1,F0)", "x":0.5, "y":1.25, "w":1.5}, - {"label":"K11 (D1,F1)", "x":2, "y":1.25}, - {"label":"K12 (D1,E6)", "x":3.25, "y":1.25}, - {"label":"K13 (D1,C7)", "x":4.25, "y":1.25}, - {"label":"K14 (D1,C6)", "x":5.25, "y":1.25}, - {"label":"K15 (D1,B6)", "x":6.25, "y":1.25}, - {"label":"K16 (D1,D4)", "x":8.5, "y":1.25}, - {"label":"K17 (D1,B1)", "x":9.5, "y":1.25}, - {"label":"K18 (D1,B0)", "x":10.5, "y":1.25}, - {"label":"K19 (D1,B7)", "x":11.5, "y":1.25}, - {"label":"K1A (D1,B5)", "x":12.5, "y":1.25}, - {"label":"K1B (D1,B4)", "x":13.75, "y":1.25}, - {"label":"K1C (D1,D7)", "x":14.75, "y":1.25}, - {"label":"K1D (D1,D6)", "x":16, "y":1.25, "w":1.25, "h":2}, - {"label":"K2E (D2,B3)", "x":17.5, "y":1}, - {"label":"K20 (D2,F0)", "x":0.25, "y":2.25, "w":1.75}, - {"label":"K21 (D2,F1)", "x":2, "y":2.25}, - {"label":"K22 (D2,E6)", "x":3.5, "y":2.25}, - {"label":"K23 (D2,C7)", "x":4.5, "y":2.25}, - {"label":"K24 (D2,C6)", "x":5.5, "y":2.25}, - {"label":"K25 (D2,B6)", "x":6.5, "y":2.25}, - {"label":"K26 (D2,D4)", "x":8.75, "y":2.25}, - {"label":"K27 (D2,B1)", "x":9.75, "y":2.25}, - {"label":"K28 (D2,B0)", "x":10.75, "y":2.25}, - {"label":"K29 (D2,B7)", "x":11.75, "y":2.25}, - {"label":"K2A (D2,B5)", "x":13, "y":2.25}, - {"label":"K2B (D2,B4)", "x":14, "y":2.25}, - {"label":"K2C (D2,D7)", "x":15, "y":2.25}, - {"label":"K3E (D3,B3)", "x":17.75, "y":2}, - {"label":"K30 (D3,F0)", "x":0, "y":3.25, "w":1.25}, - {"label":"K41 (D5,F1)", "x":1.25, "y":3.25}, - {"label":"K31 (D3,F1)", "x":2.25, "y":3.25}, - {"label":"K32 (D3,E6)", "x":3.75, "y":3.25}, - {"label":"K33 (D3,C7)", "x":4.75, "y":3.25}, - {"label":"K34 (D3,C6)", "x":5.75, "y":3.25}, - {"label":"K35 (D3,B6)", "x":6.75, "y":3.25}, - {"label":"K36 (D3,D4)", "x":9, "y":3.25}, - {"label":"K37 (D3,B1)", "x":10, "y":3.25}, - {"label":"K38 (D3,B0)", "x":11, "y":3.25}, - {"label":"K39 (D3,B7)", "x":12, "y":3.25}, - {"label":"K3A (D3,B5)", "x":13.5, "y":3.25}, - {"label":"K3B (D3,B4)", "x":14.5, "y":3.25, "w":1.75}, - {"label":"K3D (D3,D6)", "x":16.5, "y":3.5}, - {"label":"K40 (D5,F0)", "x":0, "y":4.25, "w":1.5}, - {"label":"K42 (D5,E6)", "x":3.75, "y":4.25, "w":1.5}, - {"label":"K44 (D5,C6)", "x":5.25, "y":4.25, "w":2}, - {"label":"K45 (D5,B6)", "x":7.25, "y":4.25}, - {"label":"K47 (D5,B1)", "x":8.5, "y":4.25, "w":2.75}, - {"label":"K49 (D5,B7)", "x":11.25, "y":4.25, "w":1.5}, - {"label":"K4C (D5,D7)", "x":15.5, "y":4.5}, - {"label":"K4D (D5,D6)", "x":16.5, "y":4.5}, - {"label":"K4E (D5,B3)", "x":17.5, "y":4.5} + {"matrix": [0, 0], "x": 0.75, "y": 0.25}, + {"matrix": [0, 1], "x": 1.75, "y": 0.25}, + {"matrix": [0, 2], "x": 2.75, "y": 0.25}, + {"matrix": [0, 3], "x": 4, "y": 0.25}, + {"matrix": [0, 4], "x": 5, "y": 0.25}, + {"matrix": [0, 5], "x": 6, "y": 0.25}, + {"matrix": [0, 6], "x": 7, "y": 0.25}, + + {"matrix": [0, 7], "x": 8.75, "y": 0.25}, + {"matrix": [0, 8], "x": 9.75, "y": 0.25}, + {"matrix": [0, 9], "x": 10.75, "y": 0.25}, + {"matrix": [0, 10], "x": 11.75, "y": 0.25}, + {"matrix": [0, 11], "x": 13, "y": 0.25}, + {"matrix": [0, 12], "x": 14, "y": 0.25}, + {"matrix": [0, 13], "x": 15, "y": 0.25, "w": 2}, + + {"matrix": [1, 14], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1.25}, + {"matrix": [1, 2], "x": 3.25, "y": 1.25}, + {"matrix": [1, 3], "x": 4.25, "y": 1.25}, + {"matrix": [1, 4], "x": 5.25, "y": 1.25}, + {"matrix": [1, 5], "x": 6.25, "y": 1.25}, + + {"matrix": [1, 6], "x": 8.5, "y": 1.25}, + {"matrix": [1, 7], "x": 9.5, "y": 1.25}, + {"matrix": [1, 8], "x": 10.5, "y": 1.25}, + {"matrix": [1, 9], "x": 11.5, "y": 1.25}, + {"matrix": [1, 10], "x": 12.5, "y": 1.25}, + {"matrix": [1, 11], "x": 13.75, "y": 1.25}, + {"matrix": [1, 12], "x": 14.75, "y": 1.25}, + {"matrix": [1, 13], "x": 16, "y": 1.25, "w": 1.25, "h": 2}, + + {"matrix": [2, 14], "x": 17.5, "y": 1}, + + {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75}, + {"matrix": [2, 1], "x": 2, "y": 2.25}, + {"matrix": [2, 2], "x": 3.5, "y": 2.25}, + {"matrix": [2, 3], "x": 4.5, "y": 2.25}, + {"matrix": [2, 4], "x": 5.5, "y": 2.25}, + {"matrix": [2, 5], "x": 6.5, "y": 2.25}, + + {"matrix": [2, 6], "x": 8.75, "y": 2.25}, + {"matrix": [2, 7], "x": 9.75, "y": 2.25}, + {"matrix": [2, 8], "x": 10.75, "y": 2.25}, + {"matrix": [2, 9], "x": 11.75, "y": 2.25}, + {"matrix": [2, 10], "x": 13, "y": 2.25}, + {"matrix": [2, 11], "x": 14, "y": 2.25}, + {"matrix": [2, 12], "x": 15, "y": 2.25}, + + {"matrix": [3, 14], "x": 17.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 3.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3.25}, + {"matrix": [3, 3], "x": 4.75, "y": 3.25}, + {"matrix": [3, 4], "x": 5.75, "y": 3.25}, + {"matrix": [3, 5], "x": 6.75, "y": 3.25}, + + {"matrix": [3, 6], "x": 9, "y": 3.25}, + {"matrix": [3, 7], "x": 10, "y": 3.25}, + {"matrix": [3, 8], "x": 11, "y": 3.25}, + {"matrix": [3, 9], "x": 12, "y": 3.25}, + {"matrix": [3, 10], "x": 13.5, "y": 3.25}, + {"matrix": [3, 11], "x": 14.5, "y": 3.25, "w": 1.75}, + + {"matrix": [3, 13], "x": 16.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.5}, + {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.5}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25, "w": 2}, + {"matrix": [4, 5], "x": 7.25, "y": 4.25}, + + {"matrix": [4, 7], "x": 8.5, "y": 4.25, "w": 2.75}, + {"matrix": [4, 9], "x": 11.25, "y": 4.25, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.5, "y": 4.5}, + {"matrix": [4, 13], "x": 16.5, "y": 4.5}, + {"matrix": [4, 14], "x": 17.5, "y": 4.5} ] } } diff --git a/keyboards/sidderskb/majbritt/rev1/rev1.h b/keyboards/sidderskb/majbritt/rev1/rev1.h deleted file mode 100644 index 5d49640efc0a..000000000000 --- a/keyboards/sidderskb/majbritt/rev1/rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 MechMerlin - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K1E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K2E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K3E,\ - K30, K41, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, \ - K40, K42, K44, K45, K47, K49, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, KC_NO, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, KC_NO, K3D, K3E }, \ - { K40, K41, K42, KC_NO, K44, K45, KC_NO, K47, KC_NO, K49, KC_NO, KC_NO, K4C, K4D, K4E }, \ -} - -// generated by KBFirmware JSON to QMK Parser -// https://noroadsleft.github.io/kbf_qmk_converter/ diff --git a/keyboards/sidderskb/majbritt/rev2/info.json b/keyboards/sidderskb/majbritt/rev2/info.json index 574f8822473e..cced270ff804 100644 --- a/keyboards/sidderskb/majbritt/rev2/info.json +++ b/keyboards/sidderskb/majbritt/rev2/info.json @@ -23,76 +23,86 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0.75, "y": 0 }, - { "label": "!", "x": 1.75, "y": 0 }, - { "label": "\"", "x": 2.75, "y": 0 }, - { "label": "\u00a3", "x": 3.75, "y": 0 }, - { "label": "$", "x": 4.75, "y": 0 }, - { "label": "%", "x": 5.75, "y": 0 }, - { "label": "^", "x": 6.75, "y": 0 }, - { "label": "&", "x": 8.5, "y": 0 }, - { "label": "*", "x": 9.5, "y": 0 }, - { "label": "(", "x": 10.5, "y": 0 }, - { "label": ")", "x": 11.5, "y": 0 }, - { "label": "_", "x": 12.5, "y": 0 }, - { "label": "+", "x": 13.5, "y": 0 }, - { "label": "|", "x": 14.5, "y": 0 }, - { "label": "~", "x": 15.5, "y": 0 }, - { "label": "Del", "x": 16.5, "y": 0 }, - { "label": "Tab", "w": 1.5, "x": 0.5, "y": 1 }, - { "label": "Q", "x": 2, "y": 1 }, - { "label": "W", "x": 3, "y": 1 }, - { "label": "E", "x": 4, "y": 1 }, - { "label": "R", "x": 5, "y": 1 }, - { "label": "T", "x": 6, "y": 1 }, - { "label": "Y", "x": 8, "y": 1 }, - { "label": "U", "x": 9, "y": 1 }, - { "label": "I", "x": 10, "y": 1 }, - { "label": "O", "x": 11, "y": 1 }, - { "label": "P", "x": 12, "y": 1 }, - { "label": "{", "x": 13, "y": 1 }, - { "label": "}", "x": 14, "y": 1 }, - { "label": "Enter", "w": 1.5, "x": 15, "y": 1 }, - { "label": "Pgup", "x": 16.5, "y": 1 }, - { "label": "Caps Lock", "w": 1.75, "x": 0.25, "y": 2 }, - { "label": "A", "x": 2, "y": 2 }, - { "label": "S", "x": 3, "y": 2 }, - { "label": "D", "x": 4, "y": 2 }, - { "label": "F", "x": 5, "y": 2 }, - { "label": "G", "x": 6, "y": 2 }, - { "label": "H", "x": 8.25, "y": 2 }, - { "label": "J", "x": 9.25, "y": 2 }, - { "label": "K", "x": 10.25, "y": 2 }, - { "label": "L", "x": 11.25, "y": 2 }, - { "label": ":", "x": 12.25, "y": 2 }, - { "label": "@", "x": 13.25, "y": 2 }, - { "label": "~", "x": 14.25, "y": 2 }, - { "label": "Enter", "w": 1.25, "x": 15.25, "y": 2 }, - { "label": "Pgdn", "x": 16.5, "y": 2 }, - { "label": "Shift", "w": 1.25, "x": 0, "y": 3 }, - { "label": "|", "x": 1.25, "y": 3 }, - { "label": "Z", "x": 2.25, "y": 3 }, - { "label": "X", "x": 3.25, "y": 3 }, - { "label": "C", "x": 4.25, "y": 3 }, - { "label": "V", "x": 5.25, "y": 3 }, - { "label": "B", "x": 6.25, "y": 3 }, - { "label": "N", "x": 8.75, "y": 3 }, - { "label": "M", "x": 9.75, "y": 3 }, - { "label": "<", "x": 10.75, "y": 3 }, - { "label": ">", "x": 11.75, "y": 3 }, - { "label": "?", "x": 12.75, "y": 3 }, - { "label": "Shift", "w": 1.75, "x": 13.75, "y": 3 }, - { "label": "Up", "x": 15.5, "y": 3 }, - { "label": "Fn", "x": 16.5, "y": 3 }, - { "label": "Ctrl", "w": 1.5, "x": 0, "y": 4 }, - { "label": "Alt", "w": 1.5, "x": 3, "y": 4 }, - { "label": "LSpace", "w": 2.25, "x": 4.5, "y": 4 }, - { "label": "Fn", "x": 6.75, "y": 4 }, - { "label": "RSpace", "w": 2.75, "x": 8.25, "y": 4 }, - { "label": "AltGr", "w": 1.5, "x": 11, "y": 4 }, - { "label": "Left", "x": 14.5, "y": 4 }, - { "label": "Down", "x": 15.5, "y": 4 }, - { "label": "Right", "x": 16.5, "y": 4 } + {"matrix": [0, 0], "x": 0.75, "y": 0}, + {"matrix": [0, 1], "x": 1.75, "y": 0}, + {"matrix": [0, 2], "x": 2.75, "y": 0}, + {"matrix": [0, 3], "x": 3.75, "y": 0}, + {"matrix": [0, 4], "x": 4.75, "y": 0}, + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + + {"matrix": [1, 0], "x": 0.5, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1}, + + {"matrix": [2, 0], "x": 0.25, "y": 2, "w": 1.75}, + {"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, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 16.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + + {"matrix": [3, 7], "x": 8.75, "y": 3}, + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 13], "x": 13.75, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15.5, "y": 3}, + {"matrix": [3, 15], "x": 16.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6.75, "y": 4}, + + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 2.75}, + {"matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [4, 13], "x": 14.5, "y": 4}, + {"matrix": [4, 14], "x": 15.5, "y": 4}, + {"matrix": [4, 15], "x": 16.5, "y": 4} ] } } diff --git a/keyboards/sidderskb/majbritt/rev2/rev2.h b/keyboards/sidderskb/majbritt/rev2/rev2.h deleted file mode 100644 index a03a2ff10574..000000000000 --- a/keyboards/sidderskb/majbritt/rev2/rev2.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 Sleepdealer - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ - K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K314, K315, \ - K400, K403, K404, K405, K408, K410, K413, K414, K415 \ -) {\ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \ - { K100, K101, K102, K103, K104, K105, KC_NO, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \ - { K200, K201, K202, K203, K204, K205, KC_NO, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, K314, K315 }, \ - { K400, KC_NO, KC_NO, K403, K404, K405, KC_NO, KC_NO, K408, KC_NO, K410, KC_NO, KC_NO, K413, K414, K415 } \ -} diff --git a/keyboards/silverbullet44/info.json b/keyboards/silverbullet44/info.json index de86324dd9e4..ebdd6531dc15 100644 --- a/keyboards/silverbullet44/info.json +++ b/keyboards/silverbullet44/info.json @@ -28,57 +28,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":1.375}, - {"label":"Q", "x":1, "y":0.75}, - {"label":"W", "x":2, "y":0.25}, - {"label":"E", "x":3, "y":0}, - {"label":"R", "x":4, "y":0.25}, - {"label":"T", "x":5, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 1.375}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, - {"label":"Y", "x":12, "y":0.5}, - {"label":"U", "x":13, "y":0.25}, - {"label":"I", "x":14, "y":0}, - {"label":"O", "x":15, "y":0.25}, - {"label":"P", "x":16, "y":0.75}, - {"label":"=", "x":17, "y":1.375}, + {"matrix": [4, 5], "x": 12, "y": 0.5}, + {"matrix": [4, 4], "x": 13, "y": 0.25}, + {"matrix": [4, 3], "x": 14, "y": 0}, + {"matrix": [4, 2], "x": 15, "y": 0.25}, + {"matrix": [4, 1], "x": 16, "y": 0.75}, + {"matrix": [4, 0], "x": 17, "y": 1.375}, - {"label":"Shift", "x":0, "y":2.375}, - {"label":"A", "x":1, "y":1.75}, - {"label":"S", "x":2, "y":1.25}, - {"label":"D", "x":3, "y":1}, - {"label":"F", "x":4, "y":1.25}, - {"label":"G", "x":5, "y":1.5}, + {"matrix": [1, 0], "x": 0, "y": 2.375}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, - {"label":"H", "x":12, "y":1.5}, - {"label":"J", "x":13, "y":1.25}, - {"label":"K", "x":14, "y":1}, - {"label":"L", "x":15, "y":1.25}, - {"label":":", "x":16, "y":1.75}, - {"label":"'", "x":17, "y":2.375}, + {"matrix": [5, 5], "x": 12, "y": 1.5}, + {"matrix": [5, 4], "x": 13, "y": 1.25}, + {"matrix": [5, 3], "x": 14, "y": 1}, + {"matrix": [5, 2], "x": 15, "y": 1.25}, + {"matrix": [5, 1], "x": 16, "y": 1.75}, + {"matrix": [5, 0], "x": 17, "y": 2.375}, - {"label":"N", "x":12, "y":2.5}, - {"label":"M", "x":13, "y":2.25}, - {"label":"<", "x":14, "y":2}, - {"label":">", "x":15, "y":2.25}, - {"label":"?", "x":16, "y":2.75}, - {"label":"-", "x":17, "y":3.375}, + {"matrix": [2, 0], "x": 12, "y": 2.5}, + {"matrix": [2, 1], "x": 13, "y": 2.25}, + {"matrix": [2, 2], "x": 14, "y": 2}, + {"matrix": [2, 3], "x": 15, "y": 2.25}, + {"matrix": [2, 4], "x": 16, "y": 2.75}, + {"matrix": [2, 5], "x": 17, "y": 3.375}, - {"label":"Ctrl", "x":0, "y":3.375}, - {"label":"Z", "x":1, "y":2.75}, - {"label":"X", "x":2, "y":2.25}, - {"label":"C", "x":3, "y":2}, - {"label":"V", "x":4, "y":2.25}, - {"label":"B", "x":5, "y":2.5}, + {"matrix": [6, 5], "x": 0, "y": 3.375}, + {"matrix": [6, 4], "x": 1, "y": 2.75}, + {"matrix": [6, 3], "x": 2, "y": 2.25}, + {"matrix": [6, 2], "x": 3, "y": 2}, + {"matrix": [6, 1], "x": 4, "y": 2.25}, + {"matrix": [6, 0], "x": 5, "y": 2.5}, - {"label":"Alt", "x":4, "y":3.25, "h":1.25}, - {"label":"BS", "x":5, "y":3.5}, - {"label":"Space", "x":-0.5, "y":3.5, "h":1.5}, - {"label":"Num", "x":7, "y":3.25, "h":1.5}, + {"matrix": [3, 2], "x": 4, "y": 3.25, "h": 1.25}, + {"matrix": [3, 3], "x": 5, "y": 3.5}, + {"matrix": [3, 4], "x": -0.5, "y": 3.5, "h": 1.5}, + {"matrix": [3, 5], "x": 7, "y": 3.25, "h": 1.5}, - {"label":"Cursol", "x":-3.0, "y":3.5, "h":1.5}, - {"label":"Enter", "x":-2, "y":3.5, "h":1.5}, - {"label":"Del", "x":12, "y":3.5}, - {"label":"Win", "x":13, "y":3.25, "w":1.25} + {"matrix": [7, 5], "x": -3, "y": 3.5, "h": 1.5}, + {"matrix": [7, 4], "x": -2, "y": 3.5, "h": 1.5}, + {"matrix": [7, 3], "x": 12, "y": 3.5}, + {"matrix": [7, 2], "x": 13, "y": 3.25, "w": 1.25} ] } } diff --git a/keyboards/silverbullet44/silverbullet44.c b/keyboards/silverbullet44/silverbullet44.c index 7ae7a1269ed2..00bd6153c92a 100644 --- a/keyboards/silverbullet44/silverbullet44.c +++ b/keyboards/silverbullet44/silverbullet44.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "silverbullet44.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/silverbullet44/silverbullet44.h b/keyboards/silverbullet44/silverbullet44.h deleted file mode 100644 index 7746a554c6a6..000000000000 --- a/keyboards/silverbullet44/silverbullet44.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2019 SwanMatch - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R05, R04, R03, R02, R01, R00, \ - L10, L11, L12, L13, L14, L15, R15, R14, R13, R12, R11, R10, \ - L20, L21, L22, L23, L24, L25, R25, R24, R23, R22, R21, R20, \ - L32, L33, L34, L35, R35, R34, R33, R32 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { KC_NO, KC_NO, L32, L33, L34, L35 }, \ - { R00, R01, R02, R03, R04, R05 }, \ - { R10, R11, R12, R13, R14, R15 }, \ - { R20, R21, R22, R23, R24, R25 }, \ - { KC_NO, KC_NO, R32, R33, R34, R35 } \ -} diff --git a/keyboards/sirius/uni660/rev1/info.json b/keyboards/sirius/uni660/rev1/info.json index fa6aa0407117..f5b070f87e14 100644 --- a/keyboards/sirius/uni660/rev1/info.json +++ b/keyboards/sirius/uni660/rev1/info.json @@ -13,98 +13,96 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - - {"x": 1.5, "y": 0}, - {"x": 2.5, "y": 0}, - {"x": 3.5, "y": 0}, - {"x": 4.5, "y": 0}, - {"x": 5.5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 7.5, "y": 0}, - - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 11.5, "y": 0}, - {"x": 12.5, "y": 0}, - {"x": 13.5, "y": 0}, - {"x": 14.5, "y": 0}, - {"x": 15.5, "y": 0}, - {"x": 16.5, "y": 0}, - - {"x": 18, "y": 0}, - - {"x": 0, "y": 1}, - - {"x": 1.5, "y": 1, "w": 1.5}, - {"x": 3, "y": 1}, - {"x": 4, "y": 1}, - {"x": 5, "y": 1}, - {"x": 6, "y": 1}, - {"x": 7, "y": 1}, - - {"x": 9, "y": 1}, - {"x": 10, "y": 1}, - {"x": 11, "y": 1}, - {"x": 12, "y": 1}, - {"x": 13, "y": 1}, - {"x": 14, "y": 1}, - {"x": 15, "y": 1}, - {"x": 16, "y": 1, "w": 1.5}, - - {"x": 18, "y": 1}, - - {"x": 0, "y": 2}, - - {"x": 1.5, "y": 2, "w": 1.75}, - {"x": 3.25, "y": 2}, - {"x": 4.25, "y": 2}, - {"x": 5.25, "y": 2}, - {"x": 6.25, "y": 2}, - {"x": 7.25, "y": 2}, - - {"x": 9.25, "y": 2}, - {"x": 10.25, "y": 2}, - {"x": 11.25, "y": 2}, - {"x": 12.25, "y": 2}, - {"x": 13.25, "y": 2}, - {"x": 14.25, "y": 2}, - {"x": 15.25, "y": 2, "w": 2.25}, - - {"x": 0, "y": 3}, - - {"x": 1.5, "y": 3, "w": 2.25}, - {"x": 3.75, "y": 3}, - {"x": 4.75, "y": 3}, - {"x": 5.75, "y": 3}, - {"x": 6.75, "y": 3}, - {"x": 7.75, "y": 3}, - - {"x": 9.75, "y": 3}, - {"x": 10.75, "y": 3}, - {"x": 11.75, "y": 3}, - {"x": 12.75, "y": 3}, - {"x": 13.75, "y": 3}, - {"x": 14.75, "y": 3, "w": 2.25}, - - {"x": 17, "y": 3}, - - {"x": 0, "y": 4}, - - {"x": 1.5, "y": 4, "w": 1.25}, - {"x": 2.75, "y": 4, "w": 1.25}, - {"x": 4, "y": 4, "w": 1.25}, - {"x": 5.25, "y": 4, "w": 2.25}, - {"x": 7.5, "y": 4}, - - {"x": 9.5, "y": 4, "w": 2.75}, - {"x": 12.25, "y": 4, "w": 1.25}, - {"x": 13.5, "y": 4, "w": 1.25}, - {"x": 14.75, "y": 4, "w": 1.25}, - - {"x": 16, "y": 4}, - {"x": 17, "y": 4}, - {"x": 18, "y": 4} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [4, 6], "x": 7.5, "y": 0}, + + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, + {"matrix": [0, 13], "x": 14.5, "y": 0}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + + {"matrix": [3, 15], "x": 18, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.5, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 3, "y": 1}, + {"matrix": [1, 3], "x": 4, "y": 1}, + {"matrix": [1, 4], "x": 5, "y": 1}, + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, + {"matrix": [1, 12], "x": 13, "y": 1}, + {"matrix": [1, 13], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + {"matrix": [1, 15], "x": 16, "y": 1, "w": 1.5}, + + {"matrix": [2, 15], "x": 18, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.5, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 3.25, "y": 2}, + {"matrix": [2, 3], "x": 4.25, "y": 2}, + {"matrix": [2, 4], "x": 5.25, "y": 2}, + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2}, + {"matrix": [2, 13], "x": 14.25, "y": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.5, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 3.75, "y": 3}, + {"matrix": [3, 3], "x": 4.75, "y": 3}, + {"matrix": [3, 4], "x": 5.75, "y": 3}, + {"matrix": [3, 5], "x": 6.75, "y": 3}, + {"matrix": [3, 6], "x": 7.75, "y": 3}, + + {"matrix": [3, 8], "x": 9.75, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3}, + {"matrix": [3, 10], "x": 11.75, "y": 3}, + {"matrix": [3, 11], "x": 12.75, "y": 3}, + {"matrix": [3, 12], "x": 13.75, "y": 3}, + {"matrix": [3, 13], "x": 14.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 17, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 7.5, "y": 4}, + + {"matrix": [4, 8], "x": 9.5, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 16, "y": 4}, + {"matrix": [4, 14], "x": 17, "y": 4}, + {"matrix": [4, 15], "x": 18, "y": 4} ] } } diff --git a/keyboards/sirius/uni660/rev1/rev1.h b/keyboards/sirius/uni660/rev1/rev1.h index aea169c219b0..06a7176fbd89 100644 --- a/keyboards/sirius/uni660/rev1/rev1.h +++ b/keyboards/sirius/uni660/rev1/rev1.h @@ -41,22 +41,3 @@ #define set_led_cyan PORTF = PORTF & ~(1<. - */ - -#pragma once - -#include "quantum.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k0b, 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, k46, k48, k49, k4a, k4b \ -) { \ - { 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, KC_NO, k46, KC_NO, k48, k49, k4a, k4b } \ -} diff --git a/keyboards/sneakbox/disarray/ortho/info.json b/keyboards/sneakbox/disarray/ortho/info.json index d832b56a7300..40b2b0ed2f9e 100644 --- a/keyboards/sneakbox/disarray/ortho/info.json +++ b/keyboards/sneakbox/disarray/ortho/info.json @@ -27,15 +27,95 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"y":0, "x":0}, - {"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15}, - {"y":2, "x":0},{"y":2, "x":1},{"y":2, "x":2},{"y":2, "x":3},{"y":2, "x":4},{"y":2, "x":5},{"y":2, "x":6},{"y":2, "x":7},{"y":2, "x":8},{"y":2, "x":9},{"y":2, "x":10},{"y":2, "x":11},{"y":2, "x":12},{"y":2, "x":13},{"y":2, "x":14},{"y":2, "x":15}, - {"y":3, "x":0},{"y":3, "x":1},{"y":3, "x":2},{"y":3, "x":3},{"y":3, "x":4},{"y":3, "x":5},{"y":3, "x":6},{"y":3, "x":7},{"y":3, "x":8},{"y":3, "x":9},{"y":3, "x":10},{"y":3, "x":11},{"y":3, "x":12},{"y":3, "x":13},{"y":3, "x":14},{"y":3, "x":15}, - {"y":4, "x":0},{"y":4, "x":1},{"y":4, "x":2},{"y":4, "x":3},{"y":4, "x":4},{"y":4, "x":5},{"y":4, "x":6},{"y":4, "x":7},{"y":4, "x":8},{"y":4, "x":9},{"y":4, "x":10},{"y":4, "x":11},{"y":4, "x":12},{"y":4, "x":13},{"y":4, "x":14},{"y":4, "x":15}, - {"y":5, "x":0},{"y":5, "x":1},{"y":5, "x":2},{"y":5, "x":3},{"y":5, "x":4},{"y":5, "x":5},{"y":5, "x":6},{"y":5, "x":7},{"y":5, "x":8},{"y":5, "x":9},{"y":5, "x":10},{"y":5, "x":11},{"y":5, "x":12},{"y":5, "x":13},{"y":5, "x":14},{"y":5, "x":15} - ] - } + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "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, 8], "x": 8, "y": 1}, + {"matrix": [0, 9], "x": 9, "y": 1}, + {"matrix": [0, 10], "x": 10, "y": 1}, + {"matrix": [0, 11], "x": 11, "y": 1}, + {"matrix": [0, 12], "x": 12, "y": 1}, + {"matrix": [0, 13], "x": 13, "y": 1}, + {"matrix": [0, 14], "x": 14, "y": 1}, + {"matrix": [0, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "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, 8], "x": 8, "y": 2}, + {"matrix": [1, 9], "x": 9, "y": 2}, + {"matrix": [1, 10], "x": 10, "y": 2}, + {"matrix": [1, 11], "x": 11, "y": 2}, + {"matrix": [1, 12], "x": 12, "y": 2}, + {"matrix": [1, 13], "x": 13, "y": 2}, + {"matrix": [1, 14], "x": 14, "y": 2}, + {"matrix": [1, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, + {"matrix": [2, 4], "x": 4, "y": 3}, + {"matrix": [2, 5], "x": 5, "y": 3}, + {"matrix": [2, 6], "x": 6, "y": 3}, + {"matrix": [2, 7], "x": 7, "y": 3}, + {"matrix": [2, 8], "x": 8, "y": 3}, + {"matrix": [2, 9], "x": 9, "y": 3}, + {"matrix": [2, 10], "x": 10, "y": 3}, + {"matrix": [2, 11], "x": 11, "y": 3}, + {"matrix": [2, 12], "x": 12, "y": 3}, + {"matrix": [2, 13], "x": 13, "y": 3}, + {"matrix": [2, 14], "x": 14, "y": 3}, + {"matrix": [2, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4}, + {"matrix": [3, 6], "x": 6, "y": 4}, + {"matrix": [3, 7], "x": 7, "y": 4}, + {"matrix": [3, 8], "x": 8, "y": 4}, + {"matrix": [3, 9], "x": 9, "y": 4}, + {"matrix": [3, 10], "x": 10, "y": 4}, + {"matrix": [3, 11], "x": 11, "y": 4}, + {"matrix": [3, 12], "x": 12, "y": 4}, + {"matrix": [3, 13], "x": 13, "y": 4}, + {"matrix": [3, 14], "x": 14, "y": 4}, + {"matrix": [3, 15], "x": 15, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5}, + {"matrix": [4, 1], "x": 1, "y": 5}, + {"matrix": [4, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, + {"matrix": [4, 6], "x": 6, "y": 5}, + {"matrix": [4, 7], "x": 7, "y": 5}, + {"matrix": [4, 8], "x": 8, "y": 5}, + {"matrix": [4, 9], "x": 9, "y": 5}, + {"matrix": [4, 10], "x": 10, "y": 5}, + {"matrix": [4, 11], "x": 11, "y": 5}, + {"matrix": [4, 12], "x": 12, "y": 5}, + {"matrix": [4, 13], "x": 13, "y": 5}, + {"matrix": [4, 14], "x": 14, "y": 5}, + {"matrix": [4, 15], "x": 15, "y": 5} + ] + } } } diff --git a/keyboards/sneakbox/disarray/ortho/ortho.h b/keyboards/sneakbox/disarray/ortho/ortho.h deleted file mode 100644 index 1954d4ffb319..000000000000 --- a/keyboards/sneakbox/disarray/ortho/ortho.h +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2021 Bryan Ong - -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( \ - K000, \ - K100, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \ - K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \ - K300, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \ - K400, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \ - K500, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015}, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115}, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215}, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315}, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415}, \ - { K500 } \ -} diff --git a/keyboards/sneakbox/disarray/staggered/info.json b/keyboards/sneakbox/disarray/staggered/info.json index a69447365aaa..ff79e2ada528 100644 --- a/keyboards/sneakbox/disarray/staggered/info.json +++ b/keyboards/sneakbox/disarray/staggered/info.json @@ -27,15 +27,87 @@ "processor": "atmega32u4", "bootloader": "atmel-dfu", "layouts": { - "LAYOUT": { - "layout": [ - {"y":0, "x":0}, - {"y":1, "x":0},{"y":1, "x":1},{"y":1, "x":2},{"y":1, "x":3},{"y":1, "x":4},{"y":1, "x":5},{"y":1, "x":6},{"y":1, "x":7},{"y":1, "x":8},{"y":1, "x":9},{"y":1, "x":10},{"y":1, "x":11},{"y":1, "x":12},{"y":1, "x":13},{"y":1, "x":14},{"y":1, "x":15}, - {"y":2, "x":0, "w":1.5},{"y":2, "x":1.5},{"y":2, "x":2.5},{"y":2, "x":3.5},{"y":2, "x":4.5},{"y":2, "x":5.5},{"y":2, "x":6.5},{"y":2, "x":7.5},{"y":2, "x":8.5},{"y":2, "x":9.5},{"y":2, "x":10.5},{"y":2, "x":11.5},{"y":2, "x":12.5},{"y":2, "x":13.5, "w":1.5},{"y":2, "x":15}, - {"y":3, "x":0, "w":1.75},{"y":3, "x":1.75},{"y":3, "x":2.75},{"y":3, "x":3.75},{"y":3, "x":4.75},{"y":3, "x":5.75},{"y":3, "x":6.75},{"y":3, "x":7.75},{"y":3, "x":8.75},{"y":3, "x":9.75},{"y":3, "x":10.75},{"y":3, "x":11.75},{"y":3, "x":12.75, "w":2.25},{"y":3, "x":15}, - {"y":4, "x":0,"w":1.25},{"y":4, "x":1.25},{"y":4, "x":2.25},{"y":4, "x":3.25},{"y":4, "x":4.25},{"y":4, "x":5.25},{"y":4, "x":6.25},{"y":4, "x":7.25},{"y":4, "x":8.25},{"y":4, "x":9.25},{"y":4, "x":10.25},{"y":4, "x":11.25},{"y":4, "x":12.25, "w":1.75},{"y":4, "x":14},{"y":4, "x":15}, - {"y":5, "x":0,"w":1.25},{"y":5, "x":1.25,"w":1.25},{"y":5, "x":2.5,"w":1.25},{"y":5, "x":3.75,"w":1.25},{"y":5, "x":5,"w":2.25},{"y":5, "x":7.25,"w":2.75},{"y":5, "x":10},{"y":5, "x":11},{"y":5, "x":12},{"y":5, "x":13},{"y":5, "x":14},{"y":5, "x":15} - ] - } + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "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, 8], "x": 8, "y": 1}, + {"matrix": [0, 9], "x": 9, "y": 1}, + {"matrix": [0, 10], "x": 10, "y": 1}, + {"matrix": [0, 11], "x": 11, "y": 1}, + {"matrix": [0, 12], "x": 12, "y": 1}, + {"matrix": [0, 13], "x": 13, "y": 1}, + {"matrix": [0, 14], "x": 14, "y": 1}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 2}, + {"matrix": [1, 2], "x": 2.5, "y": 2}, + {"matrix": [1, 3], "x": 3.5, "y": 2}, + {"matrix": [1, 4], "x": 4.5, "y": 2}, + {"matrix": [1, 5], "x": 5.5, "y": 2}, + {"matrix": [1, 6], "x": 6.5, "y": 2}, + {"matrix": [1, 7], "x": 7.5, "y": 2}, + {"matrix": [1, 8], "x": 8.5, "y": 2}, + {"matrix": [1, 9], "x": 9.5, "y": 2}, + {"matrix": [1, 10], "x": 10.5, "y": 2}, + {"matrix": [1, 11], "x": 11.5, "y": 2}, + {"matrix": [1, 12], "x": 12.5, "y": 2}, + {"matrix": [1, 13], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [2, 1], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 3}, + {"matrix": [2, 3], "x": 2.75, "y": 3}, + {"matrix": [2, 4], "x": 3.75, "y": 3}, + {"matrix": [2, 5], "x": 4.75, "y": 3}, + {"matrix": [2, 6], "x": 5.75, "y": 3}, + {"matrix": [2, 7], "x": 6.75, "y": 3}, + {"matrix": [2, 8], "x": 7.75, "y": 3}, + {"matrix": [2, 9], "x": 8.75, "y": 3}, + {"matrix": [2, 10], "x": 9.75, "y": 3}, + {"matrix": [2, 11], "x": 10.75, "y": 3}, + {"matrix": [2, 12], "x": 11.75, "y": 3}, + {"matrix": [2, 13], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 4}, + {"matrix": [3, 2], "x": 2.25, "y": 4}, + {"matrix": [3, 3], "x": 3.25, "y": 4}, + {"matrix": [3, 4], "x": 4.25, "y": 4}, + {"matrix": [3, 5], "x": 5.25, "y": 4}, + {"matrix": [3, 6], "x": 6.25, "y": 4}, + {"matrix": [3, 7], "x": 7.25, "y": 4}, + {"matrix": [3, 8], "x": 8.25, "y": 4}, + {"matrix": [3, 9], "x": 9.25, "y": 4}, + {"matrix": [3, 10], "x": 10.25, "y": 4}, + {"matrix": [3, 11], "x": 11.25, "y": 4}, + {"matrix": [3, 12], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4}, + + {"matrix": [4, 1], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [4, 2], "x": 1.25, "y": 5, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 5, "w": 1.25}, + {"matrix": [4, 4], "x": 3.75, "y": 5, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 5, "w": 2.25}, + {"matrix": [4, 6], "x": 7.25, "y": 5, "w": 2.75}, + {"matrix": [4, 8], "x": 10, "y": 5}, + {"matrix": [4, 9], "x": 11, "y": 5}, + {"matrix": [4, 10], "x": 12, "y": 5}, + {"matrix": [4, 11], "x": 13, "y": 5}, + {"matrix": [4, 12], "x": 14, "y": 5}, + {"matrix": [4, 13], "x": 15, "y": 5} + ] + } } } diff --git a/keyboards/sneakbox/disarray/staggered/staggered.h b/keyboards/sneakbox/disarray/staggered/staggered.h deleted file mode 100644 index 58b7431d51f5..000000000000 --- a/keyboards/sneakbox/disarray/staggered/staggered.h +++ /dev/null @@ -1,35 +0,0 @@ -/* -Copyright 2021 Bryan Ong - -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( \ - K000, \ - K100, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K114, \ - K200, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K214, \ - K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K314, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K414, \ - K401, K402, K403, K404, K405, K406, K408, K409, K410, K411, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { KC_NO, K401, K402, K403, K404, K405, K406, KC_NO, K408, K409, K410, K411, K412, K413, K414 } \ -} diff --git a/keyboards/soda/cherish/cherish.h b/keyboards/soda/cherish/cherish.h deleted file mode 100644 index 59c75db6c95c..000000000000 --- a/keyboards/soda/cherish/cherish.h +++ /dev/null @@ -1,38 +0,0 @@ -/* -Copyright 2015 Á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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, \ - K500, K501, K502, K505, K509, K510, K511, K512, K514 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, K414 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, K512, KC_NO, K514 } \ -} diff --git a/keyboards/soda/cherish/info.json b/keyboards/soda/cherish/info.json index 447dcffa4274..71ee91e6604a 100644 --- a/keyboards/soda/cherish/info.json +++ b/keyboards/soda/cherish/info.json @@ -24,92 +24,97 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":6, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0}, - {"x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "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, "y":1.25}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, - {"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, "y":2.25}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, - {"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, "y":3.25}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "y": 0}, - {"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, "y":4.25}, - {"x":15, "y":4.25}, + {"matrix": [0, 14], "x": 15, "y": 0}, - {"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, "w":1.25}, - {"x":11.25, "y":5.25, "w":1.25}, - {"x":13, "y":5.25}, - {"x":14, "y":5.25}, - {"x":15, "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, "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, "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": [3, 14], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 12], "x": 14, "y": 4.25}, + {"matrix": [4, 14], "x": 15, "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, 5], "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": 13, "y": 5.25}, + {"matrix": [5, 12], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25} ] } } diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json index dca3dfe4be48..1c6488118370 100644 --- a/keyboards/soda/pocket/info.json +++ b/keyboards/soda/pocket/info.json @@ -23,51 +23,51 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [ - {"x": 0, "y": 0}, - {"x": 1, "y": 0}, - {"x": 2, "y": 0}, + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0}, - {"x": 6.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, - {"x": 0, "y": 1.25}, - {"x": 1, "y": 1.25}, - {"x": 2, "y": 1.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}, - {"x": 3.25, "y": 1.25}, - {"x": 4.25, "y": 1.25}, - {"x": 5.25, "y": 1.25}, - {"x": 6.25, "y": 1.25}, + {"matrix": [1, 3], "x": 3.25, "y": 1.25}, + {"matrix": [1, 4], "x": 4.25, "y": 1.25}, + {"matrix": [1, 5], "x": 5.25, "y": 1.25}, + {"matrix": [1, 6], "x": 6.25, "y": 1.25}, - {"x": 0, "y": 2.25}, - {"x": 1, "y": 2.25}, - {"x": 2, "y": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, - {"x": 3.25, "y": 2.25}, - {"x": 4.25, "y": 2.25}, - {"x": 5.25, "y": 2.25}, - {"x": 6.25, "y": 2.25, "h": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25}, + {"matrix": [2, 5], "x": 5.25, "y": 2.25}, + {"matrix": [3, 3], "x": 6.25, "y": 2.25, "h": 2}, - {"x": 3.25, "y": 3.25}, - {"x": 4.25, "y": 3.25}, - {"x": 5.25, "y": 3.25}, + {"matrix": [3, 4], "x": 3.25, "y": 3.25}, + {"matrix": [3, 5], "x": 4.25, "y": 3.25}, + {"matrix": [3, 6], "x": 5.25, "y": 3.25}, - {"x": 1, "y": 4.25}, + {"matrix": [4, 1], "x": 1, "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, "h": 2}, + {"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": [5, 0], "x": 6.25, "y": 4.25, "h": 2}, - {"x": 0, "y": 5.25}, - {"x": 1, "y": 5.25}, - {"x": 2, "y": 5.25}, + {"matrix": [5, 1], "x": 0, "y": 5.25}, + {"matrix": [5, 2], "x": 1, "y": 5.25}, + {"matrix": [5, 4], "x": 2, "y": 5.25}, - {"x": 3.25, "y": 5.25, "w": 2}, - {"x": 5.25, "y": 5.25} + {"matrix": [5, 5], "x": 3.25, "y": 5.25, "w": 2}, + {"matrix": [5, 6], "x": 5.25, "y": 5.25} ] } } diff --git a/keyboards/soda/pocket/pocket.c b/keyboards/soda/pocket/pocket.c index 18a203b8c050..8cced36866af 100644 --- a/keyboards/soda/pocket/pocket.c +++ b/keyboards/soda/pocket/pocket.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 "pocket.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/soda/pocket/pocket.h b/keyboards/soda/pocket/pocket.h deleted file mode 100644 index 602664107bfd..000000000000 --- a/keyboards/soda/pocket/pocket.h +++ /dev/null @@ -1,39 +0,0 @@ -/* -Copyright 2015 Á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( \ - K00, K01, K02, K03, K04, K05, K06, \ - K10, K11, K12, K13, K14, K15, K16, \ - K20, K21, K22, K23, K24, K25, \ - K33, K34, K35, K36, \ - K41, K43, K44, K45, \ - K50, K51, K52, K54, K55, K56 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, KC_NO}, \ - { KC_NO, KC_NO, KC_NO, K33, K34, K35, K36 }, \ - { KC_NO, K41, KC_NO, K43, K44, K45, KC_NO}, \ - { K50, K51, K52, KC_NO, K54, K55, K56 } \ -} - diff --git a/keyboards/sofle/keyhive/info.json b/keyboards/sofle/keyhive/info.json index dfbe30f13355..b78021385471 100644 --- a/keyboards/sofle/keyhive/info.json +++ b/keyboards/sofle/keyhive/info.json @@ -40,11 +40,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5}, - {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.125}, {"x":14, "y":4.375} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 0.25}, + {"matrix": [5, 4], "x": 11.5, "y": 0.125}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0.125}, + {"matrix": [5, 1], "x": 14.5, "y": 0.375}, + {"matrix": [5, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 1.25}, + {"matrix": [6, 4], "x": 11.5, "y": 1.125}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1.125}, + {"matrix": [6, 1], "x": 14.5, "y": 1.375}, + {"matrix": [6, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 10.5, "y": 2.25}, + {"matrix": [7, 4], "x": 11.5, "y": 2.125}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2.125}, + {"matrix": [7, 1], "x": 14.5, "y": 2.375}, + {"matrix": [7, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 0], "x": 6, "y": 2.75}, + + {"matrix": [9, 5], "x": 9.5, "y": 2.75}, + {"matrix": [8, 5], "x": 10.5, "y": 3.25}, + {"matrix": [8, 4], "x": 11.5, "y": 3.125}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3.125}, + {"matrix": [8, 1], "x": 14.5, "y": 3.375}, + {"matrix": [8, 0], "x": 15.5, "y": 3.5}, + + {"matrix": [4, 1], "x": 1.5, "y": 4.375}, + {"matrix": [4, 2], "x": 2.5, "y": 4.125}, + {"matrix": [4, 3], "x": 3.5, "y": 4.15}, + {"matrix": [4, 4], "x": 4.5, "y": 4.25}, + {"matrix": [4, 5], "x": 6, "y": 4.25, "h": 1.5}, + + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12, "y": 4.15}, + {"matrix": [9, 1], "x": 13, "y": 4.125}, + {"matrix": [9, 0], "x": 14, "y": 4.375} ] } } diff --git a/keyboards/sofle/keyhive/keyhive.h b/keyboards/sofle/keyhive/keyhive.h deleted file mode 100755 index c4fdd852191d..000000000000 --- a/keyboards/sofle/keyhive/keyhive.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright - * 2021 solartempest - * 2021 QMK - * - * 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" - -// clang-format off - -#define LAYOUT( \ - LA1, LA2, LA3, LA4, LA5, LA6, RA6, RA5, RA4, RA3, RA2, RA1, \ - LB1, LB2, LB3, LB4, LB5, LB6, RB6, RB5, RB4, RB3, RB2, RB1, \ - LC1, LC2, LC3, LC4, LC5, LC6, RC6, RC5, RC4, RC3, RC2, RC1, \ - LD1, LD2, LD3, LD4, LD5, LD6, LE1, RE6, RD6, RD5, RD4, RD3, RD2, RD1, \ - LE2, LE3, LE4, LE5, LE6, RE5, RE4, RE3, RE2, RE1 \ - ) \ - { \ - { LA1, LA2, LA3, LA4, LA5, LA6, KC_NO }, \ - { LB1, LB2, LB3, LB4, LB5, LB6, KC_NO }, \ - { LC1, LC2, LC3, LC4, LC5, LC6, KC_NO }, \ - { LD1, LD2, LD3, LD4, LD5, LD6, KC_NO }, \ - { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO }, \ - { RA1, RA2, RA3, RA4, RA5, RA6, KC_NO }, \ - { RB1, RB2, RB3, RB4, RB5, RB6, KC_NO }, \ - { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO }, \ - { RD1, RD2, RD3, RD4, RD5, RD6, KC_NO }, \ - { RE1, RE2, RE3, RE4, RE5, RE6, KC_NO } \ - } - -//RGB LED Conversion macro from physical array to electric array (+146 to firmware size) -// clang-format on diff --git a/keyboards/sofle/rev1/info.json b/keyboards/sofle/rev1/info.json index 1f9829426e0c..23d411602eb4 100644 --- a/keyboards/sofle/rev1/info.json +++ b/keyboards/sofle/rev1/info.json @@ -33,11 +33,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5}, - {"x":1.5, "y":4.375}, {"x":2.5, "y":4.125}, {"x":3.5, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12, "y":4.15}, {"x":13, "y":4.125}, {"x":14, "y":4.375} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 0.25}, + {"matrix": [5, 4], "x": 11.5, "y": 0.125}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0.125}, + {"matrix": [5, 1], "x": 14.5, "y": 0.375}, + {"matrix": [5, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 1.25}, + {"matrix": [6, 4], "x": 11.5, "y": 1.125}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1.125}, + {"matrix": [6, 1], "x": 14.5, "y": 1.375}, + {"matrix": [6, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 10.5, "y": 2.25}, + {"matrix": [7, 4], "x": 11.5, "y": 2.125}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2.125}, + {"matrix": [7, 1], "x": 14.5, "y": 2.375}, + {"matrix": [7, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6, "y": 2.75}, + + {"matrix": [9, 5], "x": 9.5, "y": 2.75}, + {"matrix": [8, 5], "x": 10.5, "y": 3.25}, + {"matrix": [8, 4], "x": 11.5, "y": 3.125}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3.125}, + {"matrix": [8, 1], "x": 14.5, "y": 3.375}, + {"matrix": [8, 0], "x": 15.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 1.5, "y": 4.375}, + {"matrix": [4, 1], "x": 2.5, "y": 4.125}, + {"matrix": [4, 2], "x": 3.5, "y": 4.15}, + {"matrix": [4, 3], "x": 4.5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5}, + + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12, "y": 4.15}, + {"matrix": [9, 1], "x": 13, "y": 4.125}, + {"matrix": [9, 0], "x": 14, "y": 4.375} ] } } diff --git a/keyboards/sofle/rev1/rev1.c b/keyboards/sofle/rev1/rev1.c index 567f8301e3a7..d0197ffba55d 100644 --- a/keyboards/sofle/rev1/rev1.c +++ b/keyboards/sofle/rev1/rev1.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE // Physical Layout diff --git a/keyboards/sofle/rev1/rev1.h b/keyboards/sofle/rev1/rev1.h deleted file mode 100644 index 6c0c4a89df54..000000000000 --- a/keyboards/sofle/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } - diff --git a/keyboards/sowbug/68keys/info.json b/keyboards/sowbug/68keys/info.json index 801140e04a65..3b4525e9f845 100644 --- a/keyboards/sowbug/68keys/info.json +++ b/keyboards/sowbug/68keys/info.json @@ -22,10 +22,10 @@ "processor": "STM32F103", "bootloader": "stm32duino", "layout_aliases": { - "LAYOUT": "LAYOUT_default" + "LAYOUT_default": "LAYOUT" }, "layouts": { - "LAYOUT_default": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, diff --git a/keyboards/spaceman/yun65/info.json b/keyboards/spaceman/yun65/info.json index 5ffd5772f6df..40854c78f3b6 100644 --- a/keyboards/spaceman/yun65/info.json +++ b/keyboards/spaceman/yun65/info.json @@ -18,11 +18,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"\u00ac", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"@", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"x":13.75, "y":2, "w":1.25}, {"x":15, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"AltGr", "x":10, "y":4, "w":1.25}, {"label":"AltGr", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [2, 14], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 13], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 13], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/spaceman/yun65/yun65.h b/keyboards/spaceman/yun65/yun65.h deleted file mode 100644 index c689ed76a241..000000000000 --- a/keyboards/spaceman/yun65/yun65.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, \ - k100, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115, \ - k200, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k313, k314, k315, \ - k400, k402, k403, k406, k410, k411, k413, k414, k415 \ -) { \ - {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, KC_NO }, \ - {k100, KC_NO, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \ - {k200, KC_NO, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, k214, k215 }, \ - {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, KC_NO, k313, k314, k315 }, \ - {k400, KC_NO, k402, k403, KC_NO, KC_NO, k406, KC_NO, KC_NO, KC_NO, k410, k411, KC_NO, k413, k414, k415 } \ -} diff --git a/keyboards/spacetime/info.json b/keyboards/spacetime/info.json index c82bd6ecbb8d..0d1ece48f093 100644 --- a/keyboards/spacetime/info.json +++ b/keyboards/spacetime/info.json @@ -21,59 +21,63 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00", "x":0, "y":0}, - {"label":"L01", "x":1, "y":0}, - {"label":"L02", "x":2, "y":0}, - {"label":"L03", "x":3, "y":0}, - {"label":"L04", "x":4, "y":0}, - {"label":"L05", "x":5, "y":0}, - {"label":"L06", "x":6, "y":0}, - {"label":"R00", "x":7, "y":0}, - {"label":"R01", "x":8, "y":0}, - {"label":"R02", "x":9, "y":0}, - {"label":"R03", "x":10, "y":0}, - {"label":"R04", "x":11, "y":0}, - {"label":"R05", "x":12, "y":0}, - {"label":"R06", "x":13, "y":0}, + {"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}, - {"label":"L10", "x":0, "y":1}, - {"label":"L11", "x":1, "y":1}, - {"label":"L12", "x":2, "y":1}, - {"label":"L13", "x":3, "y":1}, - {"label":"L14", "x":4, "y":1}, - {"label":"L15", "x":5, "y":1}, - {"label":"L16", "x":6, "y":1}, - {"label":"R10", "x":7, "y":1}, - {"label":"R11", "x":8, "y":1}, - {"label":"R12", "x":9, "y":1}, - {"label":"R13", "x":10, "y":1}, - {"label":"R14", "x":11, "y":1}, - {"label":"R15", "x":12, "y":1}, - {"label":"R16", "x":13, "y":1}, + {"matrix": [4, 6], "x": 7, "y": 0}, + {"matrix": [4, 5], "x": 8, "y": 0}, + {"matrix": [4, 4], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0}, + {"matrix": [4, 0], "x": 13, "y": 0}, - {"label":"L20", "x":0, "y":2}, - {"label":"L21", "x":1, "y":2}, - {"label":"L22", "x":2, "y":2}, - {"label":"L23", "x":3, "y":2}, - {"label":"L24", "x":4, "y":2}, - {"label":"L25", "x":5, "y":2}, - {"label":"L26", "x":6, "y":2}, - {"label":"R20", "x":7, "y":2}, - {"label":"R21", "x":8, "y":2}, - {"label":"R22", "x":9, "y":2}, - {"label":"R23", "x":10, "y":2}, - {"label":"R24", "x":11, "y":2}, - {"label":"R25", "x":12, "y":2}, - {"label":"R26", "x":13, "y":2}, - - {"label":"L30", "x":0, "y":3}, - {"label":"L34", "x":4, "y":3}, - {"label":"L35", "x":5, "y":3, "h":2}, - {"label":"L36", "x":6, "y":3, "h":2}, - {"label":"R30", "x":7, "y":3, "h":2}, - {"label":"R31", "x":8, "y":3, "h":2}, - {"label":"R32", "x":9, "y":3}, - {"label":"R36", "x":13, "y":3} + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + + {"matrix": [5, 6], "x": 7, "y": 1}, + {"matrix": [5, 5], "x": 8, "y": 1}, + {"matrix": [5, 4], "x": 9, "y": 1}, + {"matrix": [5, 3], "x": 10, "y": 1}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1}, + {"matrix": [5, 0], "x": 13, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + + {"matrix": [6, 6], "x": 7, "y": 2}, + {"matrix": [6, 5], "x": 8, "y": 2}, + {"matrix": [6, 4], "x": 9, "y": 2}, + {"matrix": [6, 3], "x": 10, "y": 2}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2}, + {"matrix": [6, 0], "x": 13, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3, "h": 2}, + {"matrix": [3, 6], "x": 6, "y": 3, "h": 2}, + + {"matrix": [7, 6], "x": 7, "y": 3, "h": 2}, + {"matrix": [7, 5], "x": 8, "y": 3, "h": 2}, + {"matrix": [7, 4], "x": 9, "y": 3}, + {"matrix": [7, 0], "x": 13, "y": 3} ] } } diff --git a/keyboards/spacetime/rev1/rev1.h b/keyboards/spacetime/rev1/rev1.h index dd54204561c1..c513ae6a72dc 100644 --- a/keyboards/spacetime/rev1/rev1.h +++ b/keyboards/spacetime/rev1/rev1.h @@ -16,32 +16,6 @@ #pragma once #include "quantum.h" -#define ___ KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L34, L35, L36, R30, R31, R32, R36 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, ___, ___, ___, L34, L35, L36 }, \ -\ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, ___, ___, ___, R32, R31, R30 } \ -} #ifdef USE_I2C #error "I2C not Supported" diff --git a/keyboards/spacetime/rev2/rev2.h b/keyboards/spacetime/rev2/rev2.h index dd54204561c1..c513ae6a72dc 100644 --- a/keyboards/spacetime/rev2/rev2.h +++ b/keyboards/spacetime/rev2/rev2.h @@ -16,32 +16,6 @@ #pragma once #include "quantum.h" -#define ___ KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L34, L35, L36, R30, R31, R32, R36 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, ___, ___, ___, L34, L35, L36 }, \ -\ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, R20 }, \ - { R36, ___, ___, ___, R32, R31, R30 } \ -} #ifdef USE_I2C #error "I2C not Supported" diff --git a/keyboards/spacey/info.json b/keyboards/spacey/info.json index 881efb60d6ba..289eff730ff8 100644 --- a/keyboards/spacey/info.json +++ b/keyboards/spacey/info.json @@ -23,80 +23,80 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0, "y":0}, - {"label":"k01", "x":1, "y":0}, - {"label":"k02", "x":2, "y":0}, - {"label":"k03", "x":3, "y":0}, - {"label":"k04", "x":4, "y":0}, - {"label":"k05", "x":5, "y":0}, - {"label":"k06", "x":6, "y":0}, - {"label":"k07", "x":7, "y":0}, - {"label":"k08", "x":8, "y":0}, - {"label":"k09", "x":9, "y":0}, - {"label":"k0A", "x":10, "y":0}, - {"label":"k0B", "x":11, "y":0}, - {"label":"k0C", "x":12, "y":0}, - {"label":"k0D", "x":13, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, - {"label":"k10", "x":0, "y":1}, - {"label":"k11", "x":1, "y":1}, - {"label":"k12", "x":2, "y":1}, - {"label":"k13", "x":3, "y":1}, - {"label":"k14", "x":4, "y":1}, - {"label":"k15", "x":5, "y":1}, - {"label":"k16", "x":6, "y":1}, - {"label":"k17", "x":7, "y":1}, - {"label":"k18", "x":8, "y":1}, - {"label":"k19", "x":9, "y":1}, - {"label":"k1A", "x":10, "y":1}, - {"label":"k1B", "x":11, "y":1}, - {"label":"k1C", "x":12, "y":1}, - {"label":"k1D", "x":13, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, - {"label":"k20", "x":0, "y":2}, - {"label":"k21", "x":1, "y":2}, - {"label":"k22", "x":2, "y":2}, - {"label":"k23", "x":3, "y":2}, - {"label":"k24", "x":4, "y":2}, - {"label":"k25", "x":5, "y":2}, - {"label":"k26", "x":6, "y":2}, - {"label":"k27", "x":7, "y":2}, - {"label":"k28", "x":8, "y":2}, - {"label":"k29", "x":9, "y":2}, - {"label":"k2A", "x":10, "y":2}, - {"label":"k2B", "x":11, "y":2}, - {"label":"k2C", "x":12, "y":2}, - {"label":"k2D", "x":13, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, - {"label":"k30", "x":0, "y":3}, - {"label":"k31", "x":1, "y":3}, - {"label":"k32", "x":2, "y":3}, - {"label":"k33", "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":"k38", "x":8, "y":3}, - {"label":"k39", "x":9, "y":3}, - {"label":"k3A", "x":10, "y":3}, - {"label":"k3B", "x":11, "y":3}, - {"label":"k3C", "x":12, "y":3}, - {"label":"k3D", "x":13, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, - {"label":"k40", "x":0, "y":4}, - {"label":"k41", "x":1, "y":4}, - {"label":"k42", "x":2, "y":4}, - {"label":"k43", "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":"k48", "x":8, "y":4}, - {"label":"k49", "x":9, "y":4}, - {"label":"k4A", "x":10, "y":4}, - {"label":"k4B", "x":11, "y":4}, - {"label":"k4C", "x":12, "y":4}, - {"label":"k4D", "x":13, "y":4} + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "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, 8], "x": 8, "y": 4}, + {"matrix": [4, 9], "x": 9, "y": 4}, + {"matrix": [4, 10], "x": 10, "y": 4}, + {"matrix": [4, 11], "x": 11, "y": 4}, + {"matrix": [4, 12], "x": 12, "y": 4}, + {"matrix": [4, 13], "x": 13, "y": 4} ] } } diff --git a/keyboards/spacey/spacey.c b/keyboards/spacey/spacey.c deleted file mode 100644 index a83f1f8990ca..000000000000 --- a/keyboards/spacey/spacey.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2021 vanilla - * - * 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 . - */ - -#include "spacey.h" diff --git a/keyboards/spacey/spacey.h b/keyboards/spacey/spacey.h deleted file mode 100644 index 5a288fae83e4..000000000000 --- a/keyboards/spacey/spacey.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 vanilla - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D } \ -} diff --git a/keyboards/sparrow62/info.json b/keyboards/sparrow62/info.json index 62e9d019c31b..f15b76964949 100644 --- a/keyboards/sparrow62/info.json +++ b/keyboards/sparrow62/info.json @@ -21,72 +21,77 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "`~", "x": 0, "y": 0.5 }, - { "label": "1!", "x": 1, "y": 0.38 }, - { "label": "2@", "x": 2, "y": 0.13 }, - { "label": "3#", "x": 3, "y": 0 }, - { "label": "4$", "x": 4, "y": 0.13 }, - { "label": "5%", "x": 5, "y": 0.25 }, - { "label": "7&", "x": 9, "y": 0.25 }, - { "label": "8*", "x": 10, "y": 0.13 }, - { "label": "9(", "x": 11, "y": 0 }, - { "label": "0)", "x": 12, "y": 0.13 }, - { "label": "-_", "x": 13, "y": 0.38 }, - { "label": "=+", "x": 14, "y": 0.5 }, + {"matrix": [0, 6], "x": 0, "y": 0.5}, + {"matrix": [0, 5], "x": 1, "y": 0.38}, + {"matrix": [0, 4], "x": 2, "y": 0.13}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0.13}, + {"matrix": [0, 1], "x": 5, "y": 0.25}, - { "label": "Tab", "x": 0, "y": 1.5 }, - { "label": "Q", "x": 1, "y": 1.38 }, - { "label": "W", "x": 2, "y": 1.13 }, - { "label": "E", "x": 3, "y": 1 }, - { "label": "R", "x": 4, "y": 1.13 }, - { "label": "T", "x": 5, "y": 1.25 }, - { "label": "6^", "x": 6, "y": 0.75 }, - { "label": "6^", "x": 8, "y": 0.75 }, - { "label": "U", "x": 9, "y": 1.25 }, - { "label": "I", "x": 10, "y": 1.13 }, - { "label": "O", "x": 11, "y": 1 }, - { "label": "P", "x": 12, "y": 1.13 }, - { "label": "[{", "x": 13, "y": 1.38 }, - { "label": "]}", "x": 14, "y": 1.5 }, + {"matrix": [5, 1], "x": 9, "y": 0.25}, + {"matrix": [5, 2], "x": 10, "y": 0.13}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.13}, + {"matrix": [5, 5], "x": 13, "y": 0.38}, + {"matrix": [5, 6], "x": 14, "y": 0.5}, - { "label": "Ctrl", "x": 0, "y": 2.5 }, - { "label": "A", "x": 1, "y": 2.38 }, - { "label": "S", "x": 2, "y": 2.13 }, - { "label": "D", "x": 3, "y": 2 }, - { "label": "F", "x": 4, "y": 2.13 }, - { "label": "G", "x": 5, "y": 2.25 }, - { "label": "Y", "x": 6, "y": 1.75 }, - { "label": "Y", "x": 8, "y": 1.75 }, - { "label": "H", "x": 9, "y": 2.25 }, - { "label": "J", "x": 10, "y": 2.13 }, - { "label": "K", "x": 11, "y": 2 }, - { "label": "L", "x": 12, "y": 2.13 }, - { "label": ";:", "x": 13, "y": 2.38 }, - { "label": "'\"", "x": 14, "y": 2.5 }, + {"matrix": [1, 6], "x": 0, "y": 1.5}, + {"matrix": [1, 5], "x": 1, "y": 1.38}, + {"matrix": [1, 4], "x": 2, "y": 1.13}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1.13}, + {"matrix": [1, 1], "x": 5, "y": 1.25}, + {"matrix": [0, 0], "x": 6, "y": 0.75}, - { "label": "Shift", "x": 0, "y": 3.5 }, - { "label": "Z", "x": 1, "y": 3.38 }, - { "label": "X", "x": 2, "y": 3.13 }, - { "label": "C", "x": 3, "y": 3 }, - { "label": "V", "x": 4, "y": 3.13 }, - { "label": "B", "x": 5, "y": 3.25 }, - { "label": "[{", "x": 6, "y": 2.75 }, - { "label": "]}", "x": 8, "y": 2.75 }, - { "label": "N", "x": 9, "y": 3.25 }, - { "label": "M", "x": 10, "y": 3.13 }, - { "label": ",<", "x": 11, "y": 3 }, - { "label": ",>", "x": 12, "y": 3.13 }, - { "label": "/?", "x": 13, "y": 3.38 }, - { "label": "\\|", "x": 14, "y": 3.5 }, + {"matrix": [5, 0], "x": 8, "y": 0.75}, + {"matrix": [6, 1], "x": 9, "y": 1.25}, + {"matrix": [6, 2], "x": 10, "y": 1.13}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.13}, + {"matrix": [6, 5], "x": 13, "y": 1.38}, + {"matrix": [6, 6], "x": 14, "y": 1.5}, - { "label": "Esc", "x": 2.5, "y": 4.13 }, - { "label": "Alt", "x": 3.5, "y": 4.13 }, - { "label": "Win", "x": 4.5, "y": 4.25 }, - { "label": "Space", "x": 5.75, "y": 4.5, "w": 1.25 }, - { "label": "Enter", "x": 8, "y": 4.5, "w": 1.25 }, - { "label": "RAISE", "x": 9.5, "y": 4.25 }, - { "label": "Alt", "x": 10.5, "y": 4.13 }, - { "label": "BkSp", "x": 11.5, "y": 4.13 } + {"matrix": [2, 6], "x": 0, "y": 2.5}, + {"matrix": [2, 5], "x": 1, "y": 2.38}, + {"matrix": [2, 4], "x": 2, "y": 2.13}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2.13}, + {"matrix": [2, 1], "x": 5, "y": 2.25}, + {"matrix": [1, 0], "x": 6, "y": 1.75}, + + {"matrix": [6, 0], "x": 8, "y": 1.75}, + {"matrix": [7, 1], "x": 9, "y": 2.25}, + {"matrix": [7, 2], "x": 10, "y": 2.13}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.13}, + {"matrix": [7, 5], "x": 13, "y": 2.38}, + {"matrix": [7, 6], "x": 14, "y": 2.5}, + + {"matrix": [3, 6], "x": 0, "y": 3.5}, + {"matrix": [3, 5], "x": 1, "y": 3.38}, + {"matrix": [3, 4], "x": 2, "y": 3.13}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3.13}, + {"matrix": [3, 1], "x": 5, "y": 3.25}, + {"matrix": [2, 0], "x": 6, "y": 2.75}, + + {"matrix": [7, 0], "x": 8, "y": 2.75}, + {"matrix": [8, 1], "x": 9, "y": 3.25}, + {"matrix": [8, 2], "x": 10, "y": 3.13}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.13}, + {"matrix": [8, 5], "x": 13, "y": 3.38}, + {"matrix": [8, 6], "x": 14, "y": 3.5}, + + {"matrix": [4, 3], "x": 2.5, "y": 4.13}, + {"matrix": [4, 2], "x": 3.5, "y": 4.13}, + {"matrix": [4, 1], "x": 4.5, "y": 4.25}, + {"matrix": [3, 0], "x": 5.75, "y": 4.5, "w": 1.25}, + + {"matrix": [8, 0], "x": 8, "y": 4.5, "w": 1.25}, + {"matrix": [9, 1], "x": 9.5, "y": 4.25}, + {"matrix": [9, 2], "x": 10.5, "y": 4.13}, + {"matrix": [9, 3], "x": 11.5, "y": 4.13} ] } } diff --git a/keyboards/sparrow62/sparrow62.h b/keyboards/sparrow62/sparrow62.h deleted file mode 100644 index 15722f1da0e9..000000000000 --- a/keyboards/sparrow62/sparrow62.h +++ /dev/null @@ -1,54 +0,0 @@ -/* -Copyright 2020 Atsushi Morimoto @74th - -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" - -/* - * /-----+-----+-----+-----+-----+-----\ /-----+-----+-----+-----+-----+-----\ - * | L06 | L05 | L04 | L03 | L02 | L01 | | R01 | R02 | R03 | R04 | R05 | R06 | - * |-----+-----+-----+-----+-----+-----+-----\ /-----+-----+-----+-----+-----+-----+-----| - * | L16 | L15 | L14 | L13 | L12 | L11 | L00 | | R00 | R11 | R12 | R13 | R14 | R15 | R16 | - * |-----+-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----+-----| - * | L26 | L25 | L24 | L23 | L22 | L21 | L10 | | R10 | R21 | R22 | R23 | R24 | R25 | R26 | - * |-----+-----+-----+-----+-----+-----+-----| |-----+-----+-----+-----+-----+-----+-----| - * | L36 | L35 | L34 | L33 | L32 | L31 | L20 | | R20 | R31 | R32 | R33 | R34 | R35 | R36 | - * \-----+-----+---+-----+-----+-----+-----+-/ \-+-----+-----+-----+-----+---+-----+-----/ - * | L43 | L42 | L41 | L30 | | R30 | R41 | R42 | R43 | - * \-----+-----+-----+-----/ \-----+-----+-----+-----/ - */ - -#define LAYOUT( \ - L06, L05, L04, L03, L02, L01, R01, R02, R03, R04, R05, R06, \ - L16, L15, L14, L13, L12, L11, L00, R00, R11, R12, R13, R14, R15, R16, \ - L26, L25, L24, L23, L22, L21, L10, R10, R21, R22, R23, R24, R25, R26, \ - L36, L35, L34, L33, L32, L31, L20, R20, R31, R32, R33, R34, R35, R36, \ - L43, L42, L41, L30, R30, R41, R42, R43 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, L26 }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { KC_NO, L41, L42, L43, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06 }, \ - { R10, R11, R12, R13, R14, R15, R16 }, \ - { R20, R21, R22, R23, R24, R25, R26 }, \ - { R30, R31, R32, R33, R34, R35, R36 }, \ - { KC_NO, R41, R42, R43, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/spiderisland/split78/info.json b/keyboards/spiderisland/split78/info.json index baf9d91f136e..7b87c2b71356 100644 --- a/keyboards/spiderisland/split78/info.json +++ b/keyboards/spiderisland/split78/info.json @@ -21,87 +21,98 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, - {"x": 2, "y": 0}, - {"x": 3, "y": 0}, - {"x": 4, "y": 0}, - {"x": 5, "y": 0}, - {"x": 6.5, "y": 0}, - {"x": 8.5, "y": 0}, - {"x": 9.5, "y": 0}, - {"x": 10.5, "y": 0}, - {"x": 12, "y": 0}, - {"x": 13, "y": 0}, - {"x": 14, "y": 0}, - {"x": 15, "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": 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}, - {"x": 14, "y": 1.25, "w": 2}, - {"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": 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}, - {"x": 14.5, "y": 2.25, "w": 1.5}, + {"matrix": [0, 0], "x": 0, "y": 0}, - {"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": 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}, - {"x": 13.75, "y": 3.25, "w": 2.25}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [2, 0], "x": 3, "y": 0}, + {"matrix": [3, 0], "x": 4, "y": 0}, + {"matrix": [4, 0], "x": 5, "y": 0}, - {"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": 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, "y": 4.25}, - {"x": 15, "y": 4.25}, + {"matrix": [5, 0], "x": 6.5, "y": 0}, - {"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": 1.25}, - {"x": 5, "y": 5.25, "w": 2.25}, - {"x": 8.25, "y": 5.25, "w": 2.25}, - {"x": 10.5, "y": 5.25, "w": 1.25}, - {"x": 11.75, "y": 5.25, "w": 1.25}, - {"x": 13, "y": 5.25}, - {"x": 14, "y": 5.25}, - {"x": 15, "y": 5.25} + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [1, 7], "x": 9.5, "y": 0}, + {"matrix": [2, 7], "x": 10.5, "y": 0}, + + {"matrix": [3, 7], "x": 12, "y": 0}, + {"matrix": [4, 7], "x": 13, "y": 0}, + {"matrix": [5, 7], "x": 14, "y": 0}, + {"matrix": [6, 7], "x": 15, "y": 0}, + + {"matrix": [0, 1], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [4, 1], "x": 4, "y": 1.25}, + {"matrix": [5, 1], "x": 5, "y": 1.25}, + {"matrix": [5, 5], "x": 6, "y": 1.25}, + + {"matrix": [0, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 8], "x": 9, "y": 1.25}, + {"matrix": [2, 8], "x": 10, "y": 1.25}, + {"matrix": [3, 8], "x": 11, "y": 1.25}, + {"matrix": [4, 8], "x": 12, "y": 1.25}, + {"matrix": [5, 8], "x": 13, "y": 1.25}, + {"matrix": [6, 8], "x": 14, "y": 1.25, "w": 2}, + + {"matrix": [0, 2], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [3, 2], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + + {"matrix": [0, 9], "x": 7.5, "y": 2.25}, + {"matrix": [1, 9], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [3, 9], "x": 10.5, "y": 2.25}, + {"matrix": [4, 9], "x": 11.5, "y": 2.25}, + {"matrix": [5, 9], "x": 12.5, "y": 2.25}, + {"matrix": [6, 9], "x": 13.5, "y": 2.25}, + {"matrix": [0, 12], "x": 14.5, "y": 2.25, "w": 1.5}, + + {"matrix": [0, 3], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [1, 3], "x": 1.75, "y": 3.25}, + {"matrix": [2, 3], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [4, 3], "x": 4.75, "y": 3.25}, + {"matrix": [5, 3], "x": 5.75, "y": 3.25}, + + {"matrix": [0, 10], "x": 7.75, "y": 3.25}, + {"matrix": [1, 10], "x": 8.75, "y": 3.25}, + {"matrix": [2, 10], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [5, 10], "x": 11.75, "y": 3.25}, + {"matrix": [4, 10], "x": 12.75, "y": 3.25}, + {"matrix": [6, 10], "x": 13.75, "y": 3.25, "w": 2.25}, + + {"matrix": [0, 4], "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": [5, 4], "x": 6.25, "y": 4.25}, + + {"matrix": [0, 11], "x": 8.25, "y": 4.25}, + {"matrix": [1, 11], "x": 9.25, "y": 4.25}, + {"matrix": [2, 11], "x": 10.25, "y": 4.25}, + {"matrix": [3, 11], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [5, 11], "x": 14, "y": 4.25}, + {"matrix": [6, 11], "x": 15, "y": 4.25}, + + {"matrix": [0, 5], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [1, 5], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [2, 5], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [3, 5], "x": 3.75, "y": 5.25, "w": 1.25}, + {"matrix": [4, 5], "x": 5, "y": 5.25, "w": 2.25}, + + {"matrix": [1, 12], "x": 8.25, "y": 5.25, "w": 2.25}, + {"matrix": [2, 12], "x": 10.5, "y": 5.25, "w": 1.25}, + {"matrix": [3, 12], "x": 11.75, "y": 5.25, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 5.25}, + {"matrix": [5, 12], "x": 14, "y": 5.25}, + {"matrix": [6, 12], "x": 15, "y": 5.25} ] } } diff --git a/keyboards/spiderisland/split78/matrix.c b/keyboards/spiderisland/split78/matrix.c index 71e154e5b7a8..31ee29eaab64 100644 --- a/keyboards/spiderisland/split78/matrix.c +++ b/keyboards/spiderisland/split78/matrix.c @@ -19,7 +19,6 @@ along with this program. If not, see . #include #include "quantum.h" #include "i2c_master.h" -#include "split78.h" #define RIGHT_HALF diff --git a/keyboards/spiderisland/split78/split78.h b/keyboards/spiderisland/split78/split78.h deleted file mode 100644 index 2f6252f0c922..000000000000 --- a/keyboards/spiderisland/split78/split78.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2020 unrelenting.technology - * - * 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( \ - l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, \ - l06, l07, l08, l09, l10, l11, l12, r07, r08, r09, r10, r11, r12, r13, \ - l13, l14, l15, l16, l17, l18, r14, r15, r16, r17, r18, r19, r20, r21, \ - l19, l20, l21, l22, l23, l24, r22, r23, r24, r25, r26, r27, r28, \ - l25, l26, l27, l28, l29, l30, r29, r30, r31, r32, r33, r34, r35, \ - l31, l32, l33, l34, l35, r36, r37, r38, r39, r40, r41 \ -) { \ - { l00, l06, l13, l19, l25, l31, KC_NO, r00, r07, r14, r22, r29, r21 }, \ - { l01, l07, l14, l20, l26, l32, KC_NO, r01, r08, r15, r23, r30, r36 }, \ - { l02, l08, l15, l21, l27, l33, KC_NO, r02, r09, r16, r24, r31, r37 }, \ - { l03, l09, l16, l22, l28, l34, KC_NO, r03, r10, r17, r25, r32, r38 }, \ - { l04, l10, l17, l23, l29, l35, KC_NO, r04, r11, r18, r27, r33, r39 }, \ - { l05, l11, l18, l24, l30, l12, KC_NO, r05, r12, r19, r26, r34, r40 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, r06, r13, r20, r28, r35, r41 }, \ -} diff --git a/keyboards/splitography/info.json b/keyboards/splitography/info.json index aab9d3f22f17..45ee7beed8d5 100644 --- a/keyboards/splitography/info.json +++ b/keyboards/splitography/info.json @@ -29,274 +29,53 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0, - "h": 0.6, - "matrix": [0, 0], - "label": "Esc" - }, - { - "x": 1, - "y": 0, - "h": 0.6, - "matrix": [0, 1], - "label": "Q" - }, - { - "x": 2, - "y": 0, - "h": 0.6, - "matrix": [0, 2], - "label": "W" - }, - { - "x": 3, - "y": 0, - "h": 0.6, - "matrix": [0, 3], - "label": "E" - }, - { - "x": 4, - "y": 0, - "h": 0.6, - "matrix": [0, 4], - "label": "R" - }, - { - "x": 5, - "y": 0, - "h": 0.6, - "matrix": [0, 5], - "label": "T" - }, - { - "x": 8, - "y": 0, - "h": 0.6, - "matrix": [0, 6], - "label": "Y" - }, - { - "x": 9, - "y": 0, - "h": 0.6, - "matrix": [0, 7], - "label": "U" - }, - { - "x": 10, - "y": 0, - "h": 0.6, - "matrix": [0, 8], - "label": "I" - }, - { - "x": 11, - "y": 0, - "h": 0.6, - "matrix": [0, 9], - "label": "O" - }, - { - "x": 12, - "y": 0, - "h": 0.6, - "matrix": [0, 10], - "label": "P" - }, - { - "x": 13, - "y": 0, - "h": 0.6, - "matrix": [0, 11], - "label": "Backspace" - }, - { - "x": 0, - "y": 0.6, - "matrix": [1, 0], - "label": "Alt" - }, - { - "x": 1, - "y": 0.6, - "matrix": [1, 1], - "label": "A" - }, - { - "x": 2, - "y": 0.6, - "matrix": [1, 2], - "label": "S" - }, - { - "x": 3, - "y": 0.6, - "matrix": [1, 3], - "label": "D" - }, - { - "x": 4, - "y": 0.6, - "matrix": [1, 4], - "label": "F" - }, - { - "x": 5, - "y": 0.6, - "matrix": [1, 5], - "label": "G" - }, - { - "x": 8, - "y": 0.6, - "matrix": [1, 6], - "label": "H" - }, - { - "x": 9, - "y": 0.6, - "matrix": [1, 7], - "label": "J" - }, - { - "x": 10, - "y": 0.6, - "matrix": [1, 8], - "label": "K" - }, - { - "x": 11, - "y": 0.6, - "matrix": [1, 9], - "label": "L" - }, - { - "x": 12, - "y": 0.6, - "matrix": [1, 10], - "label": ";" - }, - { - "x": 13, - "y": 0.6, - "matrix": [1, 11], - "label": "Enter" - }, - { - "x": 0, - "y": 1.6, - "h": 1.2, - "matrix": [2, 0], - "label": "Shift" - }, - { - "x": 1, - "y": 1.6, - "h": 1.2, - "matrix": [2, 1], - "label": "Z" - }, - { - "x": 2, - "y": 1.6, - "h": 1.2, - "matrix": [2, 2], - "label": "X" - }, - { - "x": 3, - "y": 1.6, - "h": 1.2, - "matrix": [2, 3], - "label": "C" - }, - { - "x": 4, - "y": 1.6, - "h": 1.2, - "matrix": [2, 4], - "label": "V" - }, - { - "x": 5, - "y": 1.6, - "h": 1.2, - "matrix": [2, 5], - "label": "B" - }, - { - "x": 8, - "y": 1.6, - "h": 1.2, - "matrix": [2, 6], - "label": "N" - }, - { - "x": 9, - "y": 1.6, - "h": 1.2, - "matrix": [2, 7], - "label": "M" - }, - { - "x": 10, - "y": 1.6, - "h": 1.2, - "matrix": [2, 8], - "label": "," - }, - { - "x": 11, - "y": 1.6, - "h": 1.2, - "matrix": [2, 9], - "label": "c" - }, - { - "x": 12, - "y": 1.6, - "h": 1.2, - "matrix": [2, 10], - "label": "/" - }, - { - "x": 13, - "y": 1.6, - "h": 1.2, - "matrix": [2, 11], - "label": "Super" - }, - { - "x": 3.5, - "y": 3, - "h": 1.2, - "matrix": [3, 4], - "label": "Orange" - }, - { - "x": 4.5, - "y": 3, - "h": 1.2, - "matrix": [3, 5], - "label": "Blue" - }, - { - "x": 8.5, - "y": 3, - "h": 1.2, - "matrix": [3, 6], - "label": "Space" - }, - { - "x": 9.5, - "y": 3, - "h": 1.2, - "matrix": [3, 7], - "label": "Ctrl" - } + {"matrix": [0, 0], "x": 0, "y": 0, "h": 0.6}, + {"matrix": [0, 1], "x": 1, "y": 0, "h": 0.6}, + {"matrix": [0, 2], "x": 2, "y": 0, "h": 0.6}, + {"matrix": [0, 3], "x": 3, "y": 0, "h": 0.6}, + {"matrix": [0, 4], "x": 4, "y": 0, "h": 0.6}, + {"matrix": [0, 5], "x": 5, "y": 0, "h": 0.6}, + + {"matrix": [0, 6], "x": 8, "y": 0, "h": 0.6}, + {"matrix": [0, 7], "x": 9, "y": 0, "h": 0.6}, + {"matrix": [0, 8], "x": 10, "y": 0, "h": 0.6}, + {"matrix": [0, 9], "x": 11, "y": 0, "h": 0.6}, + {"matrix": [0, 10], "x": 12, "y": 0, "h": 0.6}, + {"matrix": [0, 11], "x": 13, "y": 0, "h": 0.6}, + + {"matrix": [1, 0], "x": 0, "y": 0.6}, + {"matrix": [1, 1], "x": 1, "y": 0.6}, + {"matrix": [1, 2], "x": 2, "y": 0.6}, + {"matrix": [1, 3], "x": 3, "y": 0.6}, + {"matrix": [1, 4], "x": 4, "y": 0.6}, + {"matrix": [1, 5], "x": 5, "y": 0.6}, + + {"matrix": [1, 6], "x": 8, "y": 0.6}, + {"matrix": [1, 7], "x": 9, "y": 0.6}, + {"matrix": [1, 8], "x": 10, "y": 0.6}, + {"matrix": [1, 9], "x": 11, "y": 0.6}, + {"matrix": [1, 10], "x": 12, "y": 0.6}, + {"matrix": [1, 11], "x": 13, "y": 0.6}, + + {"matrix": [2, 0], "x": 0, "y": 1.6, "h": 1.2}, + {"matrix": [2, 1], "x": 1, "y": 1.6, "h": 1.2}, + {"matrix": [2, 2], "x": 2, "y": 1.6, "h": 1.2}, + {"matrix": [2, 3], "x": 3, "y": 1.6, "h": 1.2}, + {"matrix": [2, 4], "x": 4, "y": 1.6, "h": 1.2}, + {"matrix": [2, 5], "x": 5, "y": 1.6, "h": 1.2}, + + {"matrix": [2, 6], "x": 8, "y": 1.6, "h": 1.2}, + {"matrix": [2, 7], "x": 9, "y": 1.6, "h": 1.2}, + {"matrix": [2, 8], "x": 10, "y": 1.6, "h": 1.2}, + {"matrix": [2, 9], "x": 11, "y": 1.6, "h": 1.2}, + {"matrix": [2, 10], "x": 12, "y": 1.6, "h": 1.2}, + {"matrix": [2, 11], "x": 13, "y": 1.6, "h": 1.2}, + + {"matrix": [3, 4], "x": 3.5, "y": 3, "h": 1.2}, + {"matrix": [3, 5], "x": 4.5, "y": 3, "h": 1.2}, + + {"matrix": [3, 6], "x": 8.5, "y": 3, "h": 1.2}, + {"matrix": [3, 7], "x": 9.5, "y": 3, "h": 1.2} ] } } diff --git a/keyboards/splitography/splitography.h b/keyboards/splitography/splitography.h deleted file mode 100644 index cfef33363da3..000000000000 --- a/keyboards/splitography/splitography.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Alexis Jeandeau - * - * 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" - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L34, L35, R30, R31 \ -) \ -{ \ - { L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05 }, \ - { L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15 }, \ - { L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25 }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, L34, L35, R30, R31, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/splitty/info.json b/keyboards/splitty/info.json index a2983474bee6..06e9c6a099ff 100644 --- a/keyboards/splitty/info.json +++ b/keyboards/splitty/info.json @@ -18,74 +18,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "L00", "x": 0, "y": 0.6667}, - {"label": "L01", "x": 1, "y": 0.6667}, - {"label": "L02", "x": 2, "y": 0.2667}, - {"label": "L03", "x": 3, "y": 0}, - {"label": "L04", "x": 4, "y": 0.2667}, - {"label": "L05", "x": 5, "y": 0}, - {"label": "L06", "x": 6, "y": 0}, - {"label": "R06", "x": 10, "y": 0}, - {"label": "R05", "x": 11, "y": 0}, - {"label": "R04", "x": 12, "y": 0.2667}, - {"label": "R03", "x": 13, "y": 0}, - {"label": "R02", "x": 14, "y": 0.2667}, - {"label": "R01", "x": 15, "y": 0.6667}, - {"label": "R00", "x": 16, "y": 0.6667}, + {"matrix": [0, 0], "x": 0, "y": 0.6667}, + {"matrix": [0, 1], "x": 1, "y": 0.6667}, + {"matrix": [0, 2], "x": 2, "y": 0.2667}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.2667}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6, "y": 0}, - {"label": "L08", "x": 0, "y": 1.6667}, - {"label": "L09", "x": 1, "y": 1.6667}, - {"label": "L10", "x": 2, "y": 1.2667}, - {"label": "L11", "x": 3, "y": 1}, - {"label": "L12", "x": 4, "y": 1.2667}, - {"label": "L13", "x": 5, "y": 1}, - {"label": "L14", "x": 6, "y": 1, "h": 1.5}, - {"label": "R14", "x": 10, "y": 1, "h": 1.5}, - {"label": "R13", "x": 11, "y": 1}, - {"label": "R12", "x": 12, "y": 1.2667}, - {"label": "R11", "x": 13, "y": 1}, - {"label": "R10", "x": 14, "y": 1.2667}, - {"label": "R09", "x": 15, "y": 1.6667}, - {"label": "R08", "x": 16, "y": 1.6667}, + {"matrix": [5, 6], "x": 10, "y": 0}, + {"matrix": [5, 5], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.2667}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0.2667}, + {"matrix": [5, 1], "x": 15, "y": 0.6667}, + {"matrix": [5, 0], "x": 16, "y": 0.6667}, - {"label": "L16", "x": 0, "y": 2.6667}, - {"label": "L17", "x": 1, "y": 2.6667}, - {"label": "L18", "x": 2, "y": 2.2667}, - {"label": "L19", "x": 3, "y": 2}, - {"label": "L20", "x": 4, "y": 2.2667}, - {"label": "L21", "x": 5, "y": 2}, - {"label": "R21", "x": 11, "y": 2}, - {"label": "R20", "x": 12, "y": 2.2667}, - {"label": "R19", "x": 13, "y": 2}, - {"label": "R18", "x": 14, "y": 2.2667}, - {"label": "R17", "x": 15, "y": 2.6667}, - {"label": "R16", "x": 16, "y": 2.6667}, + {"matrix": [1, 0], "x": 0, "y": 1.6667}, + {"matrix": [1, 1], "x": 1, "y": 1.6667}, + {"matrix": [1, 2], "x": 2, "y": 1.2667}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.2667}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1, "h": 1.5}, - {"label": "L24", "x": 0, "y": 3.6667}, - {"label": "L25", "x": 1, "y": 3.6667}, - {"label": "L26", "x": 2, "y": 3.2667}, - {"label": "L27", "x": 3, "y": 3}, - {"label": "L28", "x": 4, "y": 3.2667}, - {"label": "L29", "x": 5, "y": 3}, - {"label": "L30", "x": 6, "y": 2.5, "h": 1.5}, - {"label": "R30", "x": 10, "y": 2.5, "h": 1.5}, - {"label": "R29", "x": 11, "y": 3}, - {"label": "R28", "x": 12, "y": 3.2667}, - {"label": "R27", "x": 13, "y": 3}, - {"label": "R26", "x": 14, "y": 3.2667}, - {"label": "R25", "x": 15, "y": 3.6667}, - {"label": "R24", "x": 16, "y": 3.6667}, + {"matrix": [6, 6], "x": 10, "y": 1, "h": 1.5}, + {"matrix": [6, 5], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.2667}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1.2667}, + {"matrix": [6, 1], "x": 15, "y": 1.6667}, + {"matrix": [6, 0], "x": 16, "y": 1.6667}, - {"label": "L34", "x": 2, "y": 4.2667}, - {"label": "L35", "x": 3, "y": 4}, - {"label": "L36", "x": 4, "y": 4.2667}, - {"label": "L37", "x": 5, "y": 4}, - {"label": "L38", "x": 6, "y": 4}, - {"label": "R38", "x": 10, "y": 4}, - {"label": "R37", "x": 11, "y": 4}, - {"label": "R36", "x": 12, "y": 4.2667}, - {"label": "R35", "x": 13, "y": 4}, - {"label": "R34", "x": 14, "y": 4.2667} + {"matrix": [2, 0], "x": 0, "y": 2.6667}, + {"matrix": [2, 1], "x": 1, "y": 2.6667}, + {"matrix": [2, 2], "x": 2, "y": 2.2667}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.2667}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [7, 5], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.2667}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2.2667}, + {"matrix": [7, 1], "x": 15, "y": 2.6667}, + {"matrix": [7, 0], "x": 16, "y": 2.6667}, + + {"matrix": [3, 0], "x": 0, "y": 3.6667}, + {"matrix": [3, 1], "x": 1, "y": 3.6667}, + {"matrix": [3, 2], "x": 2, "y": 3.2667}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.2667}, + {"matrix": [3, 5], "x": 5, "y": 3}, + {"matrix": [3, 6], "x": 6, "y": 2.5, "h": 1.5}, + + {"matrix": [8, 6], "x": 10, "y": 2.5, "h": 1.5}, + {"matrix": [8, 5], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.2667}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3.2667}, + {"matrix": [8, 1], "x": 15, "y": 3.6667}, + {"matrix": [8, 0], "x": 16, "y": 3.6667}, + + {"matrix": [4, 2], "x": 2, "y": 4.2667}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4.2667}, + {"matrix": [4, 5], "x": 5, "y": 4}, + {"matrix": [4, 6], "x": 6, "y": 4}, + + {"matrix": [9, 6], "x": 10, "y": 4}, + {"matrix": [9, 5], "x": 11, "y": 4}, + {"matrix": [9, 4], "x": 12, "y": 4.2667}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4.2667} ] } } diff --git a/keyboards/splitty/rev1/rev1.h b/keyboards/splitty/rev1/rev1.h deleted file mode 100644 index 7d9e9e09dcd2..000000000000 --- a/keyboards/splitty/rev1/rev1.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2018 Nicolas Schodet - * - * 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 "splitty.h" - -// clang-format off -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L42, L43, L44, L45, L46, R40, R41, R42, R43, R44 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06 }, \ - { L10, L11, L12, L13, L14, L15, L16 }, \ - { L20, L21, L22, L23, L24, L25, KC_NO }, \ - { L30, L31, L32, L33, L34, L35, L36 }, \ - { KC_NO, KC_NO, L42, L43, L44, L45, L46 }, \ - { R06, R05, R04, R03, R02, R01, R00 }, \ - { R16, R15, R14, R13, R12, R11, R10 }, \ - { R26, R25, R24, R23, R22, R21, KC_NO }, \ - { R36, R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, KC_NO, R44, R43, R42, R41, R40 }, \ -} -// clang-format on diff --git a/keyboards/splitty/splitty.c b/keyboards/splitty/splitty.c index 707f2898320a..bd493a80edeb 100644 --- a/keyboards/splitty/splitty.c +++ b/keyboards/splitty/splitty.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "splitty.h" +#include "quantum.h" #ifdef SWAP_HANDS_ENABLE // clang-format off diff --git a/keyboards/splitty/splitty.h b/keyboards/splitty/splitty.h deleted file mode 100644 index 420e1ea27b8c..000000000000 --- a/keyboards/splitty/splitty.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2018 Nicolas Schodet - * - * 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" - -#ifdef KEYBOARD_splitty_rev1 -# include "rev1.h" -#endif diff --git a/keyboards/star75/info.json b/keyboards/star75/info.json index 0105fac71d30..b4212142a5a9 100644 --- a/keyboards/star75/info.json +++ b/keyboards/star75/info.json @@ -29,91 +29,96 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"F1", "x":1.5, "y":0}, - {"label":"F2", "x":2.5, "y":0}, - {"label":"F3", "x":3.5, "y":0}, - {"label":"F4", "x":4.5, "y":0}, - {"label":"F5", "x":6, "y":0}, - {"label":"F6", "x":7, "y":0}, - {"label":"F7", "x":8, "y":0}, - {"label":"F8", "x":9, "y":0}, - {"label":"F9", "x":10.5, "y":0}, - {"label":"F10", "x":11.5, "y":0}, - {"label":"F11", "x":12.5, "y":0}, - {"label":"F12", "x":13.5, "y":0}, - {"label":"Ins", "x":15, "y":0}, + {"matrix": [0, 0], "x": 0, "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":"Home", "x":15, "y":1.25}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.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":"PgUp", "x":15, "y":2.25}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, - {"label":"Capslock", "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":"PgDn", "x":15, "y":3.25}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 12.5, "y": 0}, + {"matrix": [0, 12], "x": 13.5, "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":1.75}, - {"label":"Up", "x":14, "y":4.25}, + {"matrix": [0, 14], "x": 15, "y": 0}, - {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, - {"label":"Win", "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":"Fn", "x":10, "y":5.25, "w":1.25}, - {"label":"Alt", "x":11.25, "y":5.25, "w":1.25}, - {"label":"Left", "x":13, "y":5.25}, - {"label":"Down", "x":14, "y":5.25}, - {"label":"Right", "x":15, "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, "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, "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": [3, 14], "x": 15, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4.25, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "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, 5], "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, 12], "x": 13, "y": 5.25}, + {"matrix": [5, 13], "x": 14, "y": 5.25}, + {"matrix": [5, 14], "x": 15, "y": 5.25} ] } } diff --git a/keyboards/star75/star75.h b/keyboards/star75/star75.h deleted file mode 100644 index 899889efb724..000000000000 --- a/keyboards/star75/star75.h +++ /dev/null @@ -1,41 +0,0 @@ -/* -Copyright 2022 Horns Lyn (@hornslyn) -SPDX-License-Identifier: GPL-2.0-or-later */ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┐ - * │00 │ │01 │02 │03 │04 │ │05 │06 │07 │08 │ │09 │0A │0B │0C │ │0E │ - * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┘ - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐ - * │10 │11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤ - * │20 │21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │2E │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤ - * │30 │31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3E │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┘ - * │40 │41 │42 │43 │44 │45 │46 │47 │48 │49 │4A │4C │4D │ - * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┐ - * │50 │51 │52 │55 │59 │5A │ │5C │5D │5E │ - * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘ - */ - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4C, K4D, \ - K50, K51, K52, K55, K59, K5A, K5C, K5D, K5E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, XXX, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, XXX, K3E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, XXX }, \ - { K50, K51, K52, XXX, XXX, K55, XXX, XXX, XXX, K59, K5A, XXX, K5C, K5D, K5E } \ -} diff --git a/keyboards/stello65/hs_rev1/hs_rev1.h b/keyboards/stello65/hs_rev1/hs_rev1.h deleted file mode 100644 index 25f1b269cf0c..000000000000 --- a/keyboards/stello65/hs_rev1/hs_rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2022 @wekey (@wekey) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define K__ KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56, K47, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, K67, \ - K80, K90, K81, K91, K85, K95, K86, K96, K87 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K__ }, \ - { K10, K11, K12, K13, K14, K15, K16, K__ }, \ - { K20, K21, K22, K23, K24, K25, K26, K27 }, \ - { K30, K31, K32, K33, K34, K35, K36, K__ }, \ - { K40, K41, K42, K43, K44, K45, K__, K47 }, \ - { K50, K51, K52, K53, K54, K55, K56, K__ }, \ - { K60, K61, K62, K63, K64, K65, K__, K67 }, \ - { K70, K71, K72, K73, K74, K75, K76, K__ }, \ - { K80, K81, K__, K__, K__, K85, K86, K87 }, \ - { K90, K91, K__, K__, K__, K95, K96, K__ } \ -} diff --git a/keyboards/stello65/hs_rev1/info.json b/keyboards/stello65/hs_rev1/info.json index 6c19cfb7fe69..5b426cfa090c 100644 --- a/keyboards/stello65/hs_rev1/info.json +++ b/keyboards/stello65/hs_rev1/info.json @@ -20,7 +20,79 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1, "y":0}, {"label":"0,1", "x":2, "y":0}, {"label":"1,1", "x":3, "y":0}, {"label":"0,2", "x":4, "y":0}, {"label":"1,2", "x":5, "y":0}, {"label":"0,3", "x":6, "y":0}, {"label":"1,3", "x":7, "y":0}, {"label":"0,4", "x":8, "y":0}, {"label":"1,4", "x":9, "y":0}, {"label":"0,5", "x":10, "y":0}, {"label":"1,5", "x":11, "y":0}, {"label":"0,6", "x":12, "y":0}, {"label":"1,6", "x":13, "y":0, "w":2}, {"label":"2,0", "x":0, "y":1, "w":1.5}, {"label":"3,0", "x":1.5, "y":1}, {"label":"2,1", "x":2.5, "y":1}, {"label":"3,1", "x":3.5, "y":1}, {"label":"2,2", "x":4.5, "y":1}, {"label":"3,2", "x":5.5, "y":1}, {"label":"2,3", "x":6.5, "y":1}, {"label":"3,3", "x":7.5, "y":1}, {"label":"2,4", "x":8.5, "y":1}, {"label":"3,4", "x":9.5, "y":1}, {"label":"2,5", "x":10.5, "y":1}, {"label":"3,5", "x":11.5, "y":1}, {"label":"2,6", "x":12.5, "y":1}, {"label":"3,6", "x":13.5, "y":1, "w":1.5}, {"label":"2,7", "x":15, "y":1}, {"label":"4,0", "x":0, "y":2, "w":1.75}, {"label":"4,1", "x":1.75, "y":2}, {"label":"5,0", "x":2.75, "y":2}, {"label":"5,1", "x":3.75, "y":2}, {"label":"4,2", "x":4.75, "y":2}, {"label":"5,2", "x":5.75, "y":2}, {"label":"4,3", "x":6.75, "y":2}, {"label":"5,3", "x":7.75, "y":2}, {"label":"4,4", "x":8.75, "y":2}, {"label":"5,4", "x":9.75, "y":2}, {"label":"4,5", "x":10.75, "y":2}, {"label":"5,5", "x":11.75, "y":2}, {"label":"5,6", "x":12.75, "y":2, "w":2.25}, {"label":"4,7", "x":15, "y":2}, {"label":"6,0", "x":0, "y":3, "w":2.25}, {"label":"6,1", "x":2.25, "y":3}, {"label":"7,0", "x":3.25, "y":3}, {"label":"7,1", "x":4.25, "y":3}, {"label":"6,2", "x":5.25, "y":3}, {"label":"7,2", "x":6.25, "y":3}, {"label":"6,3", "x":7.25, "y":3}, {"label":"7,3", "x":8.25, "y":3}, {"label":"6,4", "x":9.25, "y":3}, {"label":"7,4", "x":10.25, "y":3}, {"label":"6,5", "x":11.25, "y":3}, {"label":"7,5", "x":12.25, "y":3}, {"label":"7,6", "x":13.25, "y":3, "w":1.75}, {"label":"6,7", "x":15, "y":3}, {"label":"8,0", "x":0, "y":4, "w":1.25}, {"label":"9,0", "x":1.25, "y":4, "w":1.25}, {"label":"8,1", "x":2.5, "y":4, "w":1.25}, {"label":"9,1", "x":3.75, "y":4, "w":6.25}, {"label":"8,5", "x":10, "y":4, "w":1.25}, {"label":"9,5", "x":11.25, "y":4, "w":1.25}, {"label":"8,6", "x":13, "y":4}, {"label":"9,6", "x":14, "y":4}, {"label":"8,7", "x":15, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0, "w": 2}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 7], "x": 15, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [4, 7], "x": 15, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [7, 0], "x": 2.25, "y": 3}, + {"matrix": [6, 1], "x": 3.25, "y": 3}, + {"matrix": [7, 1], "x": 4.25, "y": 3}, + {"matrix": [6, 2], "x": 5.25, "y": 3}, + {"matrix": [7, 2], "x": 6.25, "y": 3}, + {"matrix": [6, 3], "x": 7.25, "y": 3}, + {"matrix": [7, 3], "x": 8.25, "y": 3}, + {"matrix": [6, 4], "x": 9.25, "y": 3}, + {"matrix": [7, 4], "x": 10.25, "y": 3}, + {"matrix": [6, 5], "x": 11.25, "y": 3}, + {"matrix": [7, 5], "x": 12.25, "y": 3}, + {"matrix": [7, 6], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [6, 7], "x": 15, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [9, 1], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [8, 5], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [8, 6], "x": 13, "y": 4}, + {"matrix": [9, 6], "x": 14, "y": 4}, + {"matrix": [8, 7], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/stello65/sl_rev1/info.json b/keyboards/stello65/sl_rev1/info.json index 523a5c0dbbbc..36ae91917167 100644 --- a/keyboards/stello65/sl_rev1/info.json +++ b/keyboards/stello65/sl_rev1/info.json @@ -20,7 +20,81 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "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":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, "w":2.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}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [3, 7], "x": 15, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [5, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [5, 7], "x": 15, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [7, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [7, 7], "x": 15, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [9, 0], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [9, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [8, 6], "x": 13, "y": 4}, + {"matrix": [9, 6], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/stello65/sl_rev1/sl_rev1.h b/keyboards/stello65/sl_rev1/sl_rev1.h deleted file mode 100644 index 1a8c2cff8382..000000000000 --- a/keyboards/stello65/sl_rev1/sl_rev1.h +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright 2022 @wekey (@wekey) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define K__ KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K56, K57, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K77, \ - K80, K90, K81, K83, K94, K95, K86, K96, K97 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 }, \ - { K10, K11, K12, K13, K14, K15, K16, K__ }, \ - { K20, K21, K22, K23, K24, K25, K26, K__ }, \ - { K30, K31, K32, K33, K34, K35, K36, K37 }, \ - { K40, K41, K42, K43, K44, K45, K__, K__ }, \ - { K50, K51, K52, K53, K54, K55, K56, K57 }, \ - { K60, K61, K62, K63, K64, K65, K66, K__ }, \ - { K70, K71, K72, K73, K74, K75, K76, K77 }, \ - { K80, K81, K__, K83, K__, K__, K86, K__ }, \ - { K90, K__, K__, K__, K94, K95, K96, K97 } \ -} diff --git a/keyboards/stenokeyboards/the_uni/info.json b/keyboards/stenokeyboards/the_uni/info.json index b7cb80957e19..07478dd93a19 100644 --- a/keyboards/stenokeyboards/the_uni/info.json +++ b/keyboards/stenokeyboards/the_uni/info.json @@ -6,39 +6,5 @@ "usb": { "vid": "0x9000", "pid": "0x0001" - }, - "layouts": { - "LAYOUT": { - "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 }, - { "x": 4, "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": 0, "y": 1 }, - { "x": 1, "y": 1 }, - { "x": 2, "y": 1 }, - { "x": 3, "y": 1 }, - { "x": 4, "y": 1 }, - { "x": 7, "y": 1 }, - { "x": 8, "y": 1 }, - { "x": 9, "y": 1 }, - { "x": 10, "y": 1 }, - { "x": 11, "y": 1 }, - { "x": 12, "y": 1 }, - { "x": 2, "y": 3 }, - { "x": 3, "y": 3 }, - { "x": 4, "y": 3 }, - { "x": 7, "y": 3 }, - { "x": 8, "y": 3 }, - { "x": 9, "y": 3 } - ] - } } } diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/info.json b/keyboards/stenokeyboards/the_uni/pro_micro/info.json index 40dd660d0978..e53a30cda8e7 100644 --- a/keyboards/stenokeyboards/the_uni/pro_micro/info.json +++ b/keyboards/stenokeyboards/the_uni/pro_micro/info.json @@ -8,5 +8,44 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "caterina" + "bootloader": "caterina", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, + {"matrix": [2, 4], "x": 4, "y": 3}, + + {"matrix": [2, 5], "x": 7, "y": 3}, + {"matrix": [2, 6], "x": 8, "y": 3}, + {"matrix": [2, 7], "x": 9, "y": 3} + ] + } + } } diff --git a/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.h b/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.h deleted file mode 100644 index 9371c3a241d6..000000000000 --- a/keyboards/stenokeyboards/the_uni/pro_micro/pro_micro.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2021 Peter C. Park - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K202, K203, K204, K205, K206, K207 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { KC_NO, KC_NO, K202, K203, K204, K205, K206, K207, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/info.json b/keyboards/stenokeyboards/the_uni/rp_2040/info.json index c48ad290f4bf..e4c86b9312fc 100644 --- a/keyboards/stenokeyboards/the_uni/rp_2040/info.json +++ b/keyboards/stenokeyboards/the_uni/rp_2040/info.json @@ -8,5 +8,44 @@ }, "diode_direction": "COL2ROW", "processor": "RP2040", - "bootloader": "rp2040" + "bootloader": "rp2040", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, + {"matrix": [2, 4], "x": 4, "y": 3}, + + {"matrix": [2, 5], "x": 7, "y": 3}, + {"matrix": [2, 6], "x": 8, "y": 3}, + {"matrix": [2, 7], "x": 9, "y": 3} + ] + } + } } diff --git a/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.h b/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.h deleted file mode 100644 index 9371c3a241d6..000000000000 --- a/keyboards/stenokeyboards/the_uni/rp_2040/rp_2040.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2021 Peter C. Park - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K202, K203, K204, K205, K206, K207 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { KC_NO, KC_NO, K202, K203, K204, K205, K206, K207, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/stenokeyboards/the_uni/usb_c/info.json b/keyboards/stenokeyboards/the_uni/usb_c/info.json index ef761abe8a50..5f6d22417014 100644 --- a/keyboards/stenokeyboards/the_uni/usb_c/info.json +++ b/keyboards/stenokeyboards/the_uni/usb_c/info.json @@ -8,5 +8,44 @@ }, "diode_direction": "COL2ROW", "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1}, + {"matrix": [1, 10], "x": 12, "y": 1}, + + {"matrix": [2, 2], "x": 2, "y": 3}, + {"matrix": [2, 3], "x": 3, "y": 3}, + {"matrix": [2, 4], "x": 4, "y": 3}, + + {"matrix": [2, 5], "x": 7, "y": 3}, + {"matrix": [2, 6], "x": 8, "y": 3}, + {"matrix": [2, 7], "x": 9, "y": 3} + ] + } + } } diff --git a/keyboards/stenokeyboards/the_uni/usb_c/usb_c.h b/keyboards/stenokeyboards/the_uni/usb_c/usb_c.h deleted file mode 100644 index 9371c3a241d6..000000000000 --- a/keyboards/stenokeyboards/the_uni/usb_c/usb_c.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2021 Peter C. Park - -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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \ - K202, K203, K204, K205, K206, K207 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110 }, \ - { KC_NO, KC_NO, K202, K203, K204, K205, K206, K207, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/system76/launch_1/info.json b/keyboards/system76/launch_1/info.json index db5912e381ca..21a8c1fbd937 100644 --- a/keyboards/system76/launch_1/info.json +++ b/keyboards/system76/launch_1/info.json @@ -20,93 +20,103 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 1, "y": 0 }, - { "label": "F2", "x": 2, "y": 0 }, - { "label": "F3", "x": 3, "y": 0 }, - { "label": "F4", "x": 4, "y": 0 }, - { "label": "F5", "x": 5, "y": 0 }, - { "label": "F6", "x": 6, "y": 0 }, - { "label": "F7", "x": 7, "y": 0 }, - { "label": "F8", "x": 8, "y": 0 }, - { "label": "F9", "x": 9, "y": 0 }, - { "label": "F10", "x": 10, "y": 0 }, - { "label": "F11", "x": 11, "y": 0 }, - { "label": "F12", "x": 12, "y": 0 }, - { "label": "Del", "x": 13, "y": 0, "w": 1.5 }, - { "label": "Home", "x": 14.75, "y": 0 }, - { "label": "`", "x": 0, "y": 1 }, - { "label": "1", "x": 1, "y": 1 }, - { "label": "2", "x": 2, "y": 1 }, - { "label": "3", "x": 3, "y": 1 }, - { "label": "4", "x": 4, "y": 1 }, - { "label": "5", "x": 5, "y": 1 }, - { "label": "6", "x": 6, "y": 1 }, - { "label": "7", "x": 7, "y": 1 }, - { "label": "8", "x": 8, "y": 1 }, - { "label": "9", "x": 9, "y": 1 }, - { "label": "0", "x": 10, "y": 1 }, - { "label": "-", "x": 11, "y": 1 }, - { "label": "=", "x": 12, "y": 1 }, - { "label": "Bksp", "x": 13, "y": 1, "w": 1.5 }, - { "label": "PgUp", "x": 14.75, "y": 1 }, - { "label": "Tab", "x": 0, "y": 2, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2 }, - { "label": "W", "x": 2.5, "y": 2 }, - { "label": "E", "x": 3.5, "y": 2 }, - { "label": "R", "x": 4.5, "y": 2 }, - { "label": "T", "x": 5.5, "y": 2 }, - { "label": "Y", "x": 6.5, "y": 2 }, - { "label": "U", "x": 7.5, "y": 2 }, - { "label": "I", "x": 8.5, "y": 2 }, - { "label": "O", "x": 9.5, "y": 2 }, - { "label": "P", "x": 10.5, "y": 2 }, - { "label": "[", "x": 11.5, "y": 2 }, - { "label": "]", "x": 12.5, "y": 2 }, - { "label": "\\", "x": 13.5, "y": 2 }, - { "label": "PgDn", "x": 14.75, "y": 2 }, - { "label": "Caps", "x": 0.25, "y": 3, "w": 1.5 }, - { "label": "A", "x": 1.75, "y": 3 }, - { "label": "S", "x": 2.75, "y": 3 }, - { "label": "D", "x": 3.75, "y": 3 }, - { "label": "F", "x": 4.75, "y": 3 }, - { "label": "G", "x": 5.75, "y": 3 }, - { "label": "H", "x": 6.75, "y": 3 }, - { "label": "J", "x": 7.75, "y": 3 }, - { "label": "K", "x": 8.75, "y": 3 }, - { "label": "L", "x": 9.75, "y": 3 }, - { "label": ";", "x": 10.75, "y": 3 }, - { "label": "'", "x": 11.75, "y": 3 }, - { "label": "Enter", "x": 12.75, "y": 3, "w": 1.5 }, - { "label": "End", "x": 14.75, "y": 3 }, - { "label": "LShift", "x": 0.25, "y": 4, "w": 2 }, - { "label": "Z", "x": 2.25, "y": 4 }, - { "label": "X", "x": 3.25, "y": 4 }, - { "label": "C", "x": 4.25, "y": 4 }, - { "label": "V", "x": 5.25, "y": 4 }, - { "label": "B", "x": 6.25, "y": 4 }, - { "label": "N", "x": 7.25, "y": 4 }, - { "label": "M", "x": 8.25, "y": 4 }, - { "label": ",", "x": 9.25, "y": 4 }, - { "label": ".", "x": 10.25, "y": 4 }, - { "label": "/", "x": 11.25, "y": 4 }, - { "label": "RShift", "x": 12.25, "y": 4, "w": 1.5 }, - { "label": "Up", "x": 13.75, "y": 4 }, - { "label": "LCtrl", "x": 0.25, "y": 5, "w": 1.5 }, - { "label": "LAlt", "x": 1.75, "y": 5 }, - { "label": "LFn", "x": 2.75, "y": 5 }, - { "label": "Super", "x": 3.75, "y": 5 }, - { "label": "Space", "x": 4.75, "y": 5, "w": 2 }, - { "label": "Space", "x": 6.75, "y": 5, "w": 2 }, - { "label": "RCtrl", "x": 8.75, "y": 5 }, - { "label": "RAlt", "x": 9.75, "y": 5 }, - { "label": "RFn", "x": 10.75, "y": 5, "w": 1.5 }, - { "label": "Left", "x": 12.75, "y": 5 }, - { "label": "Down", "x": 13.75, "y": 5 }, - { "label": "Right", "x": 14.75, "y": 5 } + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 1.5}, + + {"matrix": [3, 13], "x": 14.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1, "w": 1.5}, + + {"matrix": [4, 13], "x": 14.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2}, + + {"matrix": [5, 13], "x": 14.75, "y": 2}, + + {"matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.75, "y": 3}, + {"matrix": [3, 2], "x": 2.75, "y": 3}, + {"matrix": [3, 3], "x": 3.75, "y": 3}, + {"matrix": [3, 4], "x": 4.75, "y": 3}, + {"matrix": [3, 5], "x": 5.75, "y": 3}, + {"matrix": [3, 6], "x": 6.75, "y": 3}, + {"matrix": [3, 7], "x": 7.75, "y": 3}, + {"matrix": [3, 8], "x": 8.75, "y": 3}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3}, + {"matrix": [3, 12], "x": 12.75, "y": 3, "w": 1.5}, + + {"matrix": [5, 5], "x": 14.75, "y": 3}, + + {"matrix": [4, 0], "x": 0.25, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2.25, "y": 4}, + {"matrix": [4, 2], "x": 3.25, "y": 4}, + {"matrix": [4, 3], "x": 4.25, "y": 4}, + {"matrix": [4, 4], "x": 5.25, "y": 4}, + {"matrix": [4, 5], "x": 6.25, "y": 4}, + {"matrix": [4, 6], "x": 7.25, "y": 4}, + {"matrix": [4, 7], "x": 8.25, "y": 4}, + {"matrix": [4, 8], "x": 9.25, "y": 4}, + {"matrix": [4, 9], "x": 10.25, "y": 4}, + {"matrix": [4, 10], "x": 11.25, "y": 4}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.5}, + {"matrix": [4, 12], "x": 13.75, "y": 4}, + + {"matrix": [5, 0], "x": 0.25, "y": 5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.75, "y": 5}, + {"matrix": [5, 2], "x": 2.75, "y": 5}, + {"matrix": [5, 3], "x": 3.75, "y": 5}, + {"matrix": [5, 4], "x": 4.75, "y": 5, "w": 2}, + {"matrix": [5, 6], "x": 6.75, "y": 5, "w": 2}, + {"matrix": [5, 7], "x": 8.75, "y": 5}, + {"matrix": [5, 8], "x": 9.75, "y": 5}, + {"matrix": [5, 9], "x": 10.75, "y": 5, "w": 1.5}, + + {"matrix": [5, 10], "x": 12.75, "y": 5}, + {"matrix": [5, 11], "x": 13.75, "y": 5}, + {"matrix": [5, 12], "x": 14.75, "y": 5} ] } } diff --git a/keyboards/system76/launch_1/launch_1.c b/keyboards/system76/launch_1/launch_1.c index fd780f6fee27..7a5000d9baaf 100644 --- a/keyboards/system76/launch_1/launch_1.c +++ b/keyboards/system76/launch_1/launch_1.c @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -#include "launch_1.h" +#include "quantum.h" #include "usb_mux.h" diff --git a/keyboards/system76/launch_1/launch_1.h b/keyboards/system76/launch_1/launch_1.h deleted file mode 100644 index 335b8ecbdf1b..000000000000 --- a/keyboards/system76/launch_1/launch_1.h +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Copyright (C) 2021 System76 - * - * 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 3 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" - -// clang-format off -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K0E }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K1E }, \ - { K50, K51, K52, K53, K54, K3D, K55, K56, K57, K58, K59, K5A, K5B, K2E }, \ -} -// clang-format on diff --git a/keyboards/takashicompany/center_enter/center_enter.h b/keyboards/takashicompany/center_enter/center_enter.h deleted file mode 100644 index 0bd576f43288..000000000000 --- a/keyboards/takashicompany/center_enter/center_enter.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, 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 \ -) { \ - { k00, k01, k02, k03, k04, k05, KC_NO, 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 } \ -} diff --git a/keyboards/takashicompany/center_enter/info.json b/keyboards/takashicompany/center_enter/info.json index e7930bdb010d..3521b2421816 100644 --- a/keyboards/takashicompany/center_enter/info.json +++ b/keyboards/takashicompany/center_enter/info.json @@ -26,43 +26,43 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Tab", "x":0, "y":0, "w":1.5}, - {"label":"Q", "x":1.5, "y":0}, - {"label":"W", "x":2.5, "y":0}, - {"label":"E", "x":3.5, "y":0}, - {"label":"R", "x":4.5, "y":0}, - {"label":"T", "x":5.5, "y":0}, - {"label":"Y", "x":8, "y":0}, - {"label":"U", "x":9, "y":0}, - {"label":"I", "x":10, "y":0}, - {"label":"O", "x":11, "y":0}, - {"label":"P", "x":12, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, - {"label":"Ctrl", "x":0, "y":1, "w":1.75}, - {"label":"A", "x":1.75, "y":1}, - {"label":"S", "x":2.75, "y":1}, - {"label":"D", "x":3.75, "y":1}, - {"label":"F", "x":4.75, "y":1}, - {"label":"G", "x":5.75, "y":1}, - {"label":"Switch Language", "x":6.75, "y":0, "w":1.25, "h":2}, - {"label":"H", "x":8, "y":1}, - {"label":"J", "x":9, "y":1}, - {"label":"K", "x":10, "y":1}, - {"label":"L", "x":11, "y":1}, - {"label":"Enter", "x":12, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 0, "w": 1.25, "h": 2}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + {"matrix": [1, 10], "x": 11, "y": 1}, + {"matrix": [1, 11], "x": 12, "y": 1}, - {"label":"Shift", "x":0, "y":2, "w":2}, - {"label":"Z", "x":2, "y":2}, - {"label":"X", "x":3, "y":2}, - {"label":"C", "x":4, "y":2}, - {"label":"V", "x":5, "y":2}, - {"label":"B", "x":6, "y":2}, - {"label":"Space", "x":7, "y":2}, - {"label":"N", "x":8, "y":2}, - {"label":"M", "x":9, "y":2}, - {"label":",<", "x":10, "y":2}, - {"label":".>", "x":11, "y":2}, - {"label":"Backspace", "x":12, "y":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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": [2, 11], "x": 12, "y": 2} ] } } diff --git a/keyboards/takashicompany/compacx/compacx.c b/keyboards/takashicompany/compacx/compacx.c index cf23638920cd..5a63210c5b33 100644 --- a/keyboards/takashicompany/compacx/compacx.c +++ b/keyboards/takashicompany/compacx/compacx.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "compacx.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/takashicompany/compacx/compacx.h b/keyboards/takashicompany/compacx/compacx.h deleted file mode 100644 index 61447abeb8f5..000000000000 --- a/keyboards/takashicompany/compacx/compacx.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l001, l002, l003, l004, l005, l006, l007, l008, r001, r002, r003, r004, r005, r006, r007, r008, \ - l201, l009, l010, l011, l012, l013, l901, r201, r009, r010, r011, r012, r013, r901, \ - l301, l014, l015, l016, l017, l018, r301, r014, r015, r016, r017, r018, \ - l401, l019, l020, l021, l022, l023, l024, r401, r019, r020, r021, r022, r023, r024, \ - l025, l101, l102, l026, l103, l104, l027, r025, r101, r102, r026, r103, r104, r027 \ -) { \ - { l001, l002, l003, l004, l005, l006, l007 }, \ - { l201, l009, l010, l011, l012, l013, l008 }, \ - { l301, l014, l015, l016, l017, l018, l901 }, \ - { l401, l019, l020, l021, l022, l023, l024 }, \ - { l025, l101, l102, l026, l103, l104, l027 }, \ - { r001, r002, r003, r004, r005, r006, r007 }, \ - { r201, r009, r010, r011, r012, r013, r008 }, \ - { r301, r014, r015, r016, r017, r018, r901 }, \ - { r401, r019, r020, r021, r022, r023, r024 }, \ - { r025, r101, r102, r026, r103, r104, r027 } \ -} diff --git a/keyboards/takashicompany/compacx/info.json b/keyboards/takashicompany/compacx/info.json index f67abdbd3f8e..edc71222a0f5 100644 --- a/keyboards/takashicompany/compacx/info.json +++ b/keyboards/takashicompany/compacx/info.json @@ -30,304 +30,85 @@ "layouts": { "LAYOUT": { "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": 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": 16, - "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.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "x": 9, - "y": 1, - "w": 1.5 - }, - { - "x": 10.5, - "y": 1 - }, - { - "x": 11.5, - "y": 1 - }, - { - "x": 12.5, - "y": 1 - }, - { - "x": 13.5, - "y": 1 - }, - { - "x": 14.5, - "y": 1 - }, - { - "x": 15.75, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "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": 9, - "y": 2, - "w": 1.75 - }, - { - "x": 10.75, - "y": 2 - }, - { - "x": 11.75, - "y": 2 - }, - { - "x": 12.75, - "y": 2 - }, - { - "x": 13.75, - "y": 2 - }, - { - "x": 14.75, - "y": 2 - }, - { - "x": 0, - "y": 3, - "w": 2 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 7, - "y": 3 - }, - { - "x": 9, - "y": 3, - "w": 2 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - }, - { - "x": 13, - "y": 3 - }, - { - "x": 14, - "y": 3 - }, - { - "x": 15, - "y": 3 - }, - { - "x": 16, - "y": 3 - }, - { - "x": 0, - "y": 4 - }, - { - "x": 1, - "y": 4, - "w": 1.25 - }, - { - "x": 2.25, - "y": 4, - "w": 1.25 - }, - { - "x": 3.5, - "y": 4 - }, - { - "x": 4.5, - "y": 4, - "w": 1.25 - }, - { - "x": 5.75, - "y": 4, - "w": 1.25 - }, - { - "x": 7, - "y": 4 - }, - { - "x": 9, - "y": 4 - }, - { - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "x": 12.5, - "y": 4 - }, - { - "x": 13.5, - "y": 4, - "w": 1.25 - }, - { - "x": 14.75, - "y": 4, - "w": 1.25 - }, - { - "x": 16, - "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": [1, 6], "x": 7, "y": 0}, + + {"matrix": [5, 0], "x": 9, "y": 0}, + {"matrix": [5, 1], "x": 10, "y": 0}, + {"matrix": [5, 2], "x": 11, "y": 0}, + {"matrix": [5, 3], "x": 12, "y": 0}, + {"matrix": [5, 4], "x": 13, "y": 0}, + {"matrix": [5, 5], "x": 14, "y": 0}, + {"matrix": [5, 6], "x": 15, "y": 0}, + {"matrix": [6, 6], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [2, 6], "x": 6.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 0], "x": 9, "y": 1, "w": 1.5}, + {"matrix": [6, 1], "x": 10.5, "y": 1}, + {"matrix": [6, 2], "x": 11.5, "y": 1}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 4], "x": 13.5, "y": 1}, + {"matrix": [6, 5], "x": 14.5, "y": 1}, + {"matrix": [7, 6], "x": 15.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9, "y": 2, "w": 1.75}, + {"matrix": [7, 1], "x": 10.75, "y": 2}, + {"matrix": [7, 2], "x": 11.75, "y": 2}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 4], "x": 13.75, "y": 2}, + {"matrix": [7, 5], "x": 14.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3, "w": 2}, + {"matrix": [8, 1], "x": 11, "y": 3}, + {"matrix": [8, 2], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 4], "x": 14, "y": 3}, + {"matrix": [8, 5], "x": 15, "y": 3}, + {"matrix": [8, 6], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.75, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 7, "y": 4}, + + {"matrix": [9, 0], "x": 9, "y": 4}, + {"matrix": [9, 1], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [9, 3], "x": 12.5, "y": 4}, + {"matrix": [9, 4], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14.75, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 16, "y": 4} ] } } diff --git a/keyboards/takashicompany/dogtag/dogtag.c b/keyboards/takashicompany/dogtag/dogtag.c index e5d0779c08d5..0ca5f7c3e897 100644 --- a/keyboards/takashicompany/dogtag/dogtag.c +++ b/keyboards/takashicompany/dogtag/dogtag.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "dogtag.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { keypos_t key; diff --git a/keyboards/takashicompany/dogtag/dogtag.h b/keyboards/takashicompany/dogtag/dogtag.h deleted file mode 100644 index fb5ae151ea1b..000000000000 --- a/keyboards/takashicompany/dogtag/dogtag.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l01, l02, l03, l04, r01, r02, r03, r04, \ - l05, l06, l07, l08, l09, r05, r06, r07, r08, r09, \ - l10, l11, r10, r11 \ -) { \ - { l01, l02, l03, l04, KC_NO }, \ - { l05, l06, l07, l08, l09 }, \ - { l10, l11, KC_NO, KC_NO, KC_NO }, \ - { KC_NO, r01, r02, r03, r04}, \ - { r05, r06, r07, r08, r09 }, \ - { r10, r11, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashicompany/dogtag/info.json b/keyboards/takashicompany/dogtag/info.json index 2a91bd48f0e2..8c572ad32f5a 100644 --- a/keyboards/takashicompany/dogtag/info.json +++ b/keyboards/takashicompany/dogtag/info.json @@ -35,94 +35,33 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 8, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "x": 4, - "y": 2 - }, - { - "x": 7, - "y": 2 - }, - { - "x": 8, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 3.5, - "y": 3.25 - }, - { - "x": 4.5, - "y": 3.25 - }, - { - "x": 6.5, - "y": 3.25 - }, - { - "x": 7.5, - "y": 3.25 - } + {"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": [3, 1], "x": 8, "y": 0}, + {"matrix": [3, 2], "x": 9, "y": 0}, + {"matrix": [3, 3], "x": 10, "y": 0}, + {"matrix": [3, 4], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 2}, + + {"matrix": [4, 0], "x": 7, "y": 2}, + {"matrix": [4, 1], "x": 8, "y": 1}, + {"matrix": [4, 2], "x": 9, "y": 1}, + {"matrix": [4, 3], "x": 10, "y": 1}, + {"matrix": [4, 4], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 3.5, "y": 3.25}, + {"matrix": [2, 1], "x": 4.5, "y": 3.25}, + + {"matrix": [5, 0], "x": 6.5, "y": 3.25}, + {"matrix": [5, 1], "x": 7.5, "y": 3.25} ] } } diff --git a/keyboards/takashicompany/endzone34/endzone34.c b/keyboards/takashicompany/endzone34/endzone34.c index f96c6b3f353d..403c4b7bb9a4 100644 --- a/keyboards/takashicompany/endzone34/endzone34.c +++ b/keyboards/takashicompany/endzone34/endzone34.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "endzone34.h" +#include "quantum.h" oled_rotation_t oled_init_kb(oled_rotation_t rotation) { return OLED_ROTATION_270; diff --git a/keyboards/takashicompany/endzone34/endzone34.h b/keyboards/takashicompany/endzone34/endzone34.h deleted file mode 100644 index f3e5c88b6357..000000000000 --- a/keyboards/takashicompany/endzone34/endzone34.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k11, k12, k13, k14, k15, k16, k17, k18, k19, k20, \ - k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, \ - k31, k32, k33, k34 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07, k08, k09, k10 }, \ - { k11, k12, k13, k14, k15, k16, k17, k18, k19, k20 }, \ - { k21, k22, k23, k24, k25, k26, k27, k28, k29, k30 }, \ - { KC_NO, KC_NO, KC_NO, k31, k32, k33, k34, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashicompany/endzone34/info.json b/keyboards/takashicompany/endzone34/info.json index e9c943790243..8eb5b4dd5710 100644 --- a/keyboards/takashicompany/endzone34/info.json +++ b/keyboards/takashicompany/endzone34/info.json @@ -18,46 +18,49 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0, "y":0.5}, - {"label":"W", "x":1, "y":0}, - {"label":"E", "x":2, "y":0}, - {"label":"R", "x":3, "y":0}, - {"label":"T", "x":4, "y":0}, - {"label":"Y", "x":7, "y":0}, - {"label":"U", "x":8, "y":0}, - {"label":"I", "x":9, "y":0}, - {"label":"O", "x":10, "y":0}, - {"label":"P", "x":11, "y":0.5}, + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"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}, - {"label":"A", "x":0, "y":1.5}, - {"label":"S", "x":1, "y":1}, - {"label":"D", "x":2, "y":1}, - {"label":"F", "x":3, "y":1}, - {"label":"G", "x":4, "y":1}, - {"label":"H", "x":7, "y":1}, - {"label":"J", "x":8, "y":1}, - {"label":"K", "x":9, "y":1}, - {"label":"L", "x":10, "y":1}, - {"label":"Enter", "x":11, "y":1.5}, + {"matrix": [0, 5], "x": 7, "y": 0}, + {"matrix": [0, 6], "x": 8, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0.5}, - {"label":"Z", "x":0, "y":2.5}, - {"label":"X", "x":1, "y":2}, - {"label":"C", "x":2, "y":2}, - {"label":"V", "x":3, "y":2}, - {"label":"B", "x":4, "y":2}, - {"label":"N", "x":7, "y":2}, - {"label":"M", "x":8, "y":2}, - {"label":", ", "x":9, "y":2}, - {"label":".", "x":10, "y":2}, - {"label":"Back Space", "x":11, "y":2.5}, + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, - {"label":"⇓", "x":4, "y":3}, - {"label":"Tab", "x":5, "y":3}, - {"label":"Space", "x":6, "y":3}, - {"label":"⇑", "x":7, "y":3} + {"matrix": [1, 5], "x": 7, "y": 1}, + {"matrix": [1, 6], "x": 8, "y": 1}, + {"matrix": [1, 7], "x": 9, "y": 1}, + {"matrix": [1, 8], "x": 10, "y": 1}, + {"matrix": [1, 9], "x": 11, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + + {"matrix": [2, 5], "x": 7, "y": 2}, + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2.5}, + + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3} ] } } diff --git a/keyboards/takashicompany/heavy_left/heavy_left.h b/keyboards/takashicompany/heavy_left/heavy_left.h deleted file mode 100644 index a54f88b30394..000000000000 --- a/keyboards/takashicompany/heavy_left/heavy_left.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - l06, l07, l08, l09, l00, l01, l02, l03, l04, l05, r00, r01, r02, r03, r04, r05, r06, r07, r08, r09, \ - l16, l17, l18, l19, l10, l11, l12, l13, l14, l15, r10, r11, r12, r13, r14, r15, r16, r17, r18, \ - l26, l27, l28, l29, l20, l21, l22, l23, l24, l25, r20, r21, r22, r23, r24, r25, r26, r27, \ - l36, l37, l38, l39, l30, l31, l32, l33, l34, l35, r30, r31, r32, r33, r34, r35, r36, r37, r38, \ - l46, l47, l48, l49, l40, l41, l42, l43, l44, l45, r40, r41, r42, r43, r44, r45, r46, r47, r48 \ -) { \ - { l00, l01, l02, l03, l04, l05, l06, l07, l08, l09 }, \ - { l10, l11, l12, l13, l14, l15, l16, l17, l18, l19 }, \ - { l20, l21, l22, l23, l24, l25, l26, l27, l28, l29 }, \ - { l30, l31, l32, l33, l34, l35, l36, l37, l38, l39 }, \ - { l40, l41, l42, l43, l44, l45, l46, l47, l48, l49 }, \ - { r00, r01, r02, r03, r04, r05, r06, r07, r09, KC_NO }, \ - { r10, r11, r12, r13, r14, r15, r16, r08, r18, KC_NO }, \ - { r20, r21, r22, r23, r24, r25, r26, r17, r27, KC_NO }, \ - { r30, r31, r32, r33, r34, r35, r36, r37, r38, KC_NO }, \ - { r40, r41, r42, r43, r44, r45, r46, r47, r48, KC_NO } \ -} diff --git a/keyboards/takashicompany/heavy_left/info.json b/keyboards/takashicompany/heavy_left/info.json index 95ecb65e1bdd..a48fceb8d1ca 100644 --- a/keyboards/takashicompany/heavy_left/info.json +++ b/keyboards/takashicompany/heavy_left/info.json @@ -24,491 +24,120 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "24", - "x": 0, - "y": 0 - }, - { - "label": "25", - "x": 1, - "y": 0 - }, - { - "label": "26", - "x": 2, - "y": 0 - }, - { - "label": "27", - "x": 3, - "y": 0 - }, - { - "label": "1", - "x": 4.25, - "y": 0 - }, - { - "label": "2", - "x": 5.25, - "y": 0 - }, - { - "label": "3", - "x": 6.25, - "y": 0 - }, - { - "label": "4", - "x": 7.25, - "y": 0 - }, - { - "label": "5", - "x": 8.25, - "y": 0 - }, - { - "label": "6", - "x": 9.25, - "y": 0 - }, - { - "label": "44", - "x": 10.75, - "y": 0 - }, - { - "label": "45", - "x": 11.75, - "y": 0 - }, - { - "label": "46", - "x": 12.75, - "y": 0 - }, - { - "label": "47", - "x": 13.75, - "y": 0 - }, - { - "label": "48", - "x": 14.75, - "y": 0 - }, - { - "label": "49", - "x": 15.75, - "y": 0 - }, - { - "label": "50", - "x": 16.75, - "y": 0 - }, - { - "label": "51", - "x": 17.75, - "y": 0 - }, - { - "label": "52", - "x": 18.75, - "y": 0 - }, - { - "label": "82", - "x": 20, - "y": 0 - }, - { - "label": "28", - "x": 0, - "y": 1 - }, - { - "label": "29", - "x": 1, - "y": 1 - }, - { - "label": "30", - "x": 2, - "y": 1 - }, - { - "label": "31", - "x": 3, - "y": 1 - }, - { - "label": "201", - "x": 4.25, - "y": 1, - "w": 1.5 - }, - { - "label": "7", - "x": 5.75, - "y": 1 - }, - { - "label": "8", - "x": 6.75, - "y": 1 - }, - { - "label": "9", - "x": 7.75, - "y": 1 - }, - { - "label": "10", - "x": 8.75, - "y": 1 - }, - { - "label": "11", - "x": 9.75, - "y": 1 - }, - { - "label": "53", - "x": 11.25, - "y": 1 - }, - { - "label": "54", - "x": 12.25, - "y": 1 - }, - { - "label": "55", - "x": 13.25, - "y": 1 - }, - { - "label": "56", - "x": 14.25, - "y": 1 - }, - { - "label": "57", - "x": 15.25, - "y": 1 - }, - { - "label": "58", - "x": 16.25, - "y": 1 - }, - { - "label": "59", - "x": 17.25, - "y": 1 - }, - { - "label": "901", - "x": 18.5, - "y": 1, - "w": 1.25, - "h": 2 - }, - { - "label": "83", - "x": 20, - "y": 1 - }, - { - "label": "32", - "x": 0, - "y": 2 - }, - { - "label": "33", - "x": 1, - "y": 2 - }, - { - "label": "34", - "x": 2, - "y": 2 - }, - { - "label": "35", - "x": 3, - "y": 2 - }, - { - "label": "301", - "x": 4.25, - "y": 2, - "w": 1.75 - }, - { - "label": "12", - "x": 6, - "y": 2 - }, - { - "label": "13", - "x": 7, - "y": 2 - }, - { - "label": "14", - "x": 8, - "y": 2 - }, - { - "label": "15", - "x": 9, - "y": 2 - }, - { - "label": "16", - "x": 10, - "y": 2 - }, - { - "label": "60", - "x": 11.5, - "y": 2 - }, - { - "label": "61", - "x": 12.5, - "y": 2 - }, - { - "label": "62", - "x": 13.5, - "y": 2 - }, - { - "label": "63", - "x": 14.5, - "y": 2 - }, - { - "label": "64", - "x": 15.5, - "y": 2 - }, - { - "label": "65", - "x": 16.5, - "y": 2 - }, - { - "label": "66", - "x": 17.5, - "y": 2 - }, - { - "label": "84", - "x": 20, - "y": 2 - }, - { - "label": "36", - "x": 0, - "y": 3 - }, - { - "label": "37", - "x": 1, - "y": 3 - }, - { - "label": "38", - "x": 2, - "y": 3 - }, - { - "label": "39", - "x": 3, - "y": 3 - }, - { - "label": "601", - "x": 4.25, - "y": 3, - "w": 2.25 - }, - { - "label": "17", - "x": 6.5, - "y": 3 - }, - { - "label": "18", - "x": 7.5, - "y": 3 - }, - { - "label": "19", - "x": 8.5, - "y": 3 - }, - { - "label": "20", - "x": 9.5, - "y": 3 - }, - { - "label": "21", - "x": 10.5, - "y": 3 - }, - { - "label": "67", - "x": 11.75, - "y": 3 - }, - { - "label": "68", - "x": 12.75, - "y": 3 - }, - { - "label": "69", - "x": 13.75, - "y": 3 - }, - { - "label": "70", - "x": 14.75, - "y": 3 - }, - { - "label": "71", - "x": 15.75, - "y": 3 - }, - { - "label": "72", - "x": 16.75, - "y": 3 - }, - { - "label": "73", - "x": 17.75, - "y": 3 - }, - { - "label": "74", - "x": 18.75, - "y": 3 - }, - { - "label": "85", - "x": 20, - "y": 3 - }, - { - "label": "40", - "x": 0, - "y": 4 - }, - { - "label": "41", - "x": 1, - "y": 4 - }, - { - "label": "42", - "x": 2, - "y": 4 - }, - { - "label": "43", - "x": 3, - "y": 4 - }, - { - "label": "101", - "x": 4.25, - "y": 4, - "w": 1.25 - }, - { - "label": "22", - "x": 5.5, - "y": 4 - }, - { - "label": "102", - "x": 6.5, - "y": 4, - "w": 1.25 - }, - { - "label": "23", - "x": 7.75, - "y": 4 - }, - { - "label": "103", - "x": 8.75, - "y": 4, - "w": 1.25 - }, - { - "label": "104", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "75", - "x": 11.5, - "y": 4 - }, - { - "label": "105", - "x": 12.5, - "y": 4, - "w": 1.25 - }, - { - "label": "76", - "x": 13.75, - "y": 4 - }, - { - "label": "77", - "x": 14.75, - "y": 4 - }, - { - "label": "78", - "x": 15.75, - "y": 4 - }, - { - "label": "79", - "x": 16.75, - "y": 4 - }, - { - "label": "80", - "x": 17.75, - "y": 4 - }, - { - "label": "81", - "x": 18.75, - "y": 4 - }, - { - "label": "86", - "x": 20, - "y": 4 - } + {"matrix": [0, 6], "x": 0, "y": 0}, + {"matrix": [0, 7], "x": 1, "y": 0}, + {"matrix": [0, 8], "x": 2, "y": 0}, + {"matrix": [0, 9], "x": 3, "y": 0}, + + {"matrix": [0, 0], "x": 4.25, "y": 0}, + {"matrix": [0, 1], "x": 5.25, "y": 0}, + {"matrix": [0, 2], "x": 6.25, "y": 0}, + {"matrix": [0, 3], "x": 7.25, "y": 0}, + {"matrix": [0, 4], "x": 8.25, "y": 0}, + {"matrix": [0, 5], "x": 9.25, "y": 0}, + + {"matrix": [5, 0], "x": 10.75, "y": 0}, + {"matrix": [5, 1], "x": 11.75, "y": 0}, + {"matrix": [5, 2], "x": 12.75, "y": 0}, + {"matrix": [5, 3], "x": 13.75, "y": 0}, + {"matrix": [5, 4], "x": 14.75, "y": 0}, + {"matrix": [5, 5], "x": 15.75, "y": 0}, + {"matrix": [5, 6], "x": 16.75, "y": 0}, + {"matrix": [5, 7], "x": 17.75, "y": 0}, + {"matrix": [6, 7], "x": 18.75, "y": 0}, + + {"matrix": [5, 8], "x": 20, "y": 0}, + + {"matrix": [1, 6], "x": 0, "y": 1}, + {"matrix": [1, 7], "x": 1, "y": 1}, + {"matrix": [1, 8], "x": 2, "y": 1}, + {"matrix": [1, 9], "x": 3, "y": 1}, + + {"matrix": [1, 0], "x": 4.25, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 5.75, "y": 1}, + {"matrix": [1, 2], "x": 6.75, "y": 1}, + {"matrix": [1, 3], "x": 7.75, "y": 1}, + {"matrix": [1, 4], "x": 8.75, "y": 1}, + {"matrix": [1, 5], "x": 9.75, "y": 1}, + + {"matrix": [6, 0], "x": 11.25, "y": 1}, + {"matrix": [6, 1], "x": 12.25, "y": 1}, + {"matrix": [6, 2], "x": 13.25, "y": 1}, + {"matrix": [6, 3], "x": 14.25, "y": 1}, + {"matrix": [6, 4], "x": 15.25, "y": 1}, + {"matrix": [6, 5], "x": 16.25, "y": 1}, + {"matrix": [6, 6], "x": 17.25, "y": 1}, + {"matrix": [7, 7], "x": 18.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [6, 8], "x": 20, "y": 1}, + + {"matrix": [2, 6], "x": 0, "y": 2}, + {"matrix": [2, 7], "x": 1, "y": 2}, + {"matrix": [2, 8], "x": 2, "y": 2}, + {"matrix": [2, 9], "x": 3, "y": 2}, + + {"matrix": [2, 0], "x": 4.25, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 6, "y": 2}, + {"matrix": [2, 2], "x": 7, "y": 2}, + {"matrix": [2, 3], "x": 8, "y": 2}, + {"matrix": [2, 4], "x": 9, "y": 2}, + {"matrix": [2, 5], "x": 10, "y": 2}, + + {"matrix": [7, 0], "x": 11.5, "y": 2}, + {"matrix": [7, 1], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2}, + {"matrix": [7, 3], "x": 14.5, "y": 2}, + {"matrix": [7, 4], "x": 15.5, "y": 2}, + {"matrix": [7, 5], "x": 16.5, "y": 2}, + {"matrix": [7, 6], "x": 17.5, "y": 2}, + + {"matrix": [7, 8], "x": 20, "y": 2}, + + {"matrix": [3, 6], "x": 0, "y": 3}, + {"matrix": [3, 7], "x": 1, "y": 3}, + {"matrix": [3, 8], "x": 2, "y": 3}, + {"matrix": [3, 9], "x": 3, "y": 3}, + + {"matrix": [3, 0], "x": 4.25, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 6.5, "y": 3}, + {"matrix": [3, 2], "x": 7.5, "y": 3}, + {"matrix": [3, 3], "x": 8.5, "y": 3}, + {"matrix": [3, 4], "x": 9.5, "y": 3}, + {"matrix": [3, 5], "x": 10.5, "y": 3}, + + {"matrix": [8, 0], "x": 11.75, "y": 3}, + {"matrix": [8, 1], "x": 12.75, "y": 3}, + {"matrix": [8, 2], "x": 13.75, "y": 3}, + {"matrix": [8, 3], "x": 14.75, "y": 3}, + {"matrix": [8, 4], "x": 15.75, "y": 3}, + {"matrix": [8, 5], "x": 16.75, "y": 3}, + {"matrix": [8, 6], "x": 17.75, "y": 3}, + {"matrix": [8, 7], "x": 18.75, "y": 3}, + + {"matrix": [8, 8], "x": 20, "y": 3}, + + {"matrix": [4, 6], "x": 0, "y": 4}, + {"matrix": [4, 7], "x": 1, "y": 4}, + {"matrix": [4, 8], "x": 2, "y": 4}, + {"matrix": [4, 9], "x": 3, "y": 4}, + + {"matrix": [4, 0], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 5.5, "y": 4}, + {"matrix": [4, 2], "x": 6.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 7.75, "y": 4}, + {"matrix": [4, 4], "x": 8.75, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 10, "y": 4, "w": 1.25}, + + {"matrix": [9, 0], "x": 11.5, "y": 4}, + {"matrix": [9, 1], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [9, 2], "x": 13.75, "y": 4}, + {"matrix": [9, 3], "x": 14.75, "y": 4}, + {"matrix": [9, 4], "x": 15.75, "y": 4}, + {"matrix": [9, 5], "x": 16.75, "y": 4}, + {"matrix": [9, 6], "x": 17.75, "y": 4}, + {"matrix": [9, 7], "x": 18.75, "y": 4}, + + {"matrix": [9, 8], "x": 20, "y": 4} ] } } diff --git a/keyboards/takashicompany/minizone/info.json b/keyboards/takashicompany/minizone/info.json index c591487e7bff..806a255bcb4a 100644 --- a/keyboards/takashicompany/minizone/info.json +++ b/keyboards/takashicompany/minizone/info.json @@ -21,47 +21,51 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 0, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 0, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84 }, + {"matrix": [0, 0], "x": 0, "y": 0.42, "w": 0.84, "h": 0.84}, + {"matrix": [0, 1], "x": 0.84, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [0, 2], "x": 1.68, "y": 0, "w": 0.84, "h": 0.84}, + {"matrix": [0, 3], "x": 2.52, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [0, 4], "x": 3.36, "y": 0.42, "w": 0.84, "h": 0.84}, - { "x": 0, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84 }, + {"matrix": [0, 5], "x": 5.88, "y": 0.42, "w": 0.84, "h": 0.84}, + {"matrix": [0, 6], "x": 6.72, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [1, 0], "x": 7.56, "y": 0, "w": 0.84, "h": 0.84}, + {"matrix": [1, 1], "x": 8.4, "y": 0.21, "w": 0.84, "h": 0.84}, + {"matrix": [1, 2], "x": 9.24, "y": 0.42, "w": 0.84, "h": 0.84}, - { "x": 0, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84 }, - { "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84 }, - { "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84 }, + {"matrix": [1, 3], "x": 0, "y": 1.26, "w": 0.84, "h": 0.84}, + {"matrix": [1, 4], "x": 0.84, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [1, 5], "x": 1.68, "y": 0.84, "w": 0.84, "h": 0.84}, + {"matrix": [1, 6], "x": 2.52, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 0], "x": 3.36, "y": 1.26, "w": 0.84, "h": 0.84}, - { "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84 }, - { "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84 }, - { "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84 }, - { "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84 }, - { "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84 } + {"matrix": [2, 1], "x": 5.88, "y": 1.26, "w": 0.84, "h": 0.84}, + {"matrix": [2, 2], "x": 6.72, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 3], "x": 7.56, "y": 0.84, "w": 0.84, "h": 0.84}, + {"matrix": [2, 4], "x": 8.4, "y": 1.05, "w": 0.84, "h": 0.84}, + {"matrix": [2, 5], "x": 9.24, "y": 1.26, "w": 0.84, "h": 0.84}, + + {"matrix": [2, 6], "x": 0, "y": 2.1, "w": 0.84, "h": 0.84}, + {"matrix": [3, 0], "x": 0.84, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 1], "x": 1.68, "y": 1.68, "w": 0.84, "h": 0.84}, + {"matrix": [3, 2], "x": 2.52, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 3], "x": 3.36, "y": 2.1, "w": 0.84, "h": 0.84}, + + {"matrix": [3, 4], "x": 5.88, "y": 2.1, "w": 0.84, "h": 0.84}, + {"matrix": [3, 5], "x": 6.72, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [3, 6], "x": 7.56, "y": 1.68, "w": 0.84, "h": 0.84}, + {"matrix": [4, 0], "x": 8.4, "y": 1.89, "w": 0.84, "h": 0.84}, + {"matrix": [4, 1], "x": 9.24, "y": 2.1, "w": 0.84, "h": 0.84}, + + {"matrix": [4, 2], "x": 1.68, "y": 2.52, "w": 0.84, "h": 0.84}, + {"matrix": [4, 3], "x": 2.52, "y": 2.73, "w": 0.84, "h": 0.84}, + {"matrix": [4, 4], "x": 3.36, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [4, 5], "x": 4.2, "y": 2.94, "w": 0.84, "h": 0.84}, + + {"matrix": [4, 6], "x": 5.04, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [5, 0], "x": 5.88, "y": 2.94, "w": 0.84, "h": 0.84}, + {"matrix": [5, 1], "x": 6.72, "y": 2.73, "w": 0.84, "h": 0.84}, + {"matrix": [5, 2], "x": 7.56, "y": 2.52, "w": 0.84, "h": 0.84} ] } } diff --git a/keyboards/takashicompany/minizone/minizone.c b/keyboards/takashicompany/minizone/minizone.c index 5231c8c497b0..1574b0aef7c8 100644 --- a/keyboards/takashicompany/minizone/minizone.c +++ b/keyboards/takashicompany/minizone/minizone.c @@ -1,7 +1,7 @@ // Copyright 2022 takashicompany (@takashicompany) // SPDX-License-Identifier: GPL-2.0-or-later -#include "minizone.h" +#include "quantum.h" #ifdef OLED_ENABLE diff --git a/keyboards/takashicompany/minizone/minizone.h b/keyboards/takashicompany/minizone/minizone.h deleted file mode 100644 index 0e8d62c30d15..000000000000 --- a/keyboards/takashicompany/minizone/minizone.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2022 takashicompany (@takashicompany) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k10, k11, k12, \ - k13, k14, k15, k16, k20, k21, k22, k23, k24, k25, \ - k26, k30, k31, k32, k33, k34, k35, k36, k40, k41, \ - k42, k43, k44, k45, k46, k50, k51, k52 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { k50, k51, k52, XXX, XXX, XXX, XXX } \ -} diff --git a/keyboards/takashicompany/qoolee/info.json b/keyboards/takashicompany/qoolee/info.json index d7e9e2271edd..c9aacaabc2b5 100644 --- a/keyboards/takashicompany/qoolee/info.json +++ b/keyboards/takashicompany/qoolee/info.json @@ -23,46 +23,46 @@ }, "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "w":1.5}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, - {"x":0, "y":1, "w":1.75}, - {"x":1.75, "y":1}, - {"x":2.75, "y":1}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":7.75, "y":1}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":0, "w":1.25, "h":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 0, "w": 1.25, "h": 2}, - {"x":0, "y":2, "w":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":6, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 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": [2, 11], "x": 12, "y": 2} ] } } diff --git a/keyboards/takashicompany/qoolee/qoolee.h b/keyboards/takashicompany/qoolee/qoolee.h deleted file mode 100644 index 986e7e3ec390..000000000000 --- a/keyboards/takashicompany/qoolee/qoolee.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, 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 \ -) { \ - { k00, k01, k02, k03, k04, k05, k07, k08, k09, k0a, k0b, KC_NO }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b } \ -} diff --git a/keyboards/takashicompany/radialex/info.json b/keyboards/takashicompany/radialex/info.json index d9b0e1aaa0b1..e3af5b83712b 100644 --- a/keyboards/takashicompany/radialex/info.json +++ b/keyboards/takashicompany/radialex/info.json @@ -21,186 +21,59 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 3, - "y": 0 - }, - { - "x": 4, - "y": 0 - }, - { - "x": 5, - "y": 0 - }, - { - "x": 9, - "y": 0 - }, - { - "x": 10, - "y": 0 - }, - { - "x": 11, - "y": 0 - }, - { - "x": 12, - "y": 0 - }, - { - "x": 13, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 3, - "y": 1 - }, - { - "x": 4, - "y": 1 - }, - { - "x": 5, - "y": 1 - }, - { - "x": 7, - "y": 1 - }, - { - "x": 9, - "y": 1 - }, - { - "x": 10, - "y": 1 - }, - { - "x": 11, - "y": 1 - }, - { - "x": 12, - "y": 1 - }, - { - "x": 13, - "y": 1 - }, - { - "x": 14, - "y": 1 - }, - { - "x": 0, - "y": 2 - }, - { - "x": 1, - "y": 2 - }, - { - "x": 2, - "y": 2 - }, - { - "x": 3, - "y": 2 - }, - { - "x": 4, - "y": 2 - }, - { - "x": 5, - "y": 2 - }, - { - "x": 9, - "y": 2 - }, - { - "x": 10, - "y": 2 - }, - { - "x": 11, - "y": 2 - }, - { - "x": 12, - "y": 2 - }, - { - "x": 13, - "y": 2 - }, - { - "x": 14, - "y": 2 - }, - { - "x": 2, - "y": 3 - }, - { - "x": 3, - "y": 3 - }, - { - "x": 4, - "y": 3 - }, - { - "x": 5, - "y": 3 - }, - { - "x": 6, - "y": 3 - }, - { - "x": 8, - "y": 3 - }, - { - "x": 9, - "y": 3 - }, - { - "x": 10, - "y": 3 - }, - { - "x": 11, - "y": 3 - }, - { - "x": 12, - "y": 3 - } + {"matrix": [0, 0], "x": 1, "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": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [1, 0], "x": 11, "y": 0}, + {"matrix": [1, 1], "x": 12, "y": 0}, + {"matrix": [1, 2], "x": 13, "y": 0}, + + {"matrix": [5, 5], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 4], "x": 2, "y": 1}, + {"matrix": [1, 5], "x": 3, "y": 1}, + {"matrix": [1, 6], "x": 4, "y": 1}, + {"matrix": [2, 0], "x": 5, "y": 1}, + + {"matrix": [6, 2], "x": 7, "y": 1}, + + {"matrix": [2, 1], "x": 9, "y": 1}, + {"matrix": [2, 2], "x": 10, "y": 1}, + {"matrix": [2, 3], "x": 11, "y": 1}, + {"matrix": [2, 4], "x": 12, "y": 1}, + {"matrix": [2, 5], "x": 13, "y": 1}, + {"matrix": [6, 0], "x": 14, "y": 1}, + + {"matrix": [5, 6], "x": 0, "y": 2}, + {"matrix": [2, 6], "x": 1, "y": 2}, + {"matrix": [3, 0], "x": 2, "y": 2}, + {"matrix": [3, 1], "x": 3, "y": 2}, + {"matrix": [3, 2], "x": 4, "y": 2}, + {"matrix": [3, 3], "x": 5, "y": 2}, + + {"matrix": [3, 4], "x": 9, "y": 2}, + {"matrix": [3, 5], "x": 10, "y": 2}, + {"matrix": [3, 6], "x": 11, "y": 2}, + {"matrix": [4, 0], "x": 12, "y": 2}, + {"matrix": [4, 1], "x": 13, "y": 2}, + {"matrix": [6, 1], "x": 14, "y": 2}, + + {"matrix": [4, 2], "x": 2, "y": 3}, + {"matrix": [4, 3], "x": 3, "y": 3}, + {"matrix": [4, 4], "x": 4, "y": 3}, + {"matrix": [4, 5], "x": 5, "y": 3}, + {"matrix": [4, 6], "x": 6, "y": 3}, + + {"matrix": [5, 0], "x": 8, "y": 3}, + {"matrix": [5, 1], "x": 9, "y": 3}, + {"matrix": [5, 2], "x": 10, "y": 3}, + {"matrix": [5, 3], "x": 11, "y": 3}, + {"matrix": [5, 4], "x": 12, "y": 3} ] } } diff --git a/keyboards/takashicompany/radialex/radialex.h b/keyboards/takashicompany/radialex/radialex.h deleted file mode 100644 index 8ad571220123..000000000000 --- a/keyboards/takashicompany/radialex/radialex.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2021 takashicompany - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, \ - k41, k11, k12, k13, k14, k15, k45, k16, k17, k18, k19, k20, k43, \ - k42, k21, k22, k23, k24, k25, k26, k27, k28, k29, k30, k44, \ - k31, k32, k33, k34, k35, k36, k37, k38, k39, k40 \ -) { \ - { k01, k02, k03, k04, k05, k06, k07 }, \ - { k08, k09, k10, k11, k12, k13, k14 }, \ - { k15, k16, k17, k18, k19, k20, k21 }, \ - { k22, k23, k24, k25, k26, k27, k28 }, \ - { k29, k30, k31, k32, k33, k34, k35 }, \ - { k36, k37, k38, k39, k40, k41, k42 }, \ - { k43, k44, k45, KC_NO, KC_NO, KC_NO, KC_NO } \ -} diff --git a/keyboards/takashiski/hecomi/alpha/info.json b/keyboards/takashiski/hecomi/alpha/info.json index eecf812a6853..19a1f0576043 100644 --- a/keyboards/takashiski/hecomi/alpha/info.json +++ b/keyboards/takashiski/hecomi/alpha/info.json @@ -24,356 +24,84 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 8.25, - "y": 0 - }, - { - "label": "*", - "x": 9.25, - "y": 0 - }, - { - "label": "(", - "x": 10.25, - "y": 0 - }, - { - "label": ")", - "x": 11.25, - "y": 0 - }, - { - "label": "_", - "x": 12.25, - "y": 0 - }, - { - "label": "+", - "x": 13.25, - "y": 0 - }, - { - "label": "|", - "x": 14.25, - "y": 0 - }, - { - "label": "~", - "x": 15.25, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "Y", - "x": 7.75, - "y": 1 - }, - { - "label": "U", - "x": 8.75, - "y": 1 - }, - { - "label": "I", - "x": 9.75, - "y": 1 - }, - { - "label": "O", - "x": 10.75, - "y": 1 - }, - { - "label": "P", - "x": 11.75, - "y": 1 - }, - { - "label": "{", - "x": 12.75, - "y": 1 - }, - { - "label": "}", - "x": 13.75, - "y": 1 - }, - { - "label": "Delete", - "x": 14.75, - "y": 1, - "w": 1.5 - }, - { - "label": "Control", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 8, - "y": 2 - }, - { - "label": "J", - "x": 9, - "y": 2 - }, - { - "label": "K", - "x": 10, - "y": 2 - }, - { - "label": "L", - "x": 11, - "y": 2 - }, - { - "label": ":", - "x": 12, - "y": 2 - }, - { - "label": "\"", - "x": 13, - "y": 2 - }, - { - "label": "Return", - "x": 14, - "y": 2, - "w": 2.25 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "B", - "x": 7.5, - "y": 3 - }, - { - "label": "N", - "x": 8.5, - "y": 3 - }, - { - "label": "M", - "x": 9.5, - "y": 3 - }, - { - "label": "<", - "x": 10.5, - "y": 3 - }, - { - "label": ">", - "x": 11.5, - "y": 3 - }, - { - "label": "?", - "x": 12.5, - "y": 3 - }, - { - "label": "Shift", - "x": 13.5, - "y": 3, - "w": 1.75 - }, - { - "label": "Fn", - "x": 15.25, - "y": 3 - }, - { - "x": 0, - "y": 4, - "w": 1.5 - }, - { - "label": "", - "x": 1.5, - "y": 4 - }, - { - "label": "GUI", - "x": 2.5, - "y": 4 - }, - { - "label": "無変換", - "x": 3.5, - "y": 4 - }, - { - "label": "tab", - "x": 4.5, - "y": 4 - }, - { - "x": 5.5, - "y": 4 - }, - { - "label": "Enter", - "x": 7.75, - "y": 4 - }, - { - "label": "BS", - "x": 8.75, - "y": 4 - }, - { - "label": "変換", - "x": 9.75, - "y": 4 - }, - { - "label": "GUI", - "x": 10.75, - "y": 4 - }, - { - "label": "Menu", - "x": 11.75, - "y": 4 - }, - { - "label": "", - "x": 12.75, - "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": [5, 0], "x": 8.25, "y": 0}, + {"matrix": [5, 1], "x": 9.25, "y": 0}, + {"matrix": [5, 2], "x": 10.25, "y": 0}, + {"matrix": [5, 3], "x": 11.25, "y": 0}, + {"matrix": [5, 4], "x": 12.25, "y": 0}, + {"matrix": [5, 5], "x": 13.25, "y": 0}, + {"matrix": [5, 6], "x": 14.25, "y": 0}, + {"matrix": [5, 7], "x": 15.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 7.75, "y": 1}, + {"matrix": [6, 1], "x": 8.75, "y": 1}, + {"matrix": [6, 2], "x": 9.75, "y": 1}, + {"matrix": [6, 3], "x": 10.75, "y": 1}, + {"matrix": [6, 4], "x": 11.75, "y": 1}, + {"matrix": [6, 5], "x": 12.75, "y": 1}, + {"matrix": [6, 6], "x": 13.75, "y": 1}, + {"matrix": [6, 7], "x": 14.75, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 1], "x": 8, "y": 2}, + {"matrix": [7, 2], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 4], "x": 11, "y": 2}, + {"matrix": [7, 5], "x": 12, "y": 2}, + {"matrix": [7, 6], "x": 13, "y": 2}, + {"matrix": [7, 7], "x": 14, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 7.5, "y": 3}, + {"matrix": [8, 1], "x": 8.5, "y": 3}, + {"matrix": [8, 2], "x": 9.5, "y": 3}, + {"matrix": [8, 3], "x": 10.5, "y": 3}, + {"matrix": [8, 4], "x": 11.5, "y": 3}, + {"matrix": [8, 5], "x": 12.5, "y": 3}, + {"matrix": [8, 6], "x": 13.5, "y": 3, "w": 1.75}, + {"matrix": [8, 7], "x": 15.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + + {"matrix": [9, 2], "x": 7.75, "y": 4}, + {"matrix": [9, 3], "x": 8.75, "y": 4}, + {"matrix": [9, 4], "x": 9.75, "y": 4}, + {"matrix": [9, 5], "x": 10.75, "y": 4}, + {"matrix": [9, 6], "x": 11.75, "y": 4}, + {"matrix": [9, 7], "x": 12.75, "y": 4} ] } } diff --git a/keyboards/takashiski/hecomi/hecomi.h b/keyboards/takashiski/hecomi/hecomi.h deleted file mode 100644 index 9586e839478c..000000000000 --- a/keyboards/takashiski/hecomi/hecomi.h +++ /dev/null @@ -1,69 +0,0 @@ -/* Copyright 2018 takashiski - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - - - -/* -Left hand : -7 -7 -6 -6 -6 - -32 - -Right hand: - -8 -8 -7 -8 -6 - -37 -*/ - -#define LAYOUT(\ - K00, K01, K02, K03, K04, K05, K06, K50, K51, K52, K53, K54, K55, K56, K57, \ - K10, K11, K12, K13, K14, K15, K16, K60, K61, K62, K63, K64, K65, K66, K67, \ - K20, K21, K22, K23, K24, K25, K71, K72, K73, K74, K75, K76, K77,\ - K30, K31, K32, K33, K34, K35, K80, K81, K82, K83, K84, K85, K86, K87, \ - K40, K41, K42, K43, K44, K45, K92, K93, K94, K95, K96, K97\ -) {\ - {K00, K01, K02, K03, K04, K05, K06, KC_NO},\ - {K10, K11, K12, K13, K14, K15, K16, KC_NO},\ - {K20, K21, K22, K23, K24, K25, KC_NO, KC_NO},\ - {K30, K31, K32, K33, K34, K35, KC_NO, KC_NO},\ - {K40, K41, K42, K43, K44, K45, KC_NO, KC_NO},\ - {K50, K51, K52, K53, K54, K55, K56, K57},\ - {K60, K61, K62, K63, K64, K65, K66, K67},\ - {KC_NO, K71, K72, K73, K74, K75, K76, K77},\ - {K80, K81, K82, K83, K84, K85, K86, K87},\ - {KC_NO, KC_NO, K92, K93, K94, K95, K96, K97}\ -} diff --git a/keyboards/takashiski/otaku_split/rev0/info.json b/keyboards/takashiski/otaku_split/rev0/info.json index 438cddcf30d9..8f9f79e4f523 100644 --- a/keyboards/takashiski/otaku_split/rev0/info.json +++ b/keyboards/takashiski/otaku_split/rev0/info.json @@ -20,7 +20,88 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"x":0, "y":4, "w":2}, {"label":"Ctrl", "x":2, "y":4, "w":1.25}, {"label":"Alt", "x":3.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"Menu", "x":11.75, "y":4}, {"label":"\u5909\u63db", "x":12.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":14, "y":4, "w":1.25}, {"label":"Alt", "x":15.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":16.5, "y":4, "w":1.25}] + "layout": [ + {"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": [5, 0], "x": 9.75, "y": 0}, + {"matrix": [5, 1], "x": 10.75, "y": 0}, + {"matrix": [5, 2], "x": 11.75, "y": 0}, + {"matrix": [5, 3], "x": 12.75, "y": 0}, + {"matrix": [5, 4], "x": 13.75, "y": 0}, + {"matrix": [5, 5], "x": 14.75, "y": 0}, + {"matrix": [5, 6], "x": 15.75, "y": 0}, + {"matrix": [5, 7], "x": 16.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 9.25, "y": 1}, + {"matrix": [6, 1], "x": 10.25, "y": 1}, + {"matrix": [6, 2], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 4], "x": 13.25, "y": 1}, + {"matrix": [6, 5], "x": 14.25, "y": 1}, + {"matrix": [6, 6], "x": 15.25, "y": 1}, + {"matrix": [6, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9.5, "y": 2}, + {"matrix": [7, 1], "x": 10.5, "y": 2}, + {"matrix": [7, 2], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 4], "x": 13.5, "y": 2}, + {"matrix": [7, 5], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3}, + {"matrix": [8, 1], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 6], "x": 15, "y": 3}, + {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 1], "x": 2, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.5, "y": 4}, + {"matrix": [4, 4], "x": 5.5, "y": 4}, + {"matrix": [4, 5], "x": 6.5, "y": 4}, + + {"matrix": [9, 0], "x": 8.75, "y": 4}, + {"matrix": [9, 1], "x": 9.75, "y": 4}, + {"matrix": [9, 2], "x": 10.75, "y": 4}, + {"matrix": [9, 3], "x": 11.75, "y": 4}, + {"matrix": [9, 4], "x": 12.75, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 15.25, "y": 4, "w": 1.25}, + {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/takashiski/otaku_split/rev0/rev0.h b/keyboards/takashiski/otaku_split/rev0/rev0.h deleted file mode 100644 index c3040d233258..000000000000 --- a/keyboards/takashiski/otaku_split/rev0/rev0.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2019 takashiski - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT(\ -L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06,R07,\ -L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16,R17,\ -L20,L21,L22,L23,L24,L25, R20,R21,R22,R23,R24,R25,R26, \ -L30,L31,L32,L33,L34,L35, R30,R31,R32,R33,R34,R35,R36,R37,\ -L40,L41,L42,L43,L44,L45, R40,R41,R42,R43,R44,R45,R46,R47\ -) {\ -{L00,L01,L02,L03,L04,L05,L06,KC_NO},\ -{L10,L11,L12,L13,L14,L15,L16,KC_NO},\ -{L20,L21,L22,L23,L24,L25,KC_NO,KC_NO},\ -{L30,L31,L32,L33,L34,L35,KC_NO,KC_NO},\ -{L40,L41,L42,L43,L44,L45,KC_NO,KC_NO},\ -{R00,R01,R02,R03,R04,R05,R06,R07},\ -{R10,R11,R12,R13,R14,R15,R16,R17},\ -{R20,R21,R22,R23,R24,R25,R26,KC_NO},\ -{R30,R31,R32,R33,R34,R35,R36,R37},\ -{R40,R41,R42,R43,R44,R45,R46,R47}\ -} - - diff --git a/keyboards/takashiski/otaku_split/rev1/info.json b/keyboards/takashiski/otaku_split/rev1/info.json index 5bdf4048a746..12bd92c681ce 100644 --- a/keyboards/takashiski/otaku_split/rev1/info.json +++ b/keyboards/takashiski/otaku_split/rev1/info.json @@ -26,7 +26,90 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"\u534a\u89d2", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"\"", "x":2, "y":0}, {"label":"\u00a3", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"Insert", "x":8.75, "y":0}, {"label":"&", "x":9.75, "y":0}, {"label":"*", "x":10.75, "y":0}, {"label":"(", "x":11.75, "y":0}, {"label":")", "x":12.75, "y":0}, {"label":"=", "x":13.75, "y":0}, {"label":"~", "x":14.75, "y":0}, {"label":"|", "x":15.75, "y":0}, {"label":"Backspace", "x":16.75, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"7", "x":6.5, "y":1}, {"label":"Y", "x":9.25, "y":1}, {"label":"U", "x":10.25, "y":1}, {"label":"I", "x":11.25, "y":1}, {"label":"O", "x":12.25, "y":1}, {"label":"P", "x":13.25, "y":1}, {"label":"`", "x":14.25, "y":1}, {"label":"{", "x":15.25, "y":1}, {"label":"Enter", "x":16.5, "y":1, "w":1.25, "h":2}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":"+", "x":13.5, "y":2}, {"label":"*", "x":14.5, "y":2}, {"label":"}", "x":15.5, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"1", "x":9, "y":3}, {"label":"N", "x":10, "y":3}, {"label":"M", "x":11, "y":3}, {"label":"<", "x":12, "y":3}, {"label":">", "x":13, "y":3}, {"label":"?", "x":14, "y":3}, {"label":"_", "x":15, "y":3}, {"label":"Shift", "x":16, "y":3, "w":1.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4}, {"label":"Alt", "x":2.25, "y":4, "w":1.25}, {"label":"\u7121\u5909\u63db", "x":3.5, "y":4}, {"label":"2", "x":4.5, "y":4}, {"label":"\u2190", "x":5.5, "y":4}, {"label":"\u2193", "x":6.5, "y":4}, {"label":"\u2191", "x":8.75, "y":4}, {"label":"\u2192", "x":9.75, "y":4}, {"label":".", "x":10.75, "y":4}, {"label":"\u5909\u63db", "x":11.75, "y":4, "w":1.25}, {"label":"\u30ab\u30bf\u30ab\u30ca", "x":13, "y":4, "w":1.25}, {"label":"Alt", "x":14.25, "y":4, "w":1.25}, {"label":"Menu", "x":15.5, "y":4}, {"label":"Ctrl", "x":16.5, "y":4, "w":1.25}] + "layout": [ + {"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": [5, 0], "x": 8.75, "y": 0}, + {"matrix": [5, 1], "x": 9.75, "y": 0}, + {"matrix": [5, 2], "x": 10.75, "y": 0}, + {"matrix": [5, 3], "x": 11.75, "y": 0}, + {"matrix": [5, 4], "x": 12.75, "y": 0}, + {"matrix": [5, 5], "x": 13.75, "y": 0}, + {"matrix": [5, 6], "x": 14.75, "y": 0}, + {"matrix": [5, 7], "x": 15.75, "y": 0}, + {"matrix": [6, 7], "x": 16.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + + {"matrix": [6, 0], "x": 9.25, "y": 1}, + {"matrix": [6, 1], "x": 10.25, "y": 1}, + {"matrix": [6, 2], "x": 11.25, "y": 1}, + {"matrix": [6, 3], "x": 12.25, "y": 1}, + {"matrix": [6, 4], "x": 13.25, "y": 1}, + {"matrix": [6, 5], "x": 14.25, "y": 1}, + {"matrix": [6, 6], "x": 15.25, "y": 1}, + {"matrix": [7, 7], "x": 16.5, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [7, 0], "x": 9.5, "y": 2}, + {"matrix": [7, 1], "x": 10.5, "y": 2}, + {"matrix": [7, 2], "x": 11.5, "y": 2}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 4], "x": 13.5, "y": 2}, + {"matrix": [7, 5], "x": 14.5, "y": 2}, + {"matrix": [7, 6], "x": 15.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [8, 0], "x": 9, "y": 3}, + {"matrix": [8, 1], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 3], "x": 12, "y": 3}, + {"matrix": [8, 4], "x": 13, "y": 3}, + {"matrix": [8, 5], "x": 14, "y": 3}, + {"matrix": [8, 6], "x": 15, "y": 3}, + {"matrix": [8, 7], "x": 16, "y": 3, "w": 1.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4}, + {"matrix": [4, 4], "x": 4.5, "y": 4}, + {"matrix": [4, 5], "x": 5.5, "y": 4}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + + {"matrix": [9, 0], "x": 8.75, "y": 4}, + {"matrix": [9, 1], "x": 9.75, "y": 4}, + {"matrix": [9, 2], "x": 10.75, "y": 4}, + {"matrix": [9, 3], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [9, 4], "x": 13, "y": 4, "w": 1.25}, + {"matrix": [9, 5], "x": 14.25, "y": 4, "w": 1.25}, + {"matrix": [9, 6], "x": 15.5, "y": 4}, + {"matrix": [9, 7], "x": 16.5, "y": 4, "w": 1.25} + ] } } } diff --git a/keyboards/takashiski/otaku_split/rev1/rev1.h b/keyboards/takashiski/otaku_split/rev1/rev1.h deleted file mode 100644 index a1f71f03385a..000000000000 --- a/keyboards/takashiski/otaku_split/rev1/rev1.h +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2019 takashiski - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT(\ -L00,L01,L02,L03,L04,L05,L06, R00,R01,R02,R03,R04,R05,R06,R07,R17,\ -L10,L11,L12,L13,L14,L15,L16, R10,R11,R12,R13,R14,R15,R16,R27,\ -L20,L21,L22,L23,L24,L25, R20,R21,R22,R23,R24,R25,R26, \ -L30,L31,L32,L33,L34,L35, R30,R31,R32,R33,R34,R35,R36,R37,\ -L40,L41,L42,L43,L44,L45,L46, R40,R41,R42,R43,R44,R45,R46,R47\ -) {\ -{L00,L01,L02,L03,L04,L05,L06,KC_NO},\ -{L10,L11,L12,L13,L14,L15,L16,KC_NO},\ -{L20,L21,L22,L23,L24,L25,KC_NO,KC_NO},\ -{L30,L31,L32,L33,L34,L35,KC_NO,KC_NO},\ -{L40,L41,L42,L43,L44,L45,L46,KC_NO},\ -{R00,R01,R02,R03,R04,R05,R06,R07},\ -{R10,R11,R12,R13,R14,R15,R16,R17},\ -{R20,R21,R22,R23,R24,R25,R26,R27},\ -{R30,R31,R32,R33,R34,R35,R36,R37},\ -{R40,R41,R42,R43,R44,R45,R46,R47}\ -} - diff --git a/keyboards/taleguers/taleguers75/info.json b/keyboards/taleguers/taleguers75/info.json index 1152f381e43a..229894fa9d05 100644 --- a/keyboards/taleguers/taleguers75/info.json +++ b/keyboards/taleguers/taleguers75/info.json @@ -23,423 +23,102 @@ }, "processor": "atmega32u4", "bootloader": "atmel-dfu", - "layouts": { + "layouts": { "LAYOUT": { - "layout": [{ - "label": "Esc", - "x": 0, - "y": 0 - }, - { - "label": "F1", - "x": 1.5, - "y": 0 - }, - { - "label": "F2", - "x": 2.5, - "y": 0 - }, - { - "label": "F3", - "x": 3.5, - "y": 0 - }, - { - "label": "F4", - "x": 4.5, - "y": 0 - }, - { - "label": "F5", - "x": 5.75, - "y": 0 - }, - { - "label": "F6", - "x": 6.75, - "y": 0 - }, - { - "label": "F7", - "x": 7.75, - "y": 0 - }, - { - "label": "F8", - "x": 8.75, - "y": 0 - }, - { - "label": "F9", - "x": 10, - "y": 0 - }, - { - "label": "F10", - "x": 11, - "y": 0 - }, - { - "label": "F11", - "x": 12, - "y": 0 - }, - { - "label": "F12", - "x": 13, - "y": 0 - }, - { - "label": "Del", - "x": 15.5, - "y": 2.25 - }, - { - "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": "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": "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": "Pg Up", - "x": 15.5, - "y": 3.25 - }, - { - "label": "Shift", - "x": 0, - "y": 4.25, - "w": 1.25 - }, - { - "label": "Prnt Scr", - "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": "Shift", - "x": 12.25, - "y": 4.25, - "w": 1.75 - }, - { - "label": "Pg Down", - "x": 15.5, - "y": 4.25 - }, - { - "label": "Ctrl", - "x": 0, - "y": 5.25, - "w": 1.25 - }, - { - "label": "Super", - "x": 1.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 5.25, - "w": 1.25 - }, - { - "x": 3.75, - "y": 5.25, - "w": 6.25 - }, - { - "label": "Alt Gr", - "x": 10, - "y": 5.25 - }, - { - "label": "Fn", - "x": 11, - "y": 5.25 - }, - { - "label": "Ctrl", - "x": 12, - "y": 5.25 - }, - { - "label": "\u2190", - "x": 13.25, - "y": 5.5 - }, - { - "label": "\u2191", - "x": 14.25, - "y": 4.5 - }, - { - "label": "\u2193", - "x": 14.25, - "y": 5.5 - }, - { - "label": "\u2192", - "x": 15.25, - "y": 5.5 - } + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + + {"matrix": [0, 5], "x": 5.75, "y": 0}, + {"matrix": [0, 6], "x": 6.75, "y": 0}, + {"matrix": [0, 7], "x": 7.75, "y": 0}, + {"matrix": [0, 8], "x": 8.75, "y": 0}, + + {"matrix": [0, 9], "x": 10, "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": 15.5, "y": 2.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": [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": [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": [3, 13], "x": 15.5, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.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": 1.75}, + + {"matrix": [4, 13], "x": 15.5, "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, 4], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 6], "x": 10, "y": 5.25}, + {"matrix": [5, 7], "x": 11, "y": 5.25}, + {"matrix": [5, 8], "x": 12, "y": 5.25}, + + {"matrix": [5, 10], "x": 13.25, "y": 5.5}, + {"matrix": [5, 11], "x": 14.25, "y": 4.5}, + {"matrix": [5, 12], "x": 14.25, "y": 5.5}, + {"matrix": [5, 13], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/taleguers/taleguers75/taleguers75.c b/keyboards/taleguers/taleguers75/taleguers75.c deleted file mode 100644 index b51d9443bc25..000000000000 --- a/keyboards/taleguers/taleguers75/taleguers75.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2020 Borja Lopez Jimenez - * - * 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 . - */ - -#include "taleguers75.h" diff --git a/keyboards/taleguers/taleguers75/taleguers75.h b/keyboards/taleguers/taleguers75/taleguers75.h deleted file mode 100644 index ccf1300c06c8..000000000000 --- a/keyboards/taleguers/taleguers75/taleguers75.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2020 Borja Lopez Jimenez - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \ - K500, K501, K502, K504, K506, K507, K508, K510, K511, K512, K513 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \ - { K500, K501, K502, KC_NO, K504, KC_NO, K506, K507, K508, KC_NO, K510, K511, K512, K513 } \ -} diff --git a/keyboards/team0110/p1800fl/info.json b/keyboards/team0110/p1800fl/info.json index 2dba562fd3f5..91fefd99ca85 100644 --- a/keyboards/team0110/p1800fl/info.json +++ b/keyboards/team0110/p1800fl/info.json @@ -26,92 +26,103 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0}, - {"label":"Num Lock", "x":15.5, "y":0}, - {"label":"/", "x":16.5, "y":0}, - {"label":"*", "x":17.5, "y":0}, - {"label":"-", "x":18.5, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"|", "x":13.5, "y":1, "w":1.5}, - {"label":"7", "x":15.5, "y":1}, - {"label":"8", "x":16.5, "y":1}, - {"label":"9", "x":17.5, "y":1}, - {"label":"+", "x":18.5, "y":1}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":1.25}, - {"label":"4", "x":15.5, "y":2}, - {"label":"5", "x":16.5, "y":2}, - {"label":"6", "x":17.5, "y":2}, - {"label":"+", "x":18.5, "y":2}, - {"label":"Shift", "x":0, "y":3, "w":1.25}, - {"label":"Shift", "x":1.25, "y":3}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":"<", "x":9.25, "y":3}, - {"label":">", "x":10.25, "y":3}, - {"label":"?", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":1.75}, - {"label":"Up", "x":14.25, "y":3.25}, - {"label":"1", "x":15.5, "y":3}, - {"label":"2", "x":16.5, "y":3}, - {"label":"3", "x":17.5, "y":3}, - {"label":"Enter", "x":18.5, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4, "w":1.25}, - {"label":"Alt", "x":2.5, "y":4, "w":1.25}, - {"label":"6.25x", "x":3.75, "y":4, "w":6.25}, - {"label":"Ctrl", "x":10, "y":4}, - {"label":"Win", "x":11, "y":4}, - {"label":"Alt", "x":12, "y":4}, - {"label":"Left", "x":13.25, "y":4.25}, - {"label":"Down", "x":14.25, "y":4.25}, - {"label":"Right", "x":15.25, "y":4.25}, - {"label":"0", "x":16.5, "y":4}, - {"label":".", "x":17.5, "y":4}, - {"label":"Enter", "x":18.5, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [5, 0], "x": 15.5, "y": 0}, + {"matrix": [5, 1], "x": 16.5, "y": 0}, + {"matrix": [5, 2], "x": 17.5, "y": 0}, + {"matrix": [5, 3], "x": 18.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [5, 4], "x": 15.5, "y": 1}, + {"matrix": [5, 5], "x": 16.5, "y": 1}, + {"matrix": [5, 6], "x": 17.5, "y": 1}, + {"matrix": [5, 7], "x": 18.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [5, 8], "x": 15.5, "y": 2}, + {"matrix": [5, 9], "x": 16.5, "y": 2}, + {"matrix": [5, 10], "x": 17.5, "y": 2}, + {"matrix": [5, 11], "x": 18.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 14.25, "y": 3.25}, + + {"matrix": [5, 12], "x": 15.5, "y": 3}, + {"matrix": [5, 13], "x": 16.5, "y": 3}, + {"matrix": [5, 14], "x": 17.5, "y": 3}, + {"matrix": [4, 14], "x": 18.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 5], "x": 10, "y": 4}, + {"matrix": [4, 6], "x": 11, "y": 4}, + {"matrix": [4, 7], "x": 12, "y": 4}, + + {"matrix": [4, 8], "x": 13.25, "y": 4.25}, + {"matrix": [4, 9], "x": 14.25, "y": 4.25}, + {"matrix": [4, 10], "x": 15.25, "y": 4.25}, + + {"matrix": [4, 11], "x": 16.5, "y": 4}, + {"matrix": [4, 12], "x": 17.5, "y": 4}, + {"matrix": [4, 13], "x": 18.5, "y": 4} ] } } diff --git a/keyboards/team0110/p1800fl/p1800fl.c b/keyboards/team0110/p1800fl/p1800fl.c index e0fc16a5e7d1..c82507ec27a8 100644 --- a/keyboards/team0110/p1800fl/p1800fl.c +++ b/keyboards/team0110/p1800fl/p1800fl.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "p1800fl.h" +#include "quantum.h" bool led_update_kb(led_t led_state) { bool res = led_update_user(led_state); diff --git a/keyboards/team0110/p1800fl/p1800fl.h b/keyboards/team0110/p1800fl/p1800fl.h deleted file mode 100644 index 7b8f3dcffde4..000000000000 --- a/keyboards/team0110/p1800fl/p1800fl.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2020 marhalloweenvt - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k50, k51, k52, k53, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k54, k55, k56, k57, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k58, k59, k5a, k5b, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k5c, k5d, k5e, k4e, \ - k40, k41, k42, k43, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, KC_NO }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, KC_NO }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, KC_NO }, \ - { k40, k41, k42, k43, KC_NO, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, k4e }, \ - { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a, k5b, k5c, k5d, k5e }, \ -} diff --git a/keyboards/technika/info.json b/keyboards/technika/info.json index cfe8492c45e6..1acab1f5e513 100644 --- a/keyboards/technika/info.json +++ b/keyboards/technika/info.json @@ -26,64 +26,64 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K0A", "x":10, "y":0}, - {"label":"K0B", "x":11, "y":0}, - {"label":"K0C", "x":12, "y":0}, - {"label":"K0D", "x":13, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, - {"label":"K10", "x":0, "y":1}, - {"label":"K11", "x":1, "y":1}, - {"label":"K12", "x":2, "y":1}, - {"label":"K13", "x":3, "y":1}, - {"label":"K14", "x":4, "y":1}, - {"label":"K15", "x":5, "y":1}, - {"label":"K16", "x":6, "y":1}, - {"label":"K17", "x":7, "y":1}, - {"label":"K18", "x":8, "y":1}, - {"label":"K19", "x":9, "y":1}, - {"label":"K1A", "x":10, "y":1}, - {"label":"K1B", "x":11, "y":1}, - {"label":"K1C", "x":12, "y":1}, - {"label":"K1D", "x":13, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + {"matrix": [1, 12], "x": 12, "y": 1}, + {"matrix": [1, 13], "x": 13, "y": 1}, - {"label":"K20", "x":0, "y":2}, - {"label":"K21", "x":1, "y":2}, - {"label":"K22", "x":2, "y":2}, - {"label":"K23", "x":3, "y":2}, - {"label":"K24", "x":4, "y":2}, - {"label":"K25", "x":5, "y":2}, - {"label":"K26", "x":6, "y":2}, - {"label":"K27", "x":7, "y":2}, - {"label":"K28", "x":8, "y":2}, - {"label":"K29", "x":9, "y":2}, - {"label":"K2A", "x":10, "y":2}, - {"label":"K2B", "x":11, "y":2}, - {"label":"K2C", "x":12, "y":2}, - {"label":"K2D", "x":13, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, - {"label":"K30", "x":0, "y":3}, - {"label":"K31", "x":1, "y":3}, - {"label":"K32", "x":2, "y":3}, - {"label":"K33", "x":3, "y":3}, - {"label":"K35", "x":5, "y":3}, - {"label":"K36", "x":6, "y":3}, - {"label":"K37", "x":7, "y":3}, - {"label":"K38", "x":8, "y":3}, - {"label":"K39", "x":9, "y":3}, - {"label":"K3A", "x":10, "y":3}, - {"label":"K3B", "x":11, "y":3}, - {"label":"K3C", "x":12, "y":3}, - {"label":"K3D", "x":13, "y":3} + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3} ] } } diff --git a/keyboards/technika/technika.c b/keyboards/technika/technika.c index 35a8666c73fa..cc60debe9f2d 100644 --- a/keyboards/technika/technika.c +++ b/keyboards/technika/technika.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 "technika.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinOutput(A15); diff --git a/keyboards/technika/technika.h b/keyboards/technika/technika.h deleted file mode 100644 index 9bae89813d04..000000000000 --- a/keyboards/technika/technika.h +++ /dev/null @@ -1,34 +0,0 @@ -/* -Copyright 2015 Á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 - -#define ___ KC_NO - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \ - { K30, K31, K32, K33, ___, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D} \ -} diff --git a/keyboards/tg4x/info.json b/keyboards/tg4x/info.json index 4250d9b8dcf8..b68b781feeef 100644 --- a/keyboards/tg4x/info.json +++ b/keyboards/tg4x/info.json @@ -18,9 +18,59 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", - "layouts": { + "layouts": { "LAYOUT": { - "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":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"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, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3, "w":1.25}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}] + "layout": [ + {"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": [4, 0], "x": 7, "y": 0}, + {"matrix": [4, 1], "x": 8, "y": 0}, + {"matrix": [4, 2], "x": 9, "y": 0}, + {"matrix": [4, 3], "x": 10, "y": 0}, + {"matrix": [4, 4], "x": 11, "y": 0}, + {"matrix": [4, 5], "x": 12, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [5, 0], "x": 7.25, "y": 1}, + {"matrix": [5, 1], "x": 8.25, "y": 1}, + {"matrix": [5, 2], "x": 9.25, "y": 1}, + {"matrix": [5, 3], "x": 10.25, "y": 1}, + {"matrix": [5, 4], "x": 11.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [6, 0], "x": 7.75, "y": 2}, + {"matrix": [6, 1], "x": 8.75, "y": 2}, + {"matrix": [6, 2], "x": 9.75, "y": 2}, + {"matrix": [6, 3], "x": 10.75, "y": 2}, + {"matrix": [6, 4], "x": 11.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.25}, + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2.75}, + {"matrix": [7, 1], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [7, 2], "x": 10, "y": 3}, + {"matrix": [7, 3], "x": 11, "y": 3}, + {"matrix": [7, 4], "x": 12, "y": 3} + ] } } } diff --git a/keyboards/tg4x/tg4x.h b/keyboards/tg4x/tg4x.h deleted file mode 100644 index 80dc40238f7d..000000000000 --- a/keyboards/tg4x/tg4x.h +++ /dev/null @@ -1,21 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define ___ KC_NO - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k40, k41, k42, k43, k44, k45, \ - k10, k11, k12, k13, k14, k15, k16, k50, k51, k52, k53, k54, \ - k20, k21, k22, k23, k24, k25, k26, k60, k61, k62, k63, k64, \ - k30, k31, k32, k34, k35, k71, k72, k73, k74 \ -){ \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, ___, k34, k35, ___ }, \ - { k40, k41, k42, k43, k44, k45, ___ }, \ - { k50, k51, k52, k53, k54, ___, ___ }, \ - { k60, k61, k62, k63, k64, ___, ___ }, \ - { ___, k71, k72, k73, k74, ___, ___ } \ -} diff --git a/keyboards/thevankeyboards/caravan/caravan.h b/keyboards/thevankeyboards/caravan/caravan.h deleted file mode 100644 index 43bd846ab6f6..000000000000 --- a/keyboards/thevankeyboards/caravan/caravan.h +++ /dev/null @@ -1,15 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - 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, K37, K38, K39, K3B \ -) { \ - { 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, KC_NO, KC_NO, KC_NO, K37, K38, K39, KC_NO, K3B } \ -} diff --git a/keyboards/thevankeyboards/caravan/info.json b/keyboards/thevankeyboards/caravan/info.json index 4c18b47cc8d4..781580bd8661 100644 --- a/keyboards/thevankeyboards/caravan/info.json +++ b/keyboards/thevankeyboards/caravan/info.json @@ -18,50 +18,57 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":7, "y":0}, - {"label":"K07", "x":8, "y":0}, - {"label":"K08", "x":9, "y":0}, - {"label":"K09", "x":10, "y":0}, - {"label":"K0A", "x":11, "y":0}, - {"label":"K0B", "x":12, "y":0, "w":1.75}, - {"label":"K10", "x":0, "y":1, "w":1.25}, - {"label":"K11", "x":1.25, "y":1}, - {"label":"K12", "x":2.25, "y":1}, - {"label":"K13", "x":3.25, "y":1}, - {"label":"K14", "x":4.25, "y":1}, - {"label":"K15", "x":5.25, "y":1}, - {"label":"K16", "x":7.25, "y":1}, - {"label":"K17", "x":8.25, "y":1}, - {"label":"K18", "x":9.25, "y":1}, - {"label":"K19", "x":10.25, "y":1}, - {"label":"K1A", "x":11.25, "y":1}, - {"label":"K1B", "x":12.25, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K21", "x":1.75, "y":2}, - {"label":"K22", "x":2.75, "y":2}, - {"label":"K23", "x":3.75, "y":2}, - {"label":"K24", "x":4.75, "y":2}, - {"label":"K25", "x":5.75, "y":2}, - {"label":"K26", "x":7.75, "y":2}, - {"label":"K27", "x":8.75, "y":2}, - {"label":"K28", "x":9.75, "y":2}, - {"label":"K29", "x":10.75, "y":2}, - {"label":"K2A", "x":11.75, "y":2}, - {"label":"K2B", "x":12.75, "y":2}, - {"label":"K30", "x":0, "y":3, "w":1.25}, - {"label":"K31", "x":1.25, "y":3, "w":1.5}, - {"label":"K32", "x":2.75, "y":3, "w":1.25}, - {"label":"K33", "x":4, "y":3, "w":2.25}, - {"label":"K37", "x":7.25, "y":3, "w":2}, - {"label":"K38", "x":9.25, "y":3, "w":1.25}, - {"label":"K39", "x":10.5, "y":3, "w":1.5}, - {"label":"K3B", "x":12, "y":3, "w":1.75} + {"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": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [1, 6], "x": 7.25, "y": 1}, + {"matrix": [1, 7], "x": 8.25, "y": 1}, + {"matrix": [1, 8], "x": 9.25, "y": 1}, + {"matrix": [1, 9], "x": 10.25, "y": 1}, + {"matrix": [1, 10], "x": 11.25, "y": 1}, + {"matrix": [1, 11], "x": 12.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 4, "y": 3, "w": 2.25}, + + {"matrix": [3, 7], "x": 7.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 9.25, "y": 3, "w": 1.25}, + {"matrix": [3, 9], "x": 10.5, "y": 3, "w": 1.5}, + {"matrix": [3, 11], "x": 12, "y": 3, "w": 1.75} ] } } diff --git a/keyboards/thevankeyboards/jetvan/info.json b/keyboards/thevankeyboards/jetvan/info.json index cd40690d7ac8..80281fef1f80 100644 --- a/keyboards/thevankeyboards/jetvan/info.json +++ b/keyboards/thevankeyboards/jetvan/info.json @@ -21,10 +21,52 @@ "layouts": { "LAYOUT": { "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, "w":1.75}, - {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.5}, - {"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":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3, "w":1.25}, {"x":3.5, "w":6.25, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0, "w": 1.75}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 7], "x": 3.5, "y": 3, "w": 6.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3}, + {"matrix": [3, 11], "x": 11.75, "y": 3} ] } } diff --git a/keyboards/thevankeyboards/jetvan/jetvan.h b/keyboards/thevankeyboards/jetvan/jetvan.h deleted file mode 100644 index 4e1e00e4f1e2..000000000000 --- a/keyboards/thevankeyboards/jetvan/jetvan.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -Copyright 2020 -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( \ - 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, K37, K39, K3A, K3B \ -){ \ - { 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, KC_NO, KC_NO, KC_NO, KC_NO, K37, KC_NO, K39, K3A, K3B } \ -} diff --git a/keyboards/tkc/candybar/lefty/info.json b/keyboards/tkc/candybar/lefty/info.json index cfa286972b4c..d1258fafad28 100644 --- a/keyboards/tkc/candybar/lefty/info.json +++ b/keyboards/tkc/candybar/lefty/info.json @@ -18,10 +18,72 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0}, - {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75}, - {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25}, - {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3} + {"matrix": [0, 13], "x": 0, "y": 0}, + {"matrix": [0, 14], "x": 1, "y": 0}, + {"matrix": [0, 15], "x": 2, "y": 0}, + {"matrix": [0, 16], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + {"matrix": [0, 11], "x": 15, "y": 0}, + {"matrix": [0, 12], "x": 16, "y": 0}, + + {"matrix": [1, 13], "x": 0, "y": 1}, + {"matrix": [1, 14], "x": 1, "y": 1}, + {"matrix": [1, 15], "x": 2, "y": 1}, + {"matrix": [1, 16], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1}, + {"matrix": [1, 8], "x": 12.25, "y": 1}, + {"matrix": [1, 9], "x": 13.25, "y": 1}, + {"matrix": [1, 10], "x": 14.25, "y": 1}, + {"matrix": [1, 12], "x": 15.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 13], "x": 0, "y": 2}, + {"matrix": [2, 14], "x": 1, "y": 2}, + {"matrix": [2, 15], "x": 2, "y": 2}, + {"matrix": [2, 16], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 5.75, "y": 2}, + {"matrix": [2, 3], "x": 6.75, "y": 2}, + {"matrix": [2, 4], "x": 7.75, "y": 2}, + {"matrix": [2, 5], "x": 8.75, "y": 2}, + {"matrix": [2, 6], "x": 9.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [2, 8], "x": 11.75, "y": 2}, + {"matrix": [2, 9], "x": 12.75, "y": 2}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + {"matrix": [2, 11], "x": 14.75, "y": 2}, + {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 13], "x": 0, "y": 3}, + {"matrix": [3, 14], "x": 1, "y": 3}, + {"matrix": [3, 15], "x": 2, "y": 3}, + {"matrix": [3, 16], "x": 3, "y": 3}, + {"matrix": [3, 0], "x": 4, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 5.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 6.5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 7.75, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 12.75, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 14, "y": 3}, + {"matrix": [3, 11], "x": 15, "y": 3}, + {"matrix": [3, 12], "x": 16, "y": 3} ] } } diff --git a/keyboards/tkc/candybar/lefty/lefty.h b/keyboards/tkc/candybar/lefty/lefty.h deleted file mode 100644 index 07af4b31bd38..000000000000 --- a/keyboards/tkc/candybar/lefty/lefty.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2018 Jack Humbert - * - * 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( \ - k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, \ - k2d, k2e, k2f, k2g, k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k3d, k3e, k3f, k3g, k30, k31, k32, k35, k37, k38, k39, k3a, k3b, k3c \ -) { \ - { k00, k01 , k02, k03 , k04 , k05, k06 , k07, k08, k09, k0a, k0b , k0c, k0d, k0e, k0f, k0g } , \ - { k10, k11 , k12, k13 , k14 , k15, k16 , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g } , \ - { k20, KC_NO, k22, k23 , k24 , k25, k26 , k27, k28, k29, k2a, k2b , k2c, k2d, k2e, k2f, k2g } , \ - { k30, k31 , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b , k3c, k3d, k3e, k3f, k3g } \ -} diff --git a/keyboards/tkc/candybar/lefty_r3/info.json b/keyboards/tkc/candybar/lefty_r3/info.json index 678e7e60f11f..77b991a8dc65 100644 --- a/keyboards/tkc/candybar/lefty_r3/info.json +++ b/keyboards/tkc/candybar/lefty_r3/info.json @@ -18,10 +18,72 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"Esc", "x":4, "y":0}, {"label":"Q", "x":5, "y":0}, {"label":"W", "x":6, "y":0}, {"label":"E", "x":7, "y":0}, {"label":"R", "x":8, "y":0}, {"label":"T", "x":9, "y":0}, {"label":"Y", "x":10, "y":0}, {"label":"U", "x":11, "y":0}, {"label":"I", "x":12, "y":0}, {"label":"O", "x":13, "y":0}, {"label":"P", "x":14, "y":0}, {"label":"{", "x":15, "y":0}, {"label":"}", "x":16, "y":0}, - {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"Tab", "x":4, "y":1, "w":1.25}, {"label":"A", "x":5.25, "y":1}, {"label":"S", "x":6.25, "y":1}, {"label":"D", "x":7.25, "y":1}, {"label":"F", "x":8.25, "y":1}, {"label":"G", "x":9.25, "y":1}, {"label":"H", "x":10.25, "y":1}, {"label":"J", "x":11.25, "y":1}, {"label":"K", "x":12.25, "y":1}, {"label":"L", "x":13.25, "y":1}, {"label":":", "x":14.25, "y":1}, {"label":"Enter", "x":15.25, "y":1, "w":1.75}, - {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"x":3, "y":2}, {"label":"Shift", "x":4, "y":2, "w":1.75}, {"label":"Z", "x":5.75, "y":2}, {"label":"X", "x":6.75, "y":2}, {"label":"C", "x":7.75, "y":2}, {"label":"V", "x":8.75, "y":2}, {"label":"B", "x":9.75, "y":2}, {"label":"N", "x":10.75, "y":2}, {"label":"M", "x":11.75, "y":2}, {"label":"<", "x":12.75, "y":2}, {"label":">", "x":13.75, "y":2}, {"label":"\u2191", "x":14.75, "y":2}, {"label":"Shift", "x":15.75, "y":2, "w":1.25}, - {"label":"Fn", "x":0, "y":3}, {"label":"0", "x":1, "y":3}, {"label":".", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3}, {"label":"Ctrl", "x":4, "y":3, "w":1.25}, {"label":"Win", "x":5.25, "y":3, "w":1.25}, {"label":"Alt", "x":6.5, "y":3, "w":1.25}, {"x":7.75, "y":3, "w":1.75}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":2.25}, {"label":"Win", "x":12.75, "y":3, "w":1.25}, {"label":"\u2190", "x":14, "y":3}, {"label":"\u2193", "x":15, "y":3}, {"label":"\u2192", "x":16, "y":3} + {"matrix": [0, 13], "x": 0, "y": 0}, + {"matrix": [0, 14], "x": 1, "y": 0}, + {"matrix": [0, 15], "x": 2, "y": 0}, + {"matrix": [0, 16], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + {"matrix": [0, 1], "x": 5, "y": 0}, + {"matrix": [0, 2], "x": 6, "y": 0}, + {"matrix": [0, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [0, 5], "x": 9, "y": 0}, + {"matrix": [0, 6], "x": 10, "y": 0}, + {"matrix": [0, 7], "x": 11, "y": 0}, + {"matrix": [0, 8], "x": 12, "y": 0}, + {"matrix": [0, 9], "x": 13, "y": 0}, + {"matrix": [0, 10], "x": 14, "y": 0}, + {"matrix": [0, 11], "x": 15, "y": 0}, + {"matrix": [0, 12], "x": 16, "y": 0}, + + {"matrix": [1, 13], "x": 0, "y": 1}, + {"matrix": [1, 14], "x": 1, "y": 1}, + {"matrix": [1, 15], "x": 2, "y": 1}, + {"matrix": [1, 16], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 4, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 5.25, "y": 1}, + {"matrix": [1, 2], "x": 6.25, "y": 1}, + {"matrix": [1, 3], "x": 7.25, "y": 1}, + {"matrix": [1, 4], "x": 8.25, "y": 1}, + {"matrix": [1, 5], "x": 9.25, "y": 1}, + {"matrix": [1, 6], "x": 10.25, "y": 1}, + {"matrix": [1, 7], "x": 11.25, "y": 1}, + {"matrix": [1, 8], "x": 12.25, "y": 1}, + {"matrix": [1, 9], "x": 13.25, "y": 1}, + {"matrix": [1, 10], "x": 14.25, "y": 1}, + {"matrix": [1, 12], "x": 15.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 13], "x": 0, "y": 2}, + {"matrix": [2, 14], "x": 1, "y": 2}, + {"matrix": [2, 15], "x": 2, "y": 2}, + {"matrix": [2, 16], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 4, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 5.75, "y": 2}, + {"matrix": [2, 3], "x": 6.75, "y": 2}, + {"matrix": [2, 4], "x": 7.75, "y": 2}, + {"matrix": [2, 5], "x": 8.75, "y": 2}, + {"matrix": [2, 6], "x": 9.75, "y": 2}, + {"matrix": [2, 7], "x": 10.75, "y": 2}, + {"matrix": [2, 8], "x": 11.75, "y": 2}, + {"matrix": [2, 9], "x": 12.75, "y": 2}, + {"matrix": [2, 10], "x": 13.75, "y": 2}, + {"matrix": [2, 11], "x": 14.75, "y": 2}, + {"matrix": [2, 12], "x": 15.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 13], "x": 0, "y": 3}, + {"matrix": [3, 14], "x": 1, "y": 3}, + {"matrix": [3, 15], "x": 2, "y": 3}, + {"matrix": [3, 16], "x": 3, "y": 3}, + {"matrix": [3, 0], "x": 4, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 5.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 6.5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 7.75, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 9.5, "y": 3}, + {"matrix": [3, 8], "x": 10.5, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 12.75, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 14, "y": 3}, + {"matrix": [3, 11], "x": 15, "y": 3}, + {"matrix": [3, 12], "x": 16, "y": 3} ] } } diff --git a/keyboards/tkc/candybar/lefty_r3/lefty_r3.h b/keyboards/tkc/candybar/lefty_r3/lefty_r3.h deleted file mode 100644 index d367e8d24115..000000000000 --- a/keyboards/tkc/candybar/lefty_r3/lefty_r3.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2021 Terry Mathews - * - * 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( \ - k0d, k0e, k0f, k0g, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \ - k1d, k1e, k1f, k1g, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, \ - k2d, k2e, k2f, k2g, k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \ - k3d, k3e, k3f, k3g, k30, k31, k32, k35, k37, k38, k39, k3a, k3b, k3c \ -) { \ - { k00, k01 , k02, k03 , k04 , k05, k06 , k07, k08, k09, k0a, k0b , k0c, k0d, k0e, k0f, k0g } , \ - { k10, k11 , k12, k13 , k14 , k15, k16 , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g } , \ - { k20, KC_NO, k22, k23 , k24 , k25, k26 , k27, k28, k29, k2a, k2b , k2c, k2d, k2e, k2f, k2g } , \ - { k30, k31 , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b , k3c, k3d, k3e, k3f, k3g } \ -} diff --git a/keyboards/tkc/candybar/righty/info.json b/keyboards/tkc/candybar/righty/info.json index 555b7c9cc0b0..9cfb7d884b14 100644 --- a/keyboards/tkc/candybar/righty/info.json +++ b/keyboards/tkc/candybar/righty/info.json @@ -18,10 +18,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}] + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 5.5, "y": 3}, + {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3} + ] } } } diff --git a/keyboards/tkc/candybar/righty/righty.h b/keyboards/tkc/candybar/righty/righty.h deleted file mode 100644 index 67e023883901..000000000000 --- a/keyboards/tkc/candybar/righty/righty.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2018 Jack Humbert - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, k1d, k1e, k1f, k1g, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k31, k32, k35, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \ -) { \ - { k00, k01 , k02, k03 , k04 , k05, k06 , k07, k08, k09, k0a, k0b , k0c, k0d, k0e, k0f, k0g } , \ - { k10, k11 , k12, k13 , k14 , k15, k16 , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g } , \ - { k20, KC_NO, k22, k23 , k24 , k25, k26 , k27, k28, k29, k2a, k2b , k2c, k2d, k2e, k2f, k2g } , \ - { k30, k31 , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b , k3c, k3d, k3e, k3f, k3g } \ -} diff --git a/keyboards/tkc/candybar/righty_r3/info.json b/keyboards/tkc/candybar/righty_r3/info.json index ca65a990b9d0..8fb72e163517 100644 --- a/keyboards/tkc/candybar/righty_r3/info.json +++ b/keyboards/tkc/candybar/righty_r3/info.json @@ -18,10 +18,73 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Del", "x":11, "y":0}, {"label":"BkSp", "x":12, "y":0}, {"label":"7", "x":13, "y":0}, {"label":"8", "x":14, "y":0}, {"label":"9", "x":15, "y":0}, {"label":"*", "x":16, "y":0}, - {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":":", "x":10.25, "y":1}, {"label":"Enter", "x":11.25, "y":1, "w":1.75}, {"label":"4", "x":13, "y":1}, {"label":"5", "x":14, "y":1}, {"label":"6", "x":15, "y":1}, {"label":"-", "x":16, "y":1}, - {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":">", "x":9.75, "y":2}, {"label":"Shift", "x":10.75, "y":2, "w":1.25}, {"label":"↑", "x":12, "y":2}, {"label":"1", "x":13, "y":2}, {"label":"2", "x":14, "y":2}, {"label":"3", "x":15, "y":2}, {"label":"+", "x":16, "y":2}, - {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"GUI", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":1.75}, {"x":5.5, "y":3}, {"label":"Backspace", "x":6.5, "y":3, "w":2.25}, {"label":"Menu", "x":8.75, "y":3, "w":1.25}, {"label":"Fn", "x":10, "y":3}, {"label":"←", "x":11, "y":3}, {"label":"↓", "x":12, "y":3}, {"label":"→", "x":13, "y":3}, {"label":"0", "x":14, "y":3}, {"label":".", "x":15, "y":3}, {"label":"Enter", "x":16, "y":3}] + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 15], "x": 15, "y": 0}, + {"matrix": [0, 16], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 12], "x": 11.25, "y": 1, "w": 1.75}, + {"matrix": [1, 13], "x": 13, "y": 1}, + {"matrix": [1, 14], "x": 14, "y": 1}, + {"matrix": [1, 15], "x": 15, "y": 1}, + {"matrix": [1, 16], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2, "w": 1.25}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + {"matrix": [2, 15], "x": 15, "y": 2}, + {"matrix": [2, 16], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 5], "x": 3.75, "y": 3, "w": 1.75}, + {"matrix": [3, 7], "x": 5.5, "y": 3}, + {"matrix": [3, 8], "x": 6.5, "y": 3, "w": 2.25}, + {"matrix": [3, 9], "x": 8.75, "y": 3, "w": 1.25}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + {"matrix": [3, 16], "x": 16, "y": 3} + ] } } } diff --git a/keyboards/tkc/candybar/righty_r3/righty_r3.h b/keyboards/tkc/candybar/righty_r3/righty_r3.h deleted file mode 100644 index faaef4939407..000000000000 --- a/keyboards/tkc/candybar/righty_r3/righty_r3.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2021 Terry Mathews - * - * 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( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1c, k1d, k1e, k1f, k1g, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \ - k30, k31, k32, k35, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, k3f, k3g \ -) { \ - { k00, k01 , k02, k03 , k04 , k05, k06 , k07, k08, k09, k0a, k0b , k0c, k0d, k0e, k0f, k0g } , \ - { k10, k11 , k12, k13 , k14 , k15, k16 , k17, k18, k19, k1a, KC_NO, k1c, k1d, k1e, k1f, k1g } , \ - { k20, KC_NO, k22, k23 , k24 , k25, k26 , k27, k28, k29, k2a, k2b , k2c, k2d, k2e, k2f, k2g } , \ - { k30, k31 , k32, KC_NO, KC_NO, k35, KC_NO, k37, k38, k39, k3a, k3b , k3c, k3d, k3e, k3f, k3g } \ -} diff --git a/keyboards/tkc/godspeed75/godspeed75.h b/keyboards/tkc/godspeed75/godspeed75.h deleted file mode 100644 index b2db7c876af3..000000000000 --- a/keyboards/tkc/godspeed75/godspeed75.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2018 Jack Humbert - * - * 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( \ - k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k17, \ - k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37, \ - k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47, k57, \ - k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k67, k77, \ - k80, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k96, k87, k97, \ - ka0, ka1, ka3, ka5, kb5, kb6, ka7, kb7 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07 } , \ - { k10, k11, k12, k13, k14, k15, k16, k17 } , \ - { k20, k21, k22, k23, 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, KC_NO, k57 } , \ - { k60, k61, k62, k63, k64, k65, KC_NO, k67 } , \ - { k70, k71, k72, k73, k74, k75, KC_NO, k77 } , \ - { k80, k81, k82, k83, k84, k85, KC_NO, k87 } , \ - { KC_NO,k91, k92, k93, k94, k95, k96, k97 } , \ - { ka0, ka1, KC_NO, ka3, KC_NO, ka5, KC_NO, ka7 } , \ - { KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,kb5, kb6, kb7 } \ -} diff --git a/keyboards/tkc/godspeed75/info.json b/keyboards/tkc/godspeed75/info.json index 6aac8e45e01f..9e4bcd442b4f 100644 --- a/keyboards/tkc/godspeed75/info.json +++ b/keyboards/tkc/godspeed75/info.json @@ -20,7 +20,97 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Scroll Lock", "x":14, "y":0}, {"label":"Pause", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"x":13, "y":1}, {"label":"BkSp", "x":14, "y":1}, {"label":"PgUp", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"PgDn", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Insert", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"Delete", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.25}, {"x":3.5, "y":5, "w":6.25}, {"label":"MO(1)", "x":9.75, "y":5, "w":1.25}, {"label":"Ctrl", "x":11, "y":5, "w":1.25}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 4], "x": 8, "y": 0}, + {"matrix": [1, 4], "x": 9, "y": 0}, + {"matrix": [0, 5], "x": 10, "y": 0}, + {"matrix": [1, 5], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + {"matrix": [1, 7], "x": 15, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1}, + {"matrix": [3, 0], "x": 1, "y": 1}, + {"matrix": [2, 1], "x": 2, "y": 1}, + {"matrix": [3, 1], "x": 3, "y": 1}, + {"matrix": [2, 2], "x": 4, "y": 1}, + {"matrix": [3, 2], "x": 5, "y": 1}, + {"matrix": [2, 3], "x": 6, "y": 1}, + {"matrix": [3, 3], "x": 7, "y": 1}, + {"matrix": [2, 4], "x": 8, "y": 1}, + {"matrix": [3, 4], "x": 9, "y": 1}, + {"matrix": [2, 5], "x": 10, "y": 1}, + {"matrix": [3, 5], "x": 11, "y": 1}, + {"matrix": [2, 6], "x": 12, "y": 1}, + {"matrix": [3, 6], "x": 13, "y": 1}, + {"matrix": [2, 7], "x": 14, "y": 1}, + {"matrix": [3, 7], "x": 15, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2}, + {"matrix": [4, 1], "x": 2.5, "y": 2}, + {"matrix": [5, 1], "x": 3.5, "y": 2}, + {"matrix": [4, 2], "x": 4.5, "y": 2}, + {"matrix": [5, 2], "x": 5.5, "y": 2}, + {"matrix": [4, 3], "x": 6.5, "y": 2}, + {"matrix": [5, 3], "x": 7.5, "y": 2}, + {"matrix": [4, 4], "x": 8.5, "y": 2}, + {"matrix": [5, 4], "x": 9.5, "y": 2}, + {"matrix": [4, 5], "x": 10.5, "y": 2}, + {"matrix": [5, 5], "x": 11.5, "y": 2}, + {"matrix": [4, 6], "x": 12.5, "y": 2}, + {"matrix": [4, 7], "x": 13.5, "y": 2, "w": 1.5}, + {"matrix": [5, 7], "x": 15, "y": 2}, + + {"matrix": [6, 0], "x": 0, "y": 3, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3}, + {"matrix": [6, 1], "x": 2.75, "y": 3}, + {"matrix": [7, 1], "x": 3.75, "y": 3}, + {"matrix": [6, 2], "x": 4.75, "y": 3}, + {"matrix": [7, 2], "x": 5.75, "y": 3}, + {"matrix": [6, 3], "x": 6.75, "y": 3}, + {"matrix": [7, 3], "x": 7.75, "y": 3}, + {"matrix": [6, 4], "x": 8.75, "y": 3}, + {"matrix": [7, 4], "x": 9.75, "y": 3}, + {"matrix": [6, 5], "x": 10.75, "y": 3}, + {"matrix": [7, 5], "x": 11.75, "y": 3}, + {"matrix": [6, 7], "x": 12.75, "y": 3, "w": 2.25}, + {"matrix": [7, 7], "x": 15, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 2.25}, + {"matrix": [8, 1], "x": 2.25, "y": 4}, + {"matrix": [9, 1], "x": 3.25, "y": 4}, + {"matrix": [8, 2], "x": 4.25, "y": 4}, + {"matrix": [9, 2], "x": 5.25, "y": 4}, + {"matrix": [8, 3], "x": 6.25, "y": 4}, + {"matrix": [9, 3], "x": 7.25, "y": 4}, + {"matrix": [8, 4], "x": 8.25, "y": 4}, + {"matrix": [9, 4], "x": 9.25, "y": 4}, + {"matrix": [8, 5], "x": 10.25, "y": 4}, + {"matrix": [9, 5], "x": 11.25, "y": 4}, + {"matrix": [9, 6], "x": 12.25, "y": 4, "w": 1.75}, + {"matrix": [8, 7], "x": 14, "y": 4}, + {"matrix": [9, 7], "x": 15, "y": 4}, + + {"matrix": [10, 0], "x": 0, "y": 5, "w": 1.5}, + {"matrix": [10, 1], "x": 2.25, "y": 5, "w": 1.25}, + {"matrix": [10, 3], "x": 3.5, "y": 5, "w": 6.25}, + {"matrix": [10, 5], "x": 9.75, "y": 5, "w": 1.25}, + {"matrix": [11, 5], "x": 11, "y": 5, "w": 1.25}, + + {"matrix": [11, 6], "x": 13, "y": 5}, + {"matrix": [10, 7], "x": 14, "y": 5}, + {"matrix": [11, 7], "x": 15, "y": 5} + ] } } } diff --git a/keyboards/tkc/tkc1800/info.json b/keyboards/tkc/tkc1800/info.json index f9c20e4b4d4c..5cf8f83c8087 100644 --- a/keyboards/tkc/tkc1800/info.json +++ b/keyboards/tkc/tkc1800/info.json @@ -35,113 +35,130 @@ "layouts": { "LAYOUT": { "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": "Insert", "x": 15.5, "y": 0 }, - { "label": "Home", "x": 16.5, "y": 0 }, - { "label": "Page Up", "x": 17.5, "y": 0 }, - { "label": "Print Screen", "x": 18.5, "y": 0 }, - { "label": "Delete", "x": 15.5, "y": 1 }, - { "label": "End", "x": 16.5, "y": 1 }, - { "label": "Page Down", "x": 17.5, "y": 1 }, - { "label": "Scroll Lock", "x": 18.5, "y": 1 }, - { "label": "`", "x": 0, "y": 2 }, - { "label": "1", "x": 1, "y": 2 }, - { "label": "2", "x": 2, "y": 2 }, - { "label": "3", "x": 3, "y": 2 }, - { "label": "4", "x": 4, "y": 2 }, - { "label": "5", "x": 5, "y": 2 }, - { "label": "6", "x": 6, "y": 2 }, - { "label": "7", "x": 7, "y": 2 }, - { "label": "8", "x": 8, "y": 2 }, - { "label": "9", "x": 9, "y": 2 }, - { "label": "0", "x": 10, "y": 2 }, - { "label": "-", "x": 11, "y": 2 }, - { "label": "=", "x": 12, "y": 2 }, - { "label": "Backspace", "x": 13, "y": 2 }, - { "label": "Backspace_Right", "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 Hash", "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 Backslash", "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_Top", "x": 18.5, "y": 5 }, - { "label": "Ctrl", "x": 0, "y": 6, "w": 1.25 }, - { "label": "GUI", "x": 1.25, "y": 6, "w": 1.25 }, - { "label": "Alt", "x": 2.5, "y": 6, "w": 1.25 }, - { "label": "Space", "x": 3.75, "y": 6, "w": 6.25 }, - { "label": "Alt", "x": 10, "y": 6 }, - { "label": "Fn", "x": 11, "y": 6 }, - { "label": "Ctrl", "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, 2], "x": 1.25, "y": 0}, + {"matrix": [0, 3], "x": 2.25, "y": 0}, + {"matrix": [0, 4], "x": 3.25, "y": 0}, + {"matrix": [0, 5], "x": 4.25, "y": 0}, + + {"matrix": [0, 6], "x": 5.5, "y": 0}, + {"matrix": [0, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + + {"matrix": [0, 10], "x": 9.75, "y": 0}, + {"matrix": [0, 11], "x": 10.75, "y": 0}, + {"matrix": [0, 12], "x": 11.75, "y": 0}, + {"matrix": [0, 13], "x": 12.75, "y": 0}, + + {"matrix": [0, 15], "x": 15.5, "y": 0}, + {"matrix": [0, 16], "x": 16.5, "y": 0}, + {"matrix": [0, 17], "x": 17.5, "y": 0}, + {"matrix": [0, 18], "x": 18.5, "y": 0}, + + {"matrix": [1, 15], "x": 15.5, "y": 1}, + {"matrix": [1, 16], "x": 16.5, "y": 1}, + {"matrix": [1, 17], "x": 17.5, "y": 1}, + {"matrix": [1, 18], "x": 18.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2}, + {"matrix": [2, 13], "x": 13, "y": 2}, + {"matrix": [2, 14], "x": 14, "y": 2}, + + {"matrix": [2, 15], "x": 15.5, "y": 2}, + {"matrix": [2, 16], "x": 16.5, "y": 2}, + {"matrix": [2, 17], "x": 17.5, "y": 2}, + {"matrix": [2, 18], "x": 18.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3, "w": 1.5}, + + {"matrix": [3, 15], "x": 15.5, "y": 3}, + {"matrix": [3, 16], "x": 16.5, "y": 3}, + {"matrix": [3, 17], "x": 17.5, "y": 3}, + {"matrix": [3, 18], "x": 18.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4}, + {"matrix": [4, 2], "x": 2.75, "y": 4}, + {"matrix": [4, 3], "x": 3.75, "y": 4}, + {"matrix": [4, 4], "x": 4.75, "y": 4}, + {"matrix": [4, 5], "x": 5.75, "y": 4}, + {"matrix": [4, 6], "x": 6.75, "y": 4}, + {"matrix": [4, 7], "x": 7.75, "y": 4}, + {"matrix": [4, 8], "x": 8.75, "y": 4}, + {"matrix": [4, 9], "x": 9.75, "y": 4}, + {"matrix": [4, 10], "x": 10.75, "y": 4}, + {"matrix": [4, 11], "x": 11.75, "y": 4}, + {"matrix": [4, 12], "x": 12.75, "y": 4}, + {"matrix": [4, 13], "x": 13.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 15.5, "y": 4}, + {"matrix": [4, 16], "x": 16.5, "y": 4}, + {"matrix": [4, 17], "x": 17.5, "y": 4}, + {"matrix": [4, 18], "x": 18.5, "y": 4}, + + {"matrix": [5, 0], "x": 0, "y": 5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5}, + {"matrix": [5, 2], "x": 2.25, "y": 5}, + {"matrix": [5, 3], "x": 3.25, "y": 5}, + {"matrix": [5, 4], "x": 4.25, "y": 5}, + {"matrix": [5, 5], "x": 5.25, "y": 5}, + {"matrix": [5, 6], "x": 6.25, "y": 5}, + {"matrix": [5, 7], "x": 7.25, "y": 5}, + {"matrix": [5, 8], "x": 8.25, "y": 5}, + {"matrix": [5, 9], "x": 9.25, "y": 5}, + {"matrix": [5, 10], "x": 10.25, "y": 5}, + {"matrix": [5, 11], "x": 11.25, "y": 5}, + {"matrix": [5, 12], "x": 12.25, "y": 5, "w": 1.75}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.25}, + + {"matrix": [5, 15], "x": 15.5, "y": 5}, + {"matrix": [5, 16], "x": 16.5, "y": 5}, + {"matrix": [5, 17], "x": 17.5, "y": 5}, + {"matrix": [5, 18], "x": 18.5, "y": 5}, + + {"matrix": [6, 0], "x": 0, "y": 6, "w": 1.25}, + {"matrix": [6, 1], "x": 1.25, "y": 6, "w": 1.25}, + {"matrix": [6, 2], "x": 2.5, "y": 6, "w": 1.25}, + {"matrix": [6, 5], "x": 3.75, "y": 6, "w": 6.25}, + {"matrix": [6, 9], "x": 10, "y": 6}, + {"matrix": [6, 10], "x": 11, "y": 6}, + {"matrix": [6, 11], "x": 12, "y": 6}, + + {"matrix": [6, 12], "x": 13.25, "y": 6.25}, + {"matrix": [6, 13], "x": 14.25, "y": 6.25}, + {"matrix": [6, 14], "x": 15.25, "y": 6.25}, + + {"matrix": [6, 16], "x": 16.5, "y": 6}, + {"matrix": [6, 17], "x": 17.5, "y": 6}, + {"matrix": [6, 18], "x": 18.5, "y": 6} ] } } diff --git a/keyboards/tkc/tkc1800/tkc1800.c b/keyboards/tkc/tkc1800/tkc1800.c index 08e4e0bb3bb2..b5b4cf0887f4 100644 --- a/keyboards/tkc/tkc1800/tkc1800.c +++ b/keyboards/tkc/tkc1800/tkc1800.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "tkc1800.h" +#include "quantum.h" void keyboard_pre_init_kb(void) { setPinInputHigh(D0); diff --git a/keyboards/tkc/tkc1800/tkc1800.h b/keyboards/tkc/tkc1800/tkc1800.h deleted file mode 100644 index 4d1686cf16e0..000000000000 --- a/keyboards/tkc/tkc1800/tkc1800.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2017 Mathias Andersson - * - * 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( \ - K00, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0F, K0G, K0H, K0I, \ - K1F, K1G, K1H, K1I, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, K3H, K3I, \ - K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4F, K4G, K4H, K4I, \ - K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, K5F, K5G, K5H, K5I, \ - K60, K61, K62, K65, K69, K6A, K6B, K6C, K6D, K6E, K6G, K6H, K6I \ -) { \ - { K00, KC_NO, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO, K0F, K0G, K0H, K0I }, \ - { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K1F, K1G, K1H, K1I }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, K2H, K2I }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, KC_NO, K3F, K3G, K3H, K3I }, \ - { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO, K4F, K4G, K4H, K4I }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, K5B, K5C, K5D, KC_NO, K5F, K5G, K5H, K5I }, \ - { K60, K61, K62, KC_NO, KC_NO, K65, KC_NO, KC_NO, KC_NO, K69, K6A, K6B, K6C, K6D, K6E, KC_NO, K6G, K6H, K6I } \ -} diff --git a/keyboards/tkw/grandiceps/grandiceps.h b/keyboards/tkw/grandiceps/grandiceps.h deleted file mode 100644 index ecb92fd39a7d..000000000000 --- a/keyboards/tkw/grandiceps/grandiceps.h +++ /dev/null @@ -1,38 +0,0 @@ -/* Copyright 2020 Thys de Wet - * - * 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( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \ - L40, L41, L42, L43, L44, R41, R42, R43, R44, R45 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { L40, L41, L42, L43, L44, L45 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { R45, R44, R43, R42, R41, R40 } \ - } diff --git a/keyboards/tkw/grandiceps/info.json b/keyboards/tkw/grandiceps/info.json index c6d658e00a89..c5467142a5f3 100644 --- a/keyboards/tkw/grandiceps/info.json +++ b/keyboards/tkw/grandiceps/info.json @@ -35,11 +35,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.5}, {"x":1, "y":0.375}, {"x":2, "y":0.125}, {"x":3, "y":0}, {"x":4, "y":0.125}, {"x":5, "y":0.25}, {"x":10.5, "y":0.25}, {"x":11.5, "y":0.125}, {"x":12.5, "y":0}, {"x":13.5, "y":0.125}, {"x":14.5, "y":0.375}, {"x":15.5, "y":0.5}, - {"x":0, "y":1.5}, {"x":1, "y":1.375}, {"x":2, "y":1.125}, {"x":3, "y":1}, {"x":4, "y":1.125}, {"x":5, "y":1.25}, {"x":10.5, "y":1.25}, {"x":11.5, "y":1.125}, {"x":12.5, "y":1}, {"x":13.5, "y":1.125}, {"x":14.5, "y":1.375}, {"x":15.5, "y":1.5}, - {"x":0, "y":2.5}, {"x":1, "y":2.375}, {"x":2, "y":2.125}, {"x":3, "y":2}, {"x":4, "y":2.125}, {"x":5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.125}, {"x":12.5, "y":2}, {"x":13.5, "y":2.125}, {"x":14.5, "y":2.375}, {"x":15.5, "y":2.5}, - {"x":0, "y":3.5}, {"x":1, "y":3.375}, {"x":2, "y":3.125}, {"x":3, "y":3}, {"x":4, "y":3.125}, {"x":5, "y":3.25}, {"x":6, "y":2.75}, {"x":9.5, "y":2.75}, {"x":10.5, "y":3.25}, {"x":11.5, "y":3.125}, {"x":12.5, "y":3}, {"x":13.5, "y":3.125}, {"x":14.5, "y":3.375}, {"x":15.5, "y":3.5}, - {"x":1, "y":4.375}, {"x":2, "y":4.125}, {"x":3, "y":4.15}, {"x":4.5, "y":4.25}, {"x":6, "y":4.25, "h":1.5}, {"x":9.5, "y":4.25, "h":1.5}, {"x":11, "y":4.25}, {"x":12.5, "y":4.15}, {"x":13.5, "y":4.125}, {"x":14.5, "y":4.375} + {"matrix": [0, 0], "x": 0, "y": 0.5}, + {"matrix": [0, 1], "x": 1, "y": 0.375}, + {"matrix": [0, 2], "x": 2, "y": 0.125}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.125}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + + {"matrix": [5, 5], "x": 10.5, "y": 0.25}, + {"matrix": [5, 4], "x": 11.5, "y": 0.125}, + {"matrix": [5, 3], "x": 12.5, "y": 0}, + {"matrix": [5, 2], "x": 13.5, "y": 0.125}, + {"matrix": [5, 1], "x": 14.5, "y": 0.375}, + {"matrix": [5, 0], "x": 15.5, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.375}, + {"matrix": [1, 2], "x": 2, "y": 1.125}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.125}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + + {"matrix": [6, 5], "x": 10.5, "y": 1.25}, + {"matrix": [6, 4], "x": 11.5, "y": 1.125}, + {"matrix": [6, 3], "x": 12.5, "y": 1}, + {"matrix": [6, 2], "x": 13.5, "y": 1.125}, + {"matrix": [6, 1], "x": 14.5, "y": 1.375}, + {"matrix": [6, 0], "x": 15.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.375}, + {"matrix": [2, 2], "x": 2, "y": 2.125}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.125}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + + {"matrix": [7, 5], "x": 10.5, "y": 2.25}, + {"matrix": [7, 4], "x": 11.5, "y": 2.125}, + {"matrix": [7, 3], "x": 12.5, "y": 2}, + {"matrix": [7, 2], "x": 13.5, "y": 2.125}, + {"matrix": [7, 1], "x": 14.5, "y": 2.375}, + {"matrix": [7, 0], "x": 15.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.375}, + {"matrix": [3, 2], "x": 2, "y": 3.125}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.125}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [4, 5], "x": 6, "y": 2.75}, + + {"matrix": [9, 5], "x": 9.5, "y": 2.75}, + {"matrix": [8, 5], "x": 10.5, "y": 3.25}, + {"matrix": [8, 4], "x": 11.5, "y": 3.125}, + {"matrix": [8, 3], "x": 12.5, "y": 3}, + {"matrix": [8, 2], "x": 13.5, "y": 3.125}, + {"matrix": [8, 1], "x": 14.5, "y": 3.375}, + {"matrix": [8, 0], "x": 15.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 1, "y": 4.375}, + {"matrix": [4, 1], "x": 2, "y": 4.125}, + {"matrix": [4, 2], "x": 3, "y": 4.15}, + {"matrix": [4, 3], "x": 4.5, "y": 4.25}, + {"matrix": [4, 4], "x": 6, "y": 4.25, "h": 1.5}, + + {"matrix": [9, 4], "x": 9.5, "y": 4.25, "h": 1.5}, + {"matrix": [9, 3], "x": 11, "y": 4.25}, + {"matrix": [9, 2], "x": 12.5, "y": 4.15}, + {"matrix": [9, 1], "x": 13.5, "y": 4.125}, + {"matrix": [9, 0], "x": 14.5, "y": 4.375} ] } } diff --git a/keyboards/toffee_studio/blueberry/blueberry.h b/keyboards/toffee_studio/blueberry/blueberry.h deleted file mode 100644 index b83481dca967..000000000000 --- a/keyboards/toffee_studio/blueberry/blueberry.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Copyright 2023 Toffee Studio - * - * 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( \ - K00, K10, K05, K15, K04, K14, K03, K13, K02, K12, K01, K11, K06, K16, K07, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K47, \ - K70, K60, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67, \ - K80, K81, K82, K83, K84, K85, K86, K56, K77 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07 },\ - { K10, K11, K12, K13, K14, K15, K16, KC_NO },\ - { K20, K21, K22, K23, K24, K25, K26, K27 },\ - { K30, K31, K32, K33, K34, K35, K36, KC_NO },\ - { K40, K41, K42, K43, K44, K45, K46, K47 },\ - { K50, K51, K52, K53, K54, K55, K56, KC_NO },\ - { K60, K61, K62, K63, K64, K65, K66, K67 },\ - { K70, K71, K72, K73, K74, K75, K76, K77 },\ - { K80, K81, K82, K83, K84, K85, K86, KC_NO } \ -} diff --git a/keyboards/toffee_studio/blueberry/info.json b/keyboards/toffee_studio/blueberry/info.json index fb1fb56aadd6..d5870c8f02cf 100644 --- a/keyboards/toffee_studio/blueberry/info.json +++ b/keyboards/toffee_studio/blueberry/info.json @@ -21,358 +21,79 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "0,0", - "x": 0, - "y": 0 - }, - { - "label": "1,0", - "x": 1, - "y": 0 - }, - { - "label": "0,5", - "x": 2, - "y": 0 - }, - { - "label": "1,5", - "x": 3, - "y": 0 - }, - { - "label": "0,4", - "x": 4, - "y": 0 - }, - { - "label": "1,4", - "x": 5, - "y": 0 - }, - { - "label": "0,3", - "x": 6, - "y": 0 - }, - { - "label": "1,3", - "x": 7, - "y": 0 - }, - { - "label": "0,2", - "x": 8, - "y": 0 - }, - { - "label": "1,2", - "x": 9, - "y": 0 - }, - { - "label": "0,1", - "x": 10, - "y": 0 - }, - { - "label": "1,1", - "x": 11, - "y": 0 - }, - { - "label": "0,6", - "x": 12, - "y": 0 - }, - { - "label": "0,7", - "x": 13, - "y": 0 - }, - { - "label": "1,6", - "x": 14, - "y": 0 - }, - { - "label": "2,0", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "3,0", - "x": 1.5, - "y": 1 - }, - { - "label": "2,1", - "x": 2.5, - "y": 1 - }, - { - "label": "3,1", - "x": 3.5, - "y": 1 - }, - { - "label": "2,2", - "x": 4.5, - "y": 1 - }, - { - "label": "3,2", - "x": 5.5, - "y": 1 - }, - { - "label": "2,3", - "x": 6.5, - "y": 1 - }, - { - "label": "3,3", - "x": 7.5, - "y": 1 - }, - { - "label": "2,4", - "x": 8.5, - "y": 1 - }, - { - "label": "3,4", - "x": 9.5, - "y": 1 - }, - { - "label": "2,5", - "x": 10.5, - "y": 1 - }, - { - "label": "3,5", - "x": 11.5, - "y": 1 - }, - { - "label": "2,6", - "x": 12.5, - "y": 1 - }, - { - "label": "3,6", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "2,7", - "x": 15, - "y": 1 - }, - { - "label": "4,0", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "5,0", - "x": 1.75, - "y": 2 - }, - { - "label": "4,1", - "x": 2.75, - "y": 2 - }, - { - "label": "5,1", - "x": 3.75, - "y": 2 - }, - { - "label": "4,2", - "x": 4.75, - "y": 2 - }, - { - "label": "5,2", - "x": 5.75, - "y": 2 - }, - { - "label": "4,3", - "x": 6.75, - "y": 2 - }, - { - "label": "5,3", - "x": 7.75, - "y": 2 - }, - { - "label": "4,4", - "x": 8.75, - "y": 2 - }, - { - "label": "5,4", - "x": 9.75, - "y": 2 - }, - { - "label": "4,5", - "x": 10.75, - "y": 2 - }, - { - "label": "5,5", - "x": 11.75, - "y": 2 - }, - { - "label": "4,6", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "4,7", - "x": 15, - "y": 2 - }, - { - "label": "7,0", - "x": 0, - "y": 3, - "w": 1.25 - }, - { - "label": "6,0", - "x": 1.25, - "y": 3 - }, - { - "label": "6,1", - "x": 2.25, - "y": 3 - }, - { - "label": "7,1", - "x": 3.25, - "y": 3 - }, - { - "label": "6,2", - "x": 4.25, - "y": 3 - }, - { - "label": "7,2", - "x": 5.25, - "y": 3 - }, - { - "label": "6,3", - "x": 6.25, - "y": 3 - }, - { - "label": "7,3", - "x": 7.25, - "y": 3 - }, - { - "label": "6,4", - "x": 8.25, - "y": 3 - }, - { - "label": "7,4", - "x": 9.25, - "y": 3 - }, - { - "label": "6,5", - "x": 10.25, - "y": 3 - }, - { - "label": "7,5", - "x": 11.25, - "y": 3 - }, - { - "label": "6,6", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "7,6", - "x": 14, - "y": 3 - }, - { - "label": "6,7", - "x": 15, - "y": 3 - }, - { - "label": "8,0", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "8,1", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "8,2", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "label": "8,3", - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "8,4", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "8,5", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "8,6", - "x": 13, - "y": 4 - }, - { - "label": "5,6", - "x": 14, - "y": 4 - }, - { - "label": "7,7", - "x": 15, - "y": 4 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 5], "x": 2, "y": 0}, + {"matrix": [1, 5], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [1, 4], "x": 5, "y": 0}, + {"matrix": [0, 3], "x": 6, "y": 0}, + {"matrix": [1, 3], "x": 7, "y": 0}, + {"matrix": [0, 2], "x": 8, "y": 0}, + {"matrix": [1, 2], "x": 9, "y": 0}, + {"matrix": [0, 1], "x": 10, "y": 0}, + {"matrix": [1, 1], "x": 11, "y": 0}, + {"matrix": [0, 6], "x": 12, "y": 0}, + {"matrix": [1, 6], "x": 13, "y": 0}, + {"matrix": [0, 7], "x": 14, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [3, 0], "x": 1.5, "y": 1}, + {"matrix": [2, 1], "x": 2.5, "y": 1}, + {"matrix": [3, 1], "x": 3.5, "y": 1}, + {"matrix": [2, 2], "x": 4.5, "y": 1}, + {"matrix": [3, 2], "x": 5.5, "y": 1}, + {"matrix": [2, 3], "x": 6.5, "y": 1}, + {"matrix": [3, 3], "x": 7.5, "y": 1}, + {"matrix": [2, 4], "x": 8.5, "y": 1}, + {"matrix": [3, 4], "x": 9.5, "y": 1}, + {"matrix": [2, 5], "x": 10.5, "y": 1}, + {"matrix": [3, 5], "x": 11.5, "y": 1}, + {"matrix": [2, 6], "x": 12.5, "y": 1}, + {"matrix": [3, 6], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [2, 7], "x": 15, "y": 1}, + + {"matrix": [4, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [5, 0], "x": 1.75, "y": 2}, + {"matrix": [4, 1], "x": 2.75, "y": 2}, + {"matrix": [5, 1], "x": 3.75, "y": 2}, + {"matrix": [4, 2], "x": 4.75, "y": 2}, + {"matrix": [5, 2], "x": 5.75, "y": 2}, + {"matrix": [4, 3], "x": 6.75, "y": 2}, + {"matrix": [5, 3], "x": 7.75, "y": 2}, + {"matrix": [4, 4], "x": 8.75, "y": 2}, + {"matrix": [5, 4], "x": 9.75, "y": 2}, + {"matrix": [4, 5], "x": 10.75, "y": 2}, + {"matrix": [5, 5], "x": 11.75, "y": 2}, + {"matrix": [4, 6], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [4, 7], "x": 15, "y": 2}, + + {"matrix": [7, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [6, 0], "x": 1.25, "y": 3}, + {"matrix": [6, 1], "x": 2.25, "y": 3}, + {"matrix": [7, 1], "x": 3.25, "y": 3}, + {"matrix": [6, 2], "x": 4.25, "y": 3}, + {"matrix": [7, 2], "x": 5.25, "y": 3}, + {"matrix": [6, 3], "x": 6.25, "y": 3}, + {"matrix": [7, 3], "x": 7.25, "y": 3}, + {"matrix": [6, 4], "x": 8.25, "y": 3}, + {"matrix": [7, 4], "x": 9.25, "y": 3}, + {"matrix": [6, 5], "x": 10.25, "y": 3}, + {"matrix": [7, 5], "x": 11.25, "y": 3}, + {"matrix": [6, 6], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [7, 6], "x": 14, "y": 3}, + {"matrix": [6, 7], "x": 15, "y": 3}, + + {"matrix": [8, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [8, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [8, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [8, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [8, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [8, 5], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [8, 6], "x": 13, "y": 4}, + {"matrix": [5, 6], "x": 14, "y": 4}, + {"matrix": [7, 7], "x": 15, "y": 4} ] } } diff --git a/keyboards/tominabox1/adalyn/adalyn.h b/keyboards/tominabox1/adalyn/adalyn.h deleted file mode 100644 index d9c1c6850494..000000000000 --- a/keyboards/tominabox1/adalyn/adalyn.h +++ /dev/null @@ -1,33 +0,0 @@ - /* Copyright TJ Campie - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K33, K36, K37, K39 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ -} diff --git a/keyboards/tominabox1/adalyn/info.json b/keyboards/tominabox1/adalyn/info.json index e6129d081bc0..ae66ef50fdb3 100644 --- a/keyboards/tominabox1/adalyn/info.json +++ b/keyboards/tominabox1/adalyn/info.json @@ -17,7 +17,51 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0, "w":1.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "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":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":10.75, "y":3}] + "layout": [ + {"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": 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": 10.5, "y": 0, "w": 1.25}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + + {"matrix": [1, 5], "x": 6.75, "y": 1}, + {"matrix": [1, 6], "x": 7.75, "y": 1}, + {"matrix": [1, 7], "x": 8.75, "y": 1}, + {"matrix": [1, 8], "x": 9.75, "y": 1}, + {"matrix": [1, 9], "x": 10.75, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + + {"matrix": [2, 5], "x": 6.25, "y": 2}, + {"matrix": [2, 6], "x": 7.25, "y": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 2.25}, + + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 10.75, "y": 3} + ] } -} + } } diff --git a/keyboards/tominabox1/le_chiffre/he/he.c b/keyboards/tominabox1/le_chiffre/he/he.c index 0e07cc711187..6ee82149536b 100644 --- a/keyboards/tominabox1/le_chiffre/he/he.c +++ b/keyboards/tominabox1/le_chiffre/he/he.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "he.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/tominabox1/le_chiffre/he/he.h b/keyboards/tominabox1/le_chiffre/he/he.h deleted file mode 100644 index fc14242dd94f..000000000000 --- a/keyboards/tominabox1/le_chiffre/he/he.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 tominabox1 - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K38, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K32, K34, K35, K37 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { XXX, XXX, K32, XXX, K34, K35, XXX, K37, K38, XXX } \ -} diff --git a/keyboards/tominabox1/le_chiffre/he/info.json b/keyboards/tominabox1/le_chiffre/he/info.json index 209bafb76c48..bab0d5242c55 100644 --- a/keyboards/tominabox1/le_chiffre/he/info.json +++ b/keyboards/tominabox1/le_chiffre/he/info.json @@ -19,5 +19,52 @@ "driver": "WS2812" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [3, 8], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "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": [3, 2], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2}, + + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/tominabox1/le_chiffre/info.json b/keyboards/tominabox1/le_chiffre/info.json index fb8ce09dff3b..25f19145a921 100644 --- a/keyboards/tominabox1/le_chiffre/info.json +++ b/keyboards/tominabox1/le_chiffre/info.json @@ -6,13 +6,5 @@ "usb": { "vid": "0x7431", "pid": "0xD645" - }, - "layouts": { - "LAYOUT": { - "layout": [{"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0}, {"label":"Rotary", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, - {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, - {"label":";", "x":10, "y":1}, {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"B", "x":4, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, - {"label":"", "x":1.75, "y":3, "w":1.25}, {"label":"", "x":3, "y":3, "w":2}, {"label":"", "x":6, "y":3, "w":2}, {"label":"", "x":8, "y":3, "w":1.25}] - } } } diff --git a/keyboards/tominabox1/le_chiffre/rev1/info.json b/keyboards/tominabox1/le_chiffre/rev1/info.json index 963a25b41087..5222f4ea5147 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/info.json +++ b/keyboards/tominabox1/le_chiffre/rev1/info.json @@ -19,5 +19,52 @@ "driver": "WS2812" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [3, 8], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "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": [3, 2], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2}, + + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/tominabox1/le_chiffre/rev1/rev1.c b/keyboards/tominabox1/le_chiffre/rev1/rev1.c index e3b2b014f45d..66b0eb2f0858 100644 --- a/keyboards/tominabox1/le_chiffre/rev1/rev1.c +++ b/keyboards/tominabox1/le_chiffre/rev1/rev1.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rev1.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/tominabox1/le_chiffre/rev1/rev1.h b/keyboards/tominabox1/le_chiffre/rev1/rev1.h deleted file mode 100644 index 0277e1b42d25..000000000000 --- a/keyboards/tominabox1/le_chiffre/rev1/rev1.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K38, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K32, K34, K35, K37 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { XXX, XXX, K32, XXX, K34, K35, XXX, K37, K38, XXX } \ -} diff --git a/keyboards/tominabox1/le_chiffre/rev2/info.json b/keyboards/tominabox1/le_chiffre/rev2/info.json index ac09c6d8793d..f6773fb9bdfe 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/info.json +++ b/keyboards/tominabox1/le_chiffre/rev2/info.json @@ -19,5 +19,52 @@ "driver": "WS2812" }, "processor": "atmega32u4", - "bootloader": "atmel-dfu" + "bootloader": "atmel-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"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": [3, 8], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8, "y": 0}, + {"matrix": [0, 8], "x": 9, "y": 0}, + {"matrix": [0, 9], "x": 10, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + + {"matrix": [1, 5], "x": 6, "y": 1}, + {"matrix": [1, 6], "x": 7, "y": 1}, + {"matrix": [1, 7], "x": 8, "y": 1}, + {"matrix": [1, 8], "x": 9, "y": 1}, + {"matrix": [1, 9], "x": 10, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "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": [3, 2], "x": 1.75, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3, "y": 3, "w": 2}, + + {"matrix": [3, 5], "x": 6, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.25} + ] + } + } } diff --git a/keyboards/tominabox1/le_chiffre/rev2/rev2.c b/keyboards/tominabox1/le_chiffre/rev2/rev2.c index e15aa3524357..66b0eb2f0858 100644 --- a/keyboards/tominabox1/le_chiffre/rev2/rev2.c +++ b/keyboards/tominabox1/le_chiffre/rev2/rev2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "rev2.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE led_config_t g_led_config = { { diff --git a/keyboards/tominabox1/le_chiffre/rev2/rev2.h b/keyboards/tominabox1/le_chiffre/rev2/rev2.h deleted file mode 100644 index 0277e1b42d25..000000000000 --- a/keyboards/tominabox1/le_chiffre/rev2/rev2.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 tominabox1 - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K38, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K32, K34, K35, K37 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { XXX, XXX, K32, XXX, K34, K35, XXX, K37, K38, XXX } \ -} diff --git a/keyboards/tronguylabs/m122_3270/info.json b/keyboards/tronguylabs/m122_3270/info.json index 23dc5366ed97..2dae824cc4f7 100644 --- a/keyboards/tronguylabs/m122_3270/info.json +++ b/keyboards/tronguylabs/m122_3270/info.json @@ -10,151 +10,149 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 3.25, "y": 0}, - {"x": 4.25, "y": 0}, - {"x": 5.25, "y": 0}, - {"x": 6.25, "y": 0}, - {"x": 7.25, "y": 0}, - {"x": 8.25, "y": 0}, - {"x": 9.25, "y": 0}, - {"x": 10.25, "y": 0}, - {"x": 11.25, "y": 0}, - {"x": 12.25, "y": 0}, - {"x": 13.25, "y": 0}, - {"x": 14.25, "y": 0}, - - {"x": 3.25, "y": 1}, - {"x": 4.25, "y": 1}, - {"x": 5.25, "y": 1}, - {"x": 6.25, "y": 1}, - {"x": 7.25, "y": 1}, - {"x": 8.25, "y": 1}, - {"x": 9.25, "y": 1}, - {"x": 10.25, "y": 1}, - {"x": 11.25, "y": 1}, - {"x": 12.25, "y": 1}, - {"x": 13.25, "y": 1}, - {"x": 14.25, "y": 1}, - - {"x": 0, "y": 3}, - {"x": 1, "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}, - {"x": 13.25, "y": 3}, - {"x": 14.25, "y": 3}, - {"x": 15.25, "y": 3, "w": 2}, - - {"x": 17.5, "y": 3}, - {"x": 18.5, "y": 3}, - {"x": 19.5, "y": 3}, - - {"x": 20.75, "y": 3}, - {"x": 21.75, "y": 3}, - {"x": 22.75, "y": 3}, - {"x": 23.75, "y": 3}, - - {"x": 0, "y": 4}, - {"x": 1, "y": 4}, - - {"x": 2.25, "y": 4, "w": 1.5}, - {"x": 3.75, "y": 4}, - {"x": 4.75, "y": 4}, - {"x": 5.75, "y": 4}, - {"x": 6.75, "y": 4}, - {"x": 7.75, "y": 4}, - {"x": 8.75, "y": 4}, - {"x": 9.75, "y": 4}, - {"x": 10.75, "y": 4}, - {"x": 11.75, "y": 4}, - {"x": 12.75, "y": 4}, - {"x": 13.75, "y": 4}, - {"x": 14.75, "y": 4}, - {"x": 16, "y": 4, "w": 1.25, "h": 2}, - - {"x": 17.5, "y": 4}, - {"x": 18.5, "y": 4}, - {"x": 19.5, "y": 4}, - - {"x": 20.75, "y": 4}, - {"x": 21.75, "y": 4}, - {"x": 22.75, "y": 4}, - {"x": 23.75, "y": 4}, - - {"x": 0, "y": 5}, - {"x": 1, "y": 5}, - - {"x": 2.25, "y": 5, "w": 1.75}, - {"x": 4, "y": 5}, - {"x": 5, "y": 5}, - {"x": 6, "y": 5}, - {"x": 7, "y": 5}, - {"x": 8, "y": 5}, - {"x": 9, "y": 5}, - {"x": 10, "y": 5}, - {"x": 11, "y": 5}, - {"x": 12, "y": 5}, - {"x": 13, "y": 5}, - {"x": 14, "y": 5}, - {"x": 15, "y": 5}, - - {"x": 18.5, "y": 5}, - - {"x": 20.75, "y": 5}, - {"x": 21.75, "y": 5}, - {"x": 22.75, "y": 5}, - {"x": 23.75, "y": 5}, - - {"x": 0, "y": 6}, - {"x": 1, "y": 6}, - - {"x": 2.25, "y": 6, "w": 1.25}, - {"x": 3.5, "y": 6}, - {"x": 4.5, "y": 6}, - {"x": 5.5, "y": 6}, - {"x": 6.5, "y": 6}, - {"x": 7.5, "y": 6}, - {"x": 8.5, "y": 6}, - {"x": 9.5, "y": 6}, - {"x": 10.5, "y": 6}, - {"x": 11.5, "y": 6}, - {"x": 12.5, "y": 6}, - {"x": 13.5, "y": 6}, - {"x": 14.5, "y": 6, "w": 2.75}, - - {"x": 17.5, "y": 6}, - {"x": 18.5, "y": 6}, - {"x": 19.5, "y": 6}, - - {"x": 20.75, "y": 6}, - {"x": 21.75, "y": 6}, - {"x": 22.75, "y": 6}, - {"x": 23.75, "y": 6, "h": 2}, - - {"x": 0, "y": 7}, - {"x": 1, "y": 7}, - - {"x": 2.25, "y": 7, "w": 1.5}, - - {"x": 4.75, "y": 7, "w": 1.5}, - {"x": 6.25, "y": 7, "w": 7}, - {"x": 13.25, "y": 7, "w": 1.5}, - - {"x": 15.75, "y": 7, "w": 1.5}, - - {"x": 18.5, "y": 7}, - - {"x": 20.75, "y": 7, "w": 2}, - {"x": 22.75, "y": 7} + {"matrix": [0, 9], "x": 3.25, "y": 0}, + {"matrix": [1, 9], "x": 4.25, "y": 0}, + {"matrix": [1, 10], "x": 5.25, "y": 0}, + {"matrix": [2, 9], "x": 6.25, "y": 0}, + {"matrix": [3, 9], "x": 7.25, "y": 0}, + {"matrix": [3, 10], "x": 8.25, "y": 0}, + {"matrix": [4, 9], "x": 9.25, "y": 0}, + {"matrix": [5, 9], "x": 10.25, "y": 0}, + {"matrix": [5, 10], "x": 11.25, "y": 0}, + {"matrix": [6, 9], "x": 12.25, "y": 0}, + {"matrix": [7, 9], "x": 13.25, "y": 0}, + {"matrix": [7, 10], "x": 14.25, "y": 0}, + + {"matrix": [0, 10], "x": 3.25, "y": 1}, + {"matrix": [0, 11], "x": 4.25, "y": 1}, + {"matrix": [1, 11], "x": 5.25, "y": 1}, + {"matrix": [2, 10], "x": 6.25, "y": 1}, + {"matrix": [2, 11], "x": 7.25, "y": 1}, + {"matrix": [3, 11], "x": 8.25, "y": 1}, + {"matrix": [4, 10], "x": 9.25, "y": 1}, + {"matrix": [4, 11], "x": 10.25, "y": 1}, + {"matrix": [5, 11], "x": 11.25, "y": 1}, + {"matrix": [6, 10], "x": 12.25, "y": 1}, + {"matrix": [6, 11], "x": 13.25, "y": 1}, + {"matrix": [7, 11], "x": 14.25, "y": 1}, + + {"matrix": [3, 1], "x": 0, "y": 3}, + {"matrix": [3, 2], "x": 1, "y": 3}, + + {"matrix": [3, 4], "x": 2.25, "y": 3}, + {"matrix": [2, 4], "x": 3.25, "y": 3}, + {"matrix": [2, 5], "x": 4.25, "y": 3}, + {"matrix": [2, 6], "x": 5.25, "y": 3}, + {"matrix": [2, 7], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [2, 8], "x": 9.25, "y": 3}, + {"matrix": [2, 12], "x": 10.25, "y": 3}, + {"matrix": [2, 13], "x": 11.25, "y": 3}, + {"matrix": [2, 14], "x": 12.25, "y": 3}, + {"matrix": [3, 14], "x": 13.25, "y": 3}, + {"matrix": [3, 12], "x": 14.25, "y": 3}, + {"matrix": [3, 15], "x": 15.25, "y": 3, "w": 2}, + + {"matrix": [3, 16], "x": 17.5, "y": 3}, + {"matrix": [3, 17], "x": 18.5, "y": 3}, + {"matrix": [2, 16], "x": 19.5, "y": 3}, + + {"matrix": [2, 15], "x": 20.75, "y": 3}, + {"matrix": [2, 17], "x": 21.75, "y": 3}, + {"matrix": [2, 18], "x": 22.75, "y": 3}, + {"matrix": [2, 0], "x": 23.75, "y": 3}, + + {"matrix": [2, 1], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 3.75, "y": 4}, + {"matrix": [4, 5], "x": 4.75, "y": 4}, + {"matrix": [4, 6], "x": 5.75, "y": 4}, + {"matrix": [4, 7], "x": 6.75, "y": 4}, + {"matrix": [5, 7], "x": 7.75, "y": 4}, + {"matrix": [5, 8], "x": 8.75, "y": 4}, + {"matrix": [4, 8], "x": 9.75, "y": 4}, + {"matrix": [4, 12], "x": 10.75, "y": 4}, + {"matrix": [4, 13], "x": 11.75, "y": 4}, + {"matrix": [4, 14], "x": 12.75, "y": 4}, + {"matrix": [5, 14], "x": 13.75, "y": 4}, + {"matrix": [5, 12], "x": 14.75, "y": 4}, + {"matrix": [6, 15], "x": 16, "y": 4, "w": 1.25, "h": 2}, + + {"matrix": [1, 16], "x": 17.5, "y": 4}, + {"matrix": [5, 16], "x": 18.5, "y": 4}, + {"matrix": [4, 16], "x": 19.5, "y": 4}, + + {"matrix": [4, 15], "x": 20.75, "y": 4}, + {"matrix": [4, 17], "x": 21.75, "y": 4}, + {"matrix": [4, 18], "x": 22.75, "y": 4}, + {"matrix": [4, 0], "x": 23.75, "y": 4}, + + {"matrix": [5, 1], "x": 0, "y": 5}, + {"matrix": [5, 2], "x": 1, "y": 5}, + + {"matrix": [6, 2], "x": 2.25, "y": 5, "w": 1.75}, + {"matrix": [1, 4], "x": 4, "y": 5}, + {"matrix": [1, 5], "x": 5, "y": 5}, + {"matrix": [1, 6], "x": 6, "y": 5}, + {"matrix": [1, 7], "x": 7, "y": 5}, + {"matrix": [0, 7], "x": 8, "y": 5}, + {"matrix": [0, 8], "x": 9, "y": 5}, + {"matrix": [1, 8], "x": 10, "y": 5}, + {"matrix": [1, 12], "x": 11, "y": 5}, + {"matrix": [1, 13], "x": 12, "y": 5}, + {"matrix": [1, 14], "x": 13, "y": 5}, + {"matrix": [0, 14], "x": 14, "y": 5}, + {"matrix": [6, 14], "x": 15, "y": 5}, + + {"matrix": [0, 16], "x": 18.5, "y": 5}, + + {"matrix": [1, 15], "x": 20.75, "y": 5}, + {"matrix": [1, 17], "x": 21.75, "y": 5}, + {"matrix": [1, 18], "x": 22.75, "y": 5}, + {"matrix": [1, 0], "x": 23.75, "y": 5}, + + {"matrix": [1, 1], "x": 0, "y": 6}, + {"matrix": [1, 2], "x": 1, "y": 6}, + + {"matrix": [7, 3], "x": 2.25, "y": 6, "w": 1.25}, + {"matrix": [7, 4], "x": 3.5, "y": 6}, + {"matrix": [6, 4], "x": 4.5, "y": 6}, + {"matrix": [6, 5], "x": 5.5, "y": 6}, + {"matrix": [6, 6], "x": 6.5, "y": 6}, + {"matrix": [6, 7], "x": 7.5, "y": 6}, + {"matrix": [7, 7], "x": 8.5, "y": 6}, + {"matrix": [7, 8], "x": 9.5, "y": 6}, + {"matrix": [6, 8], "x": 10.5, "y": 6}, + {"matrix": [6, 12], "x": 11.5, "y": 6}, + {"matrix": [6, 13], "x": 12.5, "y": 6}, + {"matrix": [7, 14], "x": 13.5, "y": 6}, + {"matrix": [6, 3], "x": 14.5, "y": 6, "w": 2.75}, + + {"matrix": [6, 0], "x": 17.5, "y": 6}, + {"matrix": [0, 19], "x": 18.5, "y": 6}, + {"matrix": [1, 19], "x": 19.5, "y": 6}, + + {"matrix": [6, 1], "x": 20.75, "y": 6}, + {"matrix": [6, 17], "x": 21.75, "y": 6}, + {"matrix": [6, 18], "x": 22.75, "y": 6}, + {"matrix": [7, 19], "x": 23.75, "y": 6, "h": 2}, + + {"matrix": [0, 2], "x": 0, "y": 7}, + {"matrix": [0, 1], "x": 1, "y": 7}, + + {"matrix": [0, 0], "x": 2.25, "y": 7, "w": 1.5}, + {"matrix": [7, 0], "x": 4.75, "y": 7, "w": 1.5}, + {"matrix": [7, 1], "x": 6.25, "y": 7, "w": 7}, + {"matrix": [0, 3], "x": 13.25, "y": 7, "w": 1.5}, + {"matrix": [7, 2], "x": 15.75, "y": 7, "w": 1.5}, + + {"matrix": [0, 15], "x": 18.5, "y": 7}, + + {"matrix": [7, 17], "x": 20.75, "y": 7, "w": 2}, + {"matrix": [7, 18], "x": 22.75, "y": 7} ] } } diff --git a/keyboards/tronguylabs/m122_3270/m122_3270.h b/keyboards/tronguylabs/m122_3270/m122_3270.h deleted file mode 100644 index c18020ebcd29..000000000000 --- a/keyboards/tronguylabs/m122_3270/m122_3270.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2021 James R. Maynard III - * - * 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 XXX KC_NO - -#define LAYOUT( \ - k09, k19, k1A, k29, k39, k3A, k49, k59, k5A, k69, k79, k7A, \ - k0A, k0B, k1B, k2A, k2B, k3B, k4A, k4B, k5B, k6A, k6B, k7B, \ - k31, k32, k34, k24, k25, k26, k27, k37, k38, k28, k2C, k2D, k2E, k3E, k3C, k3F, k3G, k3H, k2G, k2F, k2H, k2I, k20, \ - k21, k41, k42, k44, k45, k46, k47, k57, k58, k48, k4C, k4D, k4E, k5E, k5C, k6F, k1G, k5G, k4G, k4F, k4H, k4I, k40, \ - k51, k52, k62, k14, k15, k16, k17, k07, k08, k18, k1C, k1D, k1E, k0E, k6E, k0G, k1F, k1H, k1I, k10, \ - k11, k12, k73, k74, k64, k65, k66, k67, k77, k78, k68, k6C, k6D, k7E, k63, k60, k0J, k1J, k61, k6H, k6I, k7J, \ - k02, k01, k00, k70, k71, k03, k72, k0F, k7H, k7I \ -) { \ - { k00, k01, k02, k03, XXX, XXX, XXX, k07, k08, k09, k0A, k0B, XXX, XXX, k0E, k0F, k0G, XXX, XXX, k0J }, \ - { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, k1H, k1I, k1J }, \ - { k20, k21, XXX, XXX, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G, k2H, k2I, XXX }, \ - { XXX, k31, k32, XXX, k34, XXX, XXX, k37, k38, k39, k3A, k3B, k3C, XXX, k3E, k3F, k3G, k3H, XXX, XXX }, \ - { k40, k41, k42, XXX, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G, k4H, k4I, XXX }, \ - { XXX, k51, k52, XXX, XXX, XXX, XXX, k57, k58, k59, k5A, k5B, k5C, XXX, k5E, XXX, k5G, XXX, XXX, XXX }, \ - { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A, k6B, k6C, k6D, k6E, k6F, XXX, k6H, k6I, XXX }, \ - { k70, k71, k72, k73, k74, XXX, XXX, k77, k78, k79, k7A, k7B, XXX, XXX, k7E, XXX, XXX, k7H, k7I, k7J } \ -} diff --git a/keyboards/tszaboo/ortho4exent/info.json b/keyboards/tszaboo/ortho4exent/info.json index 5bd5baef9d10..b0789d268379 100644 --- a/keyboards/tszaboo/ortho4exent/info.json +++ b/keyboards/tszaboo/ortho4exent/info.json @@ -24,79 +24,82 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00","x":0,"y":0,"w":1.5}, - {"label":"k01","x":1.5,"y":0}, - {"label":"k02","x":2.5,"y":0}, - {"label":"k03","x":3.5,"y":0}, - {"label":"k04","x":4.5,"y":0}, - {"label":"k05","x":5.5,"y":0}, - {"label":"k06","x":6.5,"y":0}, - {"label":"k07","x":7.5,"y":0}, - {"label":"k08","x":8.5,"y":0}, - {"label":"k09","x":9.5,"y":0}, - {"label":"k0A","x":10.5,"y":0}, - {"label":"k0B","x":11.5,"y":0}, - {"label":"k0C","x":12.5,"y":0}, - {"label":"k0D","x":13.5,"y":0}, - {"label":"k0E","x":14.5,"y":0,"w":1.5}, - {"label":"k10","x":0,"y":1,"w":1.5}, - {"label":"k11","x":1.5,"y":1}, - {"label":"k12","x":2.5,"y":1}, - {"label":"k13","x":3.5,"y":1}, - {"label":"k14","x":4.5,"y":1}, - {"label":"k15","x":5.5,"y":1}, - {"label":"k16","x":6.5,"y":1}, - {"label":"k17","x":7.5,"y":1}, - {"label":"k18","x":8.5,"y":1}, - {"label":"k19","x":9.5,"y":1}, - {"label":"k1A","x":10.5,"y":1}, - {"label":"k1B","x":11.5,"y":1}, - {"label":"k1C","x":12.5,"y":1}, - {"label":"k1D","x":13.5,"y":1}, - {"label":"k1E","x":14.5,"y":1,"w":1.5}, - {"label":"k20","x":0,"y":2,"w":1.5}, - {"label":"k21","x":1.5,"y":2}, - {"label":"k22","x":2.5,"y":2}, - {"label":"k23","x":3.5,"y":2}, - {"label":"k24","x":4.5,"y":2}, - {"label":"k25","x":5.5,"y":2}, - {"label":"k26","x":6.5,"y":2}, - {"label":"k27","x":7.5,"y":2}, - {"label":"k28","x":8.5,"y":2}, - {"label":"k29","x":9.5,"y":2}, - {"label":"k2A","x":10.5,"y":2}, - {"label":"k2B","x":11.5,"y":2}, - {"label":"k2C","x":12.5,"y":2}, - {"label":"k2D","x":13.5,"y":2}, - {"label":"k2E","x":14.5,"y":2,"w":1.5}, - {"label":"k30","x":0,"y":3,"w":1.5}, - {"label":"k31","x":1.5,"y":3}, - {"label":"k32","x":2.5,"y":3}, - {"label":"k33","x":3.5,"y":3}, - {"label":"k34","x":4.5,"y":3}, - {"label":"k35","x":5.5,"y":3}, - {"label":"k36","x":6.5,"y":3}, - {"label":"k37","x":7.5,"y":3}, - {"label":"k38","x":8.5,"y":3}, - {"label":"k39","x":9.5,"y":3}, - {"label":"k3A","x":10.5,"y":3}, - {"label":"k3B","x":11.5,"y":3}, - {"label":"k3C","x":12.5,"y":3}, - {"label":"k3D","x":13.5,"y":3}, - {"label":"k3E","x":14.5,"y":3,"w":1.5}, - {"label":"k40","x":0,"y":4,"w":1.5}, - {"label":"k41","x":1.5,"y":4,"w":1.5}, - {"label":"k42","x":3,"y":4,"w":1.5}, - {"label":"k43","x":4.5,"y":4,"w":2}, - {"label":"k44","x":6.5,"y":4}, - {"label":"k45","x":7.5,"y":4}, - {"label":"k46","x":8.5,"y":4}, - {"label":"k47","x":9.5,"y":4,"w":2}, - {"label":"k48","x":11.5,"y":4,"w":1.5}, - {"label":"k49","x":13,"y":4,"w":1.5}, - {"label":"k4A","x":14.5,"y":4,"w":1.5} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0}, + {"matrix": [0, 14], "x": 14.5, "y": 0, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1}, + {"matrix": [1, 14], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2}, + {"matrix": [2, 2], "x": 2.5, "y": 2}, + {"matrix": [2, 3], "x": 3.5, "y": 2}, + {"matrix": [2, 4], "x": 4.5, "y": 2}, + {"matrix": [2, 5], "x": 5.5, "y": 2}, + {"matrix": [2, 6], "x": 6.5, "y": 2}, + {"matrix": [2, 7], "x": 7.5, "y": 2}, + {"matrix": [2, 8], "x": 8.5, "y": 2}, + {"matrix": [2, 9], "x": 9.5, "y": 2}, + {"matrix": [2, 10], "x": 10.5, "y": 2}, + {"matrix": [2, 11], "x": 11.5, "y": 2}, + {"matrix": [2, 12], "x": 12.5, "y": 2}, + {"matrix": [2, 13], "x": 13.5, "y": 2}, + {"matrix": [2, 14], "x": 14.5, "y": 2, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3}, + {"matrix": [3, 14], "x": 14.5, "y": 3, "w": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [4, 6], "x": 6.5, "y": 4}, + {"matrix": [4, 7], "x": 7.5, "y": 4}, + {"matrix": [4, 8], "x": 8.5, "y": 4}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 2}, + {"matrix": [4, 11], "x": 11.5, "y": 4, "w": 1.5}, + {"matrix": [4, 13], "x": 13, "y": 4, "w": 1.5}, + {"matrix": [4, 14], "x": 14.5, "y": 4, "w": 1.5} ] } } - } +} diff --git a/keyboards/tszaboo/ortho4exent/ortho4exent.h b/keyboards/tszaboo/ortho4exent/ortho4exent.h deleted file mode 100644 index 3814ce069c8d..000000000000 --- a/keyboards/tszaboo/ortho4exent/ortho4exent.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2021 tszaboo - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E,\ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,\ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E,\ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ - { k40, k41, KC_NO, k42, k43, KC_NO, k44, k45, k46, k47, KC_NO, k48, KC_NO, k49, k4A }, \ -} diff --git a/keyboards/tunks/ergo33/ergo33.h b/keyboards/tunks/ergo33/ergo33.h deleted file mode 100644 index d3deb9748551..000000000000 --- a/keyboards/tunks/ergo33/ergo33.h +++ /dev/null @@ -1,57 +0,0 @@ -/* Copyright 2020 Mika Kuitunen - * - * 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" - -/* The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -/* Matrix layout - * ,---------. - * | 00 | 01 |------------------------. - * |----|----| 02 | 03 | 04 | 05 | 06 | - * | 10 | 11 |----|----|----|----|----| - * |----|----| 12 | 13 | 14 | 14 | 16 | - * | 20 | 21 |----|----|----|----|----| - * |----|----| 22 | 23 | 24 | 25 | 26 | - * | 30 | 31 |----|----|----|----|----| ,----. - * |----|----| 32 | 33 | 34 | 35 | 36 | | 46 | - * | 40 | 41 |---------------------------|----' - * `---------' | 43 | 44 | 45 | - * `--------------' - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, \ - k10, k11, k12, k13, k14, k15, k16, \ - k20, k21, k22, k23, k24, k25, k26, \ - k30, k31, k32, k33, k34, k35, k36, \ - k40, k41, k46, \ - k43, k44, k45 \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06 }, \ - { k10, k11, k12, k13, k14, k15, k16 }, \ - { k20, k21, k22, k23, k24, k25, k26 }, \ - { k30, k31, k32, k33, k34, k35, k36 }, \ - { k40, k41, KC_NO, k43, k44, k45, k46 } \ -} diff --git a/keyboards/tunks/ergo33/info.json b/keyboards/tunks/ergo33/info.json index afb589db1381..afca170abd8c 100644 --- a/keyboards/tunks/ergo33/info.json +++ b/keyboards/tunks/ergo33/info.json @@ -25,12 +25,45 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0}, {"x": 1, "y": 0}, {"x": 2, "y": 0.4}, {"x": 3, "y": 0.3}, {"x": 4, "y": 0.4}, {"x": 5, "y": 0.5}, {"x": 6, "y": 0.5}, - {"x": 0, "y": 1}, {"x": 1, "y": 1}, {"x": 2, "y": 1.4}, {"x": 3, "y": 1.3}, {"x": 4, "y": 1.4}, {"x": 5, "y": 1.5}, {"x": 6, "y": 1.5}, - {"x": 0, "y": 2}, {"x": 1, "y": 2}, {"x": 2, "y": 2.4}, {"x": 3, "y": 2.3}, {"x": 4, "y": 2.4}, {"x": 5, "y": 2.5}, {"x": 6, "y": 2.5}, - {"x": 0, "y": 3}, {"x": 1, "y": 3}, {"x": 2, "y": 3.4}, {"x": 3, "y": 3.3}, {"x": 4, "y": 3.4}, {"x": 5, "y": 3.5}, {"x": 6, "y": 3.5}, - {"x": 0, "y": 4}, {"x": 1, "y": 4}, {"x": 8, "y": 3.5}, - {"x": 4.7, "y": 4.7}, {"x": 5.8, "y": 4.7}, {"x": 6.8, "y": 4.8} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0.4}, + {"matrix": [0, 3], "x": 3, "y": 0.3}, + {"matrix": [0, 4], "x": 4, "y": 0.4}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1.4}, + {"matrix": [1, 3], "x": 3, "y": 1.3}, + {"matrix": [1, 4], "x": 4, "y": 1.4}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2.4}, + {"matrix": [2, 3], "x": 3, "y": 2.3}, + {"matrix": [2, 4], "x": 4, "y": 2.4}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3.4}, + {"matrix": [3, 3], "x": 3, "y": 3.3}, + {"matrix": [3, 4], "x": 4, "y": 3.4}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 6], "x": 8, "y": 3.5}, + + {"matrix": [4, 3], "x": 4.7, "y": 4.7}, + {"matrix": [4, 4], "x": 5.8, "y": 4.7}, + {"matrix": [4, 5], "x": 6.8, "y": 4.8} ] } } diff --git a/keyboards/ubest/vn/info.json b/keyboards/ubest/vn/info.json index fc28aa5beae5..0183f09afedd 100644 --- a/keyboards/ubest/vn/info.json +++ b/keyboards/ubest/vn/info.json @@ -30,82 +30,82 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (E6,F0)", "x":0, "y":0}, - {"label":"K01 (E6,F1)", "x":1, "y":0}, - {"label":"K02 (E6,F4)", "x":2, "y":0}, - {"label":"K03 (E6,F5)", "x":3, "y":0}, - {"label":"K04 (E6,F6)", "x":4, "y":0}, - {"label":"K05 (E6,F7)", "x":5, "y":0}, - {"label":"K06 (E6,C7)", "x":6, "y":0}, - {"label":"K07 (E6,C6)", "x":7, "y":0}, - {"label":"K08 (E6,B5)", "x":8, "y":0}, - {"label":"K09 (E6,B4)", "x":9, "y":0}, - {"label":"K0A (E6,D7)", "x":10, "y":0}, - {"label":"K0B (E6,D6)", "x":11, "y":0}, - {"label":"K0C (E6,D4)", "x":12, "y":0}, - {"label":"K0D (E6,D5)", "x":13, "y":0}, - {"label":"K2D (B7,D5)", "x":14, "y":0}, - {"label":"K0E (E6,D3)", "x":15, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [2, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15, "y": 0}, - {"label":"K10 (B0,F0)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B0,F1)", "x":1.5, "y":1}, - {"label":"K12 (B0,F4)", "x":2.5, "y":1}, - {"label":"K13 (B0,F5)", "x":3.5, "y":1}, - {"label":"K14 (B0,F6)", "x":4.5, "y":1}, - {"label":"K15 (B0,F7)", "x":5.5, "y":1}, - {"label":"K16 (B0,C7)", "x":6.5, "y":1}, - {"label":"K17 (B0,C6)", "x":7.5, "y":1}, - {"label":"K18 (B0,B5)", "x":8.5, "y":1}, - {"label":"K19 (B0,B4)", "x":9.5, "y":1}, - {"label":"K1A (B0,D7)", "x":10.5, "y":1}, - {"label":"K1B (B0,D6)", "x":11.5, "y":1}, - {"label":"K1C (B0,D4)", "x":12.5, "y":1}, - {"label":"K1D (B0,D5)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1E (B0,D3)", "x":15, "y":1}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, - {"label":"K20 (B7,F0)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B7,F1)", "x":1.75, "y":2}, - {"label":"K22 (B7,F4)", "x":2.75, "y":2}, - {"label":"K23 (B7,F5)", "x":3.75, "y":2}, - {"label":"K24 (B7,F6)", "x":4.75, "y":2}, - {"label":"K25 (B7,F7)", "x":5.75, "y":2}, - {"label":"K26 (B7,C7)", "x":6.75, "y":2}, - {"label":"K27 (B7,C6)", "x":7.75, "y":2}, - {"label":"K28 (B7,B5)", "x":8.75, "y":2}, - {"label":"K29 (B7,B4)", "x":9.75, "y":2}, - {"label":"K2A (B7,D7)", "x":10.75, "y":2}, - {"label":"K2B (B7,D6)", "x":11.75, "y":2}, - {"label":"K2C (B7,D4)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2E (B7,D3)", "x":15, "y":2}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, - {"label":"K30 (D0,F0)", "x":0, "y":3, "w":1.25}, - {"label":"K31 (D0,F1)", "x":1.25, "y":3}, - {"label":"K32 (D0,F4)", "x":2.25, "y":3}, - {"label":"K33 (D0,F5)", "x":3.25, "y":3}, - {"label":"K34 (D0,F6)", "x":4.25, "y":3}, - {"label":"K35 (D0,F7)", "x":5.25, "y":3}, - {"label":"K36 (D0,C7)", "x":6.25, "y":3}, - {"label":"K37 (D0,C6)", "x":7.25, "y":3}, - {"label":"K38 (D0,B5)", "x":8.25, "y":3}, - {"label":"K39 (D0,B4)", "x":9.25, "y":3}, - {"label":"K3A (D0,D7)", "x":10.25, "y":3}, - {"label":"K3B (D0,D6)", "x":11.25, "y":3}, - {"label":"K3C (D0,D4)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3D (D0,D5)", "x":14, "y":3}, - {"label":"K3E (D0,D3)", "x":15, "y":3}, + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, - {"label":"K40 (D1,F0)", "x":0, "y":4, "w":1.25}, - {"label":"K41 (D1,F1)", "x":1.25, "y":4, "w":1.25}, - {"label":"K43 (D1,F5)", "x":2.5, "y":4, "w":1.25}, - {"label":"K47 (D1,C6)", "x":3.75, "y":4, "w":5.25}, - {"label":"K48 (D1,B5)", "x":9, "y":4}, - {"label":"K49 (D1,B4)", "x":10, "y":4}, - {"label":"K4A (D1,D7)", "x":11, "y":4}, - {"label":"K4B (D1,D6)", "x":12, "y":4}, - {"label":"K4C (D1,D4)", "x":13, "y":4}, - {"label":"K4D (D1,D5)", "x":14, "y":4}, - {"label":"K4E (D1,D3)", "x":15, "y":4} - ] + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 3.75, "y": 4, "w": 5.25}, + {"matrix": [4, 8], "x": 9, "y": 4}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/ubest/vn/vn.h b/keyboards/ubest/vn/vn.h deleted file mode 100644 index 6dedaf99f2fe..000000000000 --- a/keyboards/ubest/vn/vn.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 water - * - * 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 XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K43, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, KC_NO, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }, \ -} diff --git a/keyboards/unikeyboard/diverge3/diverge3.h b/keyboards/unikeyboard/diverge3/diverge3.h deleted file mode 100644 index c052bcb0fc6b..000000000000 --- a/keyboards/unikeyboard/diverge3/diverge3.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2017 IslandMan93 - * - * 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 XXX KC_NO - -// This a shortcut to help you visually see your layout. -// The second converts the arguments into a two-dimensional array -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R00, R01, R02, R03, R04, R05, R06, \ - L10, L11, L12, L13, L14, L15, L16, R10, R11, R12, R13, R14, R15, R16, \ - L20, L21, L22, L23, L24, L25, L26, R20, R21, R22, R23, R24, R25, R26, \ - L30, L31, L32, L33, L34, L35, L36, R30, R31, R32, R33, R34, R35, R36, \ - L40, L41, L42, L43, L44, LT0, LT1, LT2, RT2, RT1, RT0, R40, R41, R42, R43, R44 \ -) { \ - { L00, L01, L02, L03, L04, L05, L06, XXX }, \ - { L10, L11, L12, L13, L14, L15, L16, XXX }, \ - { L20, L21, L22, L23, L24, L25, L26, XXX }, \ - { L30, L31, L32, L33, L34, L35, L36, XXX }, \ - { L40, L41, L42, L43, L44, LT0, LT1, LT2 }, \ - { R06, R05, R04, R03, R02, R01, R00, XXX }, \ - { R16, R15, R14, R13, R12, R11, R10, XXX }, \ - { R26, R25, R24, R23, R22, R21, R20, XXX }, \ - { R36, R35, R34, R33, R32, R31, R30, XXX }, \ - { R44, R43, R42, R41, R40, RT0, RT1, RT2 } \ - } diff --git a/keyboards/unikeyboard/diverge3/info.json b/keyboards/unikeyboard/diverge3/info.json index 4aac244492ba..cf7067f629ce 100644 --- a/keyboards/unikeyboard/diverge3/info.json +++ b/keyboards/unikeyboard/diverge3/info.json @@ -25,7 +25,89 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0.75}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0.25}, {"x":6, "y":0.5}, {"x":10, "y":0.5}, {"x":11, "y":0.25}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0.25}, {"x":15, "y":0.75}, {"x":16, "y":0}, {"x":0, "y":1}, {"x":1, "y":1.75}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1.25}, {"x":6, "y":1.5}, {"x":10, "y":1.5}, {"x":11, "y":1.25}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1.25}, {"x":15, "y":1.75}, {"x":16, "y":1}, {"x":0, "y":2}, {"x":1, "y":2.75}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2.25}, {"x":6, "y":2.5}, {"x":10, "y":2.5}, {"x":11, "y":2.25}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2.25}, {"x":15, "y":2.75}, {"x":16, "y":2}, {"x":0, "y":3}, {"x":1, "y":3.75}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3.25}, {"x":6, "y":3.5}, {"x":10, "y":3.5}, {"x":11, "y":3.25}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3.25}, {"x":15, "y":3.75}, {"x":16, "y":3}, {"x":0, "y":4}, {"x":1, "y":4.75}, {"x":2, "y":4.25}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4.75, "h":1.25}, {"x":6, "y":5, "h":1.25}, {"x":7, "y":5.25}, {"x":9, "y":5.25}, {"x":10, "y":5, "h":1.25}, {"x":11, "y":4.75, "h":1.25}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4.25}, {"x":15, "y":4.75}, {"x":16, "y":4}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0.75}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0.25}, + {"matrix": [0, 6], "x": 6, "y": 0.5}, + + {"matrix": [5, 6], "x": 10, "y": 0.5}, + {"matrix": [5, 5], "x": 11, "y": 0.25}, + {"matrix": [5, 4], "x": 12, "y": 0}, + {"matrix": [5, 3], "x": 13, "y": 0}, + {"matrix": [5, 2], "x": 14, "y": 0.25}, + {"matrix": [5, 1], "x": 15, "y": 0.75}, + {"matrix": [5, 0], "x": 16, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1.75}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + + {"matrix": [6, 6], "x": 10, "y": 1.5}, + {"matrix": [6, 5], "x": 11, "y": 1.25}, + {"matrix": [6, 4], "x": 12, "y": 1}, + {"matrix": [6, 3], "x": 13, "y": 1}, + {"matrix": [6, 2], "x": 14, "y": 1.25}, + {"matrix": [6, 1], "x": 15, "y": 1.75}, + {"matrix": [6, 0], "x": 16, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2.75}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2.25}, + {"matrix": [2, 6], "x": 6, "y": 2.5}, + + {"matrix": [7, 6], "x": 10, "y": 2.5}, + {"matrix": [7, 5], "x": 11, "y": 2.25}, + {"matrix": [7, 4], "x": 12, "y": 2}, + {"matrix": [7, 3], "x": 13, "y": 2}, + {"matrix": [7, 2], "x": 14, "y": 2.25}, + {"matrix": [7, 1], "x": 15, "y": 2.75}, + {"matrix": [7, 0], "x": 16, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3.75}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3.25}, + {"matrix": [3, 6], "x": 6, "y": 3.5}, + + {"matrix": [8, 6], "x": 10, "y": 3.5}, + {"matrix": [8, 5], "x": 11, "y": 3.25}, + {"matrix": [8, 4], "x": 12, "y": 3}, + {"matrix": [8, 3], "x": 13, "y": 3}, + {"matrix": [8, 2], "x": 14, "y": 3.25}, + {"matrix": [8, 1], "x": 15, "y": 3.75}, + {"matrix": [8, 0], "x": 16, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4.75}, + {"matrix": [4, 2], "x": 2, "y": 4.25}, + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 4], "x": 4, "y": 4}, + {"matrix": [4, 5], "x": 5, "y": 4.75, "h": 1.25}, + {"matrix": [4, 6], "x": 6, "y": 5, "h": 1.25}, + {"matrix": [4, 7], "x": 7, "y": 5.25}, + + {"matrix": [9, 7], "x": 9, "y": 5.25}, + {"matrix": [9, 6], "x": 10, "y": 5, "h": 1.25}, + {"matrix": [9, 5], "x": 11, "y": 4.75, "h": 1.25}, + {"matrix": [9, 4], "x": 12, "y": 4}, + {"matrix": [9, 3], "x": 13, "y": 4}, + {"matrix": [9, 2], "x": 14, "y": 4.25}, + {"matrix": [9, 1], "x": 15, "y": 4.75}, + {"matrix": [9, 0], "x": 16, "y": 4} + ] } } } diff --git a/keyboards/uranuma/info.json b/keyboards/uranuma/info.json index 2b311ea40fda..2dd2bd9e5343 100644 --- a/keyboards/uranuma/info.json +++ b/keyboards/uranuma/info.json @@ -18,56 +18,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"k00", "x":0 , "y":0.62}, - {"label":"k01", "x":1 , "y":0.36}, - {"label":"k02", "x":2 , "y":0}, - {"label":"k03", "x":3 , "y":0.09}, - {"label":"k04", "x":4 , "y":0.7}, - {"label":"k05", "x":8 , "y":0.7}, - {"label":"k06", "x":9 , "y":0.09}, - {"label":"k07", "x":10, "y":0}, - {"label":"k08", "x":11, "y":0.36}, - {"label":"k09", "x":12, "y":0.62}, + {"matrix": [0, 0], "x": 0, "y": 0.62}, + {"matrix": [0, 1], "x": 1, "y": 0.36}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.09}, + {"matrix": [0, 4], "x": 4, "y": 0.7}, - {"label":"k10", "x":0 , "y":1.62}, - {"label":"k11", "x":1 , "y":1.36}, - {"label":"k12", "x":2 , "y":1}, - {"label":"k13", "x":3 , "y":1.09}, - {"label":"k14", "x":4 , "y":1.7}, - {"label":"k15", "x":8 , "y":1.7}, - {"label":"k16", "x":9 , "y":1.09}, - {"label":"k17", "x":10, "y":1}, - {"label":"k18", "x":11, "y":1.36}, - {"label":"k19", "x":12, "y":1.62}, + {"matrix": [0, 5], "x": 8, "y": 0.7}, + {"matrix": [0, 6], "x": 9, "y": 0.09}, + {"matrix": [0, 7], "x": 10, "y": 0}, + {"matrix": [0, 8], "x": 11, "y": 0.36}, + {"matrix": [0, 9], "x": 12, "y": 0.62}, - {"label":"k20", "x":0 , "y":2.62}, - {"label":"k21", "x":1 , "y":2.36}, - {"label":"k22", "x":2 , "y":2}, - {"label":"k23", "x":3 , "y":2.09}, - {"label":"k24", "x":4 , "y":2.7}, - {"label":"k25", "x":8 , "y":2.7}, - {"label":"k26", "x":9 , "y":2.09}, - {"label":"k27", "x":10, "y":2}, - {"label":"k28", "x":11, "y":2.36}, - {"label":"k29", "x":12, "y":2.62}, + {"matrix": [1, 0], "x": 0, "y": 1.62}, + {"matrix": [1, 1], "x": 1, "y": 1.36}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.09}, + {"matrix": [1, 4], "x": 4, "y": 1.7}, - {"label":"k30", "x":0 , "y":3.62}, - {"label":"k31", "x":1 , "y":3.36}, - {"label":"k32", "x":2 , "y":3}, - {"label":"k33", "x":3 , "y":3.09}, - {"label":"k34", "x":4 , "y":3.7}, - {"label":"k44", "x":5, "y":2.44, "h":2}, - {"label":"k45", "x":7, "y":2.44, "h":2}, - {"label":"k35", "x":8 , "y":3.7}, - {"label":"k36", "x":9 , "y":3.09}, - {"label":"k37", "x":10, "y":3}, - {"label":"k38", "x":11, "y":3.36}, - {"label":"k39", "x":12, "y":3.62}, + {"matrix": [1, 5], "x": 8, "y": 1.7}, + {"matrix": [1, 6], "x": 9, "y": 1.09}, + {"matrix": [1, 7], "x": 10, "y": 1}, + {"matrix": [1, 8], "x": 11, "y": 1.36}, + {"matrix": [1, 9], "x": 12, "y": 1.62}, - {"label":"k40", "x":0, "y":4.7, "w":1.5}, - {"label":"k41", "x":1.5, "y":4.7}, - {"label":"k48", "x":10.5, "y":4.7}, - {"label":"k49", "x":11.5, "y":4.7, "w":1.5} + {"matrix": [2, 0], "x": 0, "y": 2.62}, + {"matrix": [2, 1], "x": 1, "y": 2.36}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.09}, + {"matrix": [2, 4], "x": 4, "y": 2.7}, + + {"matrix": [2, 5], "x": 8, "y": 2.7}, + {"matrix": [2, 6], "x": 9, "y": 2.09}, + {"matrix": [2, 7], "x": 10, "y": 2}, + {"matrix": [2, 8], "x": 11, "y": 2.36}, + {"matrix": [2, 9], "x": 12, "y": 2.62}, + + {"matrix": [3, 0], "x": 0, "y": 3.62}, + {"matrix": [3, 1], "x": 1, "y": 3.36}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3.09}, + {"matrix": [3, 4], "x": 4, "y": 3.7}, + {"matrix": [4, 4], "x": 5, "y": 2.44, "h": 2}, + + {"matrix": [4, 5], "x": 7, "y": 2.44, "h": 2}, + {"matrix": [3, 5], "x": 8, "y": 3.7}, + {"matrix": [3, 6], "x": 9, "y": 3.09}, + {"matrix": [3, 7], "x": 10, "y": 3}, + {"matrix": [3, 8], "x": 11, "y": 3.36}, + {"matrix": [3, 9], "x": 12, "y": 3.62}, + + {"matrix": [4, 0], "x": 0, "y": 4.7, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4.7}, + + {"matrix": [4, 8], "x": 10.5, "y": 4.7}, + {"matrix": [4, 9], "x": 11.5, "y": 4.7, "w": 1.5} ] } } diff --git a/keyboards/uranuma/uranuma.h b/keyboards/uranuma/uranuma.h deleted file mode 100644 index 8b2e4c6930e2..000000000000 --- a/keyboards/uranuma/uranuma.h +++ /dev/null @@ -1,26 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ - -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \ - k30, k31, k32, k33, k34, k44, k45, k35, k36, k37, k38, k39, \ - k40, k41, k48, k49 \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \ - { k40, k41, KC_NO, KC_NO, k44, k45, KC_NO, KC_NO, k48, k49 } \ -} diff --git a/keyboards/uzu42/rev1/info.json b/keyboards/uzu42/rev1/info.json index 9d08cbdaebac..75896018c70c 100644 --- a/keyboards/uzu42/rev1/info.json +++ b/keyboards/uzu42/rev1/info.json @@ -24,48 +24,55 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Q", "x":0.375, "y":0}, - {"label":"W", "x":1.375, "y":0}, - {"label":"E", "x":2.375, "y":0}, - {"label":"R", "x":3.375, "y":0.125}, - {"label":"T", "x":4.375, "y":0.25}, - {"label":"Y", "x":7.625, "y":0.25}, - {"label":"U", "x":8.625, "y":0.125}, - {"label":"I", "x":9.625, "y":0}, - {"label":"O", "x":10.625, "y":0}, - {"label":"P", "x":11.625, "y":0}, - {"label":"A", "x":0.25, "y":1}, - {"label":"S", "x":1.25, "y":1}, - {"label":"D", "x":2.25, "y":1}, - {"label":"F", "x":3.25, "y":1.125}, - {"label":"G", "x":4.25, "y":1.25}, - {"label":"H", "x":7.75, "y":1.25}, - {"label":"J", "x":8.75, "y":1.125}, - {"label":"K", "x":9.75, "y":1}, - {"label":"L", "x":10.75, "y":1}, - {"label":"Ent", "x":11.75, "y":1}, - {"label":"Z", "x":0.125, "y":2}, - {"label":"X", "x":1.125, "y":2}, - {"label":"C", "x":2.125, "y":2}, - {"label":"V", "x":3.125, "y":2.125}, - {"label":"B", "x":4.125, "y":2.25}, - {"label":"N", "x":7.875, "y":2.25}, - {"label":"M", "x":8.875, "y":2.125}, - {"label":",", "x":9.875, "y":2}, - {"label":".", "x":10.875, "y":2}, - {"label":"/", "x":11.875, "y":2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Space", "x":1, "y":3}, - {"label":"Alt", "x":2, "y":3.05}, - {"label":"GUI", "x":3, "y":3.18}, - {"label":"Lower", "x":4, "y":3.3}, - {"label":"Esc", "x":5, "y":3.43}, - {"label":"Space", "x":7, "y":3.43}, - {"label":"Raise", "x":8, "y":3.3}, - {"label":"BkSpc", "x":9, "y":3.18}, - {"label":"Ctrl", "x":10, "y":3.05}, - {"label":"GUI", "x":11, "y":3}, - {"label":"No", "x":12, "y":3} + {"matrix": [0, 0], "x": 0.375, "y": 0}, + {"matrix": [0, 1], "x": 1.375, "y": 0}, + {"matrix": [0, 2], "x": 2.375, "y": 0}, + {"matrix": [0, 3], "x": 3.375, "y": 0.125}, + {"matrix": [0, 4], "x": 4.375, "y": 0.25}, + + {"matrix": [4, 4], "x": 7.625, "y": 0.25}, + {"matrix": [4, 3], "x": 8.625, "y": 0.125}, + {"matrix": [4, 2], "x": 9.625, "y": 0}, + {"matrix": [4, 1], "x": 10.625, "y": 0}, + {"matrix": [4, 0], "x": 11.625, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1.125}, + {"matrix": [1, 4], "x": 4.25, "y": 1.25}, + + {"matrix": [5, 4], "x": 7.75, "y": 1.25}, + {"matrix": [5, 3], "x": 8.75, "y": 1.125}, + {"matrix": [5, 2], "x": 9.75, "y": 1}, + {"matrix": [5, 1], "x": 10.75, "y": 1}, + {"matrix": [5, 0], "x": 11.75, "y": 1}, + + {"matrix": [2, 0], "x": 0.125, "y": 2}, + {"matrix": [2, 1], "x": 1.125, "y": 2}, + {"matrix": [2, 2], "x": 2.125, "y": 2}, + {"matrix": [2, 3], "x": 3.125, "y": 2.125}, + {"matrix": [2, 4], "x": 4.125, "y": 2.25}, + + {"matrix": [6, 4], "x": 7.875, "y": 2.25}, + {"matrix": [6, 3], "x": 8.875, "y": 2.125}, + {"matrix": [6, 2], "x": 9.875, "y": 2}, + {"matrix": [6, 1], "x": 10.875, "y": 2}, + {"matrix": [6, 0], "x": 11.875, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3.05}, + {"matrix": [3, 3], "x": 3, "y": 3.18}, + {"matrix": [3, 4], "x": 4, "y": 3.3}, + {"matrix": [3, 5], "x": 5, "y": 3.43}, + + {"matrix": [7, 5], "x": 7, "y": 3.43}, + {"matrix": [7, 4], "x": 8, "y": 3.3}, + {"matrix": [7, 3], "x": 9, "y": 3.18}, + {"matrix": [7, 2], "x": 10, "y": 3.05}, + {"matrix": [7, 1], "x": 11, "y": 3}, + {"matrix": [7, 0], "x": 12, "y": 3} ] } } diff --git a/keyboards/uzu42/rev1/rev1.h b/keyboards/uzu42/rev1/rev1.h deleted file mode 100644 index 156605f87adc..000000000000 --- a/keyboards/uzu42/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "uzu42.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ - L10, L11, L12, L13, L14, R10, R11, R12, R13, R14, \ - L20, L21, L22, L23, L24, R20, R21, R22, R23, R24, \ - L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \ - ) \ - { \ - { L00, L01, L02, L03, L04 }, \ - { L10, L11, L12, L13, L14 }, \ - { L20, L21, L22, L23, L24 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { R04, R03, R02, R01, R00 }, \ - { R14, R13, R12, R11, R10 }, \ - { R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 } \ - } diff --git a/keyboards/uzu42/uzu42.c b/keyboards/uzu42/uzu42.c index 6a47ceac3873..2e4c8ba93e64 100644 --- a/keyboards/uzu42/uzu42.c +++ b/keyboards/uzu42/uzu42.c @@ -1,7 +1,7 @@ // Copyright 2022 QMK // SPDX-License-Identifier: GPL-2.0-or-later -#include "uzu42.h" +#include "quantum.h" #ifdef OLED_ENABLE #include diff --git a/keyboards/uzu42/uzu42.h b/keyboards/uzu42/uzu42.h deleted file mode 100644 index 8678588bc3b6..000000000000 --- a/keyboards/uzu42/uzu42.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2022 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -#include "quantum.h" - -#ifdef KEYBOARD_uzu42_rev1 - #include "rev1.h" -#endif diff --git a/keyboards/v4n4g0rth0n/info.json b/keyboards/v4n4g0rth0n/info.json index f538b8773d7b..4d0371e01f69 100644 --- a/keyboards/v4n4g0rth0n/info.json +++ b/keyboards/v4n4g0rth0n/info.json @@ -15,60 +15,61 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"1", "x":0.5, "y":0}, - {"label":"2", "x":1.5, "y":0}, - {"label":"3", "x":2.5, "y":0}, - {"label":"4", "x":3.5, "y":0}, - {"label":"5", "x":4.5, "y":0}, - {"label":"6", "x":5.5, "y":0}, - {"label":"Tab", "x":0, "y":1}, + {"label": "1", "matrix": [0, 0], "x": 0.5, "y": 0}, + {"label": "2", "matrix": [0, 1], "x": 1.5, "y": 0}, + {"label": "3", "matrix": [0, 2], "x": 2.5, "y": 0}, + {"label": "4", "matrix": [0, 3], "x": 3.5, "y": 0}, + {"label": "5", "matrix": [0, 4], "x": 4.5, "y": 0}, + {"label": "6", "matrix": [0, 5], "x": 5.5, "y": 0}, - {"label":"Q", "x":1, "y":1}, - {"label":"W", "x":2, "y":1}, - {"label":"E", "x":3, "y":1}, - {"label":"R", "x":4, "y":1}, - {"label":"T", "x":5, "y":1}, - {"label":"Y", "x":6.75, "y":1}, - {"label":"U", "x":7.75, "y":1}, - {"label":"I", "x":8.75, "y":1}, - {"label":"O", "x":9.75, "y":1}, - {"label":"P", "x":10.75, "y":1}, - {"label":"Back Space", "x":11.75, "y":1}, + {"label": "Tab", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "Q", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "W", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "E", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "R", "matrix": [1, 4], "x": 4, "y": 1}, + {"label": "T", "matrix": [1, 5], "x": 5, "y": 1}, + {"label": "Y", "matrix": [1, 6], "x": 6.75, "y": 1}, + {"label": "U", "matrix": [1, 7], "x": 7.75, "y": 1}, + {"label": "I", "matrix": [1, 8], "x": 8.75, "y": 1}, + {"label": "O", "matrix": [1, 9], "x": 9.75, "y": 1}, + {"label": "P", "matrix": [1, 10], "x": 10.75, "y": 1}, + {"label": "Back Space", "matrix": [1, 11], "x": 11.75, "y": 1}, - {"label":"Esc", "x":0, "y":2}, - {"label":"A", "x":1, "y":2}, - {"label":"S", "x":2, "y":2}, - {"label":"D", "x":3, "y":2}, - {"label":"F", "x":4, "y":2}, - {"label":"G", "x":5, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, + {"label": "Esc", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "A", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "S", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "D", "matrix": [2, 3], "x": 3, "y": 2}, + {"label": "F", "matrix": [2, 4], "x": 4, "y": 2}, + {"label": "G", "matrix": [2, 5], "x": 5, "y": 2}, + {"label": "H", "matrix": [2, 6], "x": 6.75, "y": 2}, + {"label": "J", "matrix": [2, 7], "x": 7.75, "y": 2}, + {"label": "K", "matrix": [2, 8], "x": 8.75, "y": 2}, + {"label": "L", "matrix": [2, 9], "x": 9.75, "y": 2}, + {"label": ";", "matrix": [2, 10], "x": 10.75, "y": 2}, + {"label": "'", "matrix": [2, 11], "x": 11.75, "y": 2}, - {"label":"Shift", "x":0, "y":3}, - {"label":"Z", "x":1, "y":3}, - {"label":"X", "x":2, "y":3}, - {"label":"C", "x":3, "y":3}, - {"label":"V", "x":4, "y":3}, - {"label":"B", "x":5, "y":3}, - {"label":"N", "x":6.75, "y":3}, - {"label":"M", "x":7.75, "y":3}, - {"label":",", "x":8.75, "y":3}, - {"label":".", "x":9.75, "y":3}, - {"label":"↑", "x":10.75, "y":3}, - {"label":"Return", "x":11.75, "y":3}, + {"label": "Shift", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "Z", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "X", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "C", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "V", "matrix": [3, 4], "x": 4, "y": 3}, + {"label": "B", "matrix": [3, 5], "x": 5, "y": 3}, + {"label": "N", "matrix": [3, 6], "x": 6.75, "y": 3}, + {"label": "M", "matrix": [3, 7], "x": 7.75, "y": 3}, + {"label": ",", "matrix": [3, 8], "x": 8.75, "y": 3}, + {"label": ".", "matrix": [3, 9], "x": 9.75, "y": 3}, + {"label": "↑", "matrix": [3, 10], "x": 10.75, "y": 3}, + {"label": "Return", "matrix": [3, 11], "x": 11.75, "y": 3}, - {"label":"Gui", "x":0, "y":4}, - {"label":"Ctrl", "x":1, "y":4}, - {"label":"Alt", "x":2, "y":4}, - {"label":"Space", "x":3, "y":4, "w":3}, - {"label":"Enter", "x":6.75, "y":4, "w":3}, - {"label":"←", "x":9.75, "y":4}, - {"label":"↓", "x":10.75, "y":4}, - {"label":"→", "x":11.75, "y":4}] + {"label": "Gui", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "Ctrl", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "Alt", "matrix": [4, 2], "x": 2, "y": 4}, + {"label": "Space", "matrix": [4, 4], "x": 3, "y": 4, "w": 3}, + {"label": "Enter", "matrix": [4, 7], "x": 6.75, "y": 4, "w": 3}, + {"label": "←", "matrix": [4, 9], "x": 9.75, "y": 4}, + {"label": "↓", "matrix": [4, 10], "x": 10.75, "y": 4}, + {"label": "→", "matrix": [4, 11], "x": 11.75, "y": 4} + ] } } } diff --git a/keyboards/v4n4g0rth0n/v4n4g0rth0n.h b/keyboards/v4n4g0rth0n/v4n4g0rth0n.h deleted file mode 100644 index 7c8edfeb1255..000000000000 --- a/keyboards/v4n4g0rth0n/v4n4g0rth0n.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2021 jpuerto - * - * 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 XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, \ - 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, k44, k47, k49, k4A, k4B \ -) { \ - { k00, k01, k02, k03, k04, k05, XXX, XXX, XXX, XXX, XXX, XXX }, \ - { 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, XXX, k44, XXX, XXX, k47, XXX, k49, k4A, k4B } \ -} diff --git a/keyboards/viktus/at101_bh/at101_bh.h b/keyboards/viktus/at101_bh/at101_bh.h deleted file mode 100644 index 54655cf60e8d..000000000000 --- a/keyboards/viktus/at101_bh/at101_bh.h +++ /dev/null @@ -1,25 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K0000, K0100, K0001, K0101, K0002, K0102, K0003, K0103, K0004, K0104, K0005, K0105, K0006, K0106, K0007, K0107, \ - K0200, K0300, K0201, K0301, K0202, K0302, K0203, K0303, K0204, K0304, K0205, K0305, K0206, K0306, K0207, K0307, K0208, K0308, K0209, K0309, K0009, \ - K0400, K0500, K0401, K0501, K0402, K0502, K0403, K0503, K0404, K0504, K0405, K0505, K0406, K0506, K0407, K0507, K0408, K0508, K0409, K0509, K0109, \ - K0600, K0700, K0601, K0701, K0602, K0702, K0603, K0703, K0604, K0704, K0605, K0705, K0606, K0608, K0708, K0609, K0709, \ - K0800, K1101, K0900, K0801, K0901, K0802, K0902, K0803, K0903, K0804, K0904, K0805, K0905, K0806, K0807, K0808, K0908, K0809, K0909, \ - K1000, K1100, K1001, K1102, K1005, K1105, K1006, K1106, K1007, K1107, K1008, K1108, K1009 \ -) { \ - { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, KC_NO, K0009 }, \ - { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, KC_NO, K0109 }, \ - { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209 }, \ - { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309 }, \ - { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409 }, \ - { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509 }, \ - { K0600, K0601, K0602, K0603, K0604, K0605, K0606, KC_NO, K0608, K0609 }, \ - { K0700, K0701, K0702, K0703, K0704, K0705, KC_NO, KC_NO, K0708, K0709 }, \ - { K0800, K0801, K0802, K0803, K0804, K0805, K0806, K0807, K0808, K0809 }, \ - { K0900, K0901, K0902, K0903, K0904, K0905, KC_NO, KC_NO, K0908, K0909 }, \ - { K1000, K1001, KC_NO, KC_NO, KC_NO, K1005, K1006, K1007, K1008, K1009 }, \ - { K1100, K1101, K1102, KC_NO, KC_NO, K1105, K1106, K1107, K1108, KC_NO } \ -} diff --git a/keyboards/viktus/at101_bh/info.json b/keyboards/viktus/at101_bh/info.json index 88b0c78b2d5a..6ecd53c36df1 100644 --- a/keyboards/viktus/at101_bh/info.json +++ b/keyboards/viktus/at101_bh/info.json @@ -18,113 +18,131 @@ "layouts": { "LAYOUT": { "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":"Print Screen", "x":15.25, "y":0}, - {"label":"Scroll Lock", "x":16.25, "y":0}, - {"label":"Pause", "x":17.25, "y":0}, - {"label":"Grave", "x":0, "y":1.5}, - {"label":"1", "x":1, "y":1.5}, - {"label":"2", "x":2, "y":1.5}, - {"label":"3", "x":3, "y":1.5}, - {"label":"4", "x":4, "y":1.5}, - {"label":"5", "x":5, "y":1.5}, - {"label":"6", "x":6, "y":1.5}, - {"label":"7", "x":7, "y":1.5}, - {"label":"8", "x":8, "y":1.5}, - {"label":"9", "x":9, "y":1.5}, - {"label":"0", "x":10, "y":1.5}, - {"label":"-", "x":11, "y":1.5}, - {"label":"=", "x":12, "y":1.5}, - {"label":"Backspace", "x":13, "y":1.5, "w":2}, - {"label":"Insert", "x":15.25, "y":1.5}, - {"label":"Home", "x":16.25, "y":1.5}, - {"label":"Page Up", "x":17.25, "y":1.5}, - {"label":"Num Lock", "x":18.5, "y":1.5}, - {"label":"Keypad /", "x":19.5, "y":1.5}, - {"label":"Keypad *", "x":20.5, "y":1.5}, - {"label":"Keypad -", "x":21.5, "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":"LBracket", "x":11.5, "y":2.5}, - {"label":"RBracket]", "x":12.5, "y":2.5}, - {"label":"Backslash", "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":"Page Down", "x":17.25, "y":2.5}, - {"label":"Keypad 7", "x":18.5, "y":2.5}, - {"label":"Keypad 8", "x":19.5, "y":2.5}, - {"label":"Keypad 9", "x":20.5, "y":2.5}, - {"label":"Keypad +", "x":21.5, "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":"Semicolon", "x":10.75, "y":3.5}, - {"label":"Quote", "x":11.75, "y":3.5}, - {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, - {"label":"Keypad 4", "x":18.5, "y":3.5}, - {"label":"Keypad 5", "x":19.5, "y":3.5}, - {"label":"Keypad 6", "x":20.5, "y":3.5}, - {"label":"Keypad =", "x":21.5, "y":3.5}, - {"label":"LShift", "x":0, "y":4.5, "w":1.25}, - {"label":"ISO Backslash", "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":"Comma", "x":9.25, "y":4.5}, - {"label":"Period", "x":10.25, "y":4.5}, - {"label":"Slash", "x":11.25, "y":4.5}, - {"label":"RShift", "x":12.25, "y":4.5, "w":1.75}, - {"label":"Fn", "x":14, "y":4.5}, - {"label":"Up", "x":16.25, "y":4.5}, - {"label":"Keypad 1", "x":18.5, "y":4.5}, - {"label":"Keypad 2", "x":19.5, "y":4.5}, - {"label":"Keypad 3", "x":20.5, "y":4.5}, - {"label":"Keypad Enter", "x":21.5, "y":4.5, "h":2}, - {"label":"LCtrl", "x":0, "y":5.5, "w":1.25}, - {"label":"LGUI", "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":"RGUI", "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}, - {"label":"Keypad 0", "x":18.5, "y":5.5, "w":2}, - {"label":"Keypad .", "x":20.5, "y":5.5} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [1, 1], "x": 4, "y": 0}, + {"matrix": [0, 2], "x": 5, "y": 0}, + + {"matrix": [1, 2], "x": 6.5, "y": 0}, + {"matrix": [0, 3], "x": 7.5, "y": 0}, + {"matrix": [1, 3], "x": 8.5, "y": 0}, + {"matrix": [0, 4], "x": 9.5, "y": 0}, + + {"matrix": [1, 4], "x": 11, "y": 0}, + {"matrix": [0, 5], "x": 12, "y": 0}, + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + + {"matrix": [1, 6], "x": 15.25, "y": 0}, + {"matrix": [0, 7], "x": 16.25, "y": 0}, + {"matrix": [1, 7], "x": 17.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.5}, + {"matrix": [3, 0], "x": 1, "y": 1.5}, + {"matrix": [2, 1], "x": 2, "y": 1.5}, + {"matrix": [3, 1], "x": 3, "y": 1.5}, + {"matrix": [2, 2], "x": 4, "y": 1.5}, + {"matrix": [3, 2], "x": 5, "y": 1.5}, + {"matrix": [2, 3], "x": 6, "y": 1.5}, + {"matrix": [3, 3], "x": 7, "y": 1.5}, + {"matrix": [2, 4], "x": 8, "y": 1.5}, + {"matrix": [3, 4], "x": 9, "y": 1.5}, + {"matrix": [2, 5], "x": 10, "y": 1.5}, + {"matrix": [3, 5], "x": 11, "y": 1.5}, + {"matrix": [2, 6], "x": 12, "y": 1.5}, + {"matrix": [3, 6], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [2, 7], "x": 15.25, "y": 1.5}, + + {"matrix": [3, 7], "x": 16.25, "y": 1.5}, + {"matrix": [2, 8], "x": 17.25, "y": 1.5}, + {"matrix": [3, 8], "x": 18.5, "y": 1.5}, + + {"matrix": [2, 9], "x": 19.5, "y": 1.5}, + {"matrix": [3, 9], "x": 20.5, "y": 1.5}, + {"matrix": [0, 9], "x": 21.5, "y": 1.5}, + + {"matrix": [4, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.5}, + {"matrix": [4, 1], "x": 2.5, "y": 2.5}, + {"matrix": [5, 1], "x": 3.5, "y": 2.5}, + {"matrix": [4, 2], "x": 4.5, "y": 2.5}, + {"matrix": [5, 2], "x": 5.5, "y": 2.5}, + {"matrix": [4, 3], "x": 6.5, "y": 2.5}, + {"matrix": [5, 3], "x": 7.5, "y": 2.5}, + {"matrix": [4, 4], "x": 8.5, "y": 2.5}, + {"matrix": [5, 4], "x": 9.5, "y": 2.5}, + {"matrix": [4, 5], "x": 10.5, "y": 2.5}, + {"matrix": [5, 5], "x": 11.5, "y": 2.5}, + {"matrix": [4, 6], "x": 12.5, "y": 2.5}, + {"matrix": [5, 6], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [4, 7], "x": 15.25, "y": 2.5}, + {"matrix": [5, 7], "x": 16.25, "y": 2.5}, + {"matrix": [4, 8], "x": 17.25, "y": 2.5}, + + {"matrix": [5, 8], "x": 18.5, "y": 2.5}, + {"matrix": [4, 9], "x": 19.5, "y": 2.5}, + {"matrix": [5, 9], "x": 20.5, "y": 2.5}, + {"matrix": [1, 9], "x": 21.5, "y": 2.5}, + + {"matrix": [6, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.5}, + {"matrix": [6, 1], "x": 2.75, "y": 3.5}, + {"matrix": [7, 1], "x": 3.75, "y": 3.5}, + {"matrix": [6, 2], "x": 4.75, "y": 3.5}, + {"matrix": [7, 2], "x": 5.75, "y": 3.5}, + {"matrix": [6, 3], "x": 6.75, "y": 3.5}, + {"matrix": [7, 3], "x": 7.75, "y": 3.5}, + {"matrix": [6, 4], "x": 8.75, "y": 3.5}, + {"matrix": [7, 4], "x": 9.75, "y": 3.5}, + {"matrix": [6, 5], "x": 10.75, "y": 3.5}, + {"matrix": [7, 5], "x": 11.75, "y": 3.5}, + {"matrix": [6, 6], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [6, 8], "x": 18.5, "y": 3.5}, + {"matrix": [7, 8], "x": 19.5, "y": 3.5}, + {"matrix": [6, 9], "x": 20.5, "y": 3.5}, + {"matrix": [7, 9], "x": 21.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [11, 1], "x": 1.25, "y": 4.5}, + {"matrix": [9, 0], "x": 2.25, "y": 4.5}, + {"matrix": [8, 1], "x": 3.25, "y": 4.5}, + {"matrix": [9, 1], "x": 4.25, "y": 4.5}, + {"matrix": [8, 2], "x": 5.25, "y": 4.5}, + {"matrix": [9, 2], "x": 6.25, "y": 4.5}, + {"matrix": [8, 3], "x": 7.25, "y": 4.5}, + {"matrix": [9, 3], "x": 8.25, "y": 4.5}, + {"matrix": [8, 4], "x": 9.25, "y": 4.5}, + {"matrix": [9, 4], "x": 10.25, "y": 4.5}, + {"matrix": [8, 5], "x": 11.25, "y": 4.5}, + {"matrix": [9, 5], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [8, 6], "x": 14, "y": 4.5}, + + {"matrix": [8, 7], "x": 16.25, "y": 4.5}, + + {"matrix": [8, 8], "x": 18.5, "y": 4.5}, + {"matrix": [9, 8], "x": 19.5, "y": 4.5}, + {"matrix": [8, 9], "x": 20.5, "y": 4.5}, + {"matrix": [9, 9], "x": 21.5, "y": 4.5, "h": 2}, + + {"matrix": [10, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [11, 0], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 1], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 2], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [10, 5], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [11, 5], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [10, 6], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [11, 6], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [10, 7], "x": 15.25, "y": 5.5}, + {"matrix": [11, 7], "x": 16.25, "y": 5.5}, + {"matrix": [10, 8], "x": 17.25, "y": 5.5}, + + {"matrix": [11, 8], "x": 18.5, "y": 5.5, "w": 2}, + {"matrix": [10, 9], "x": 20.5, "y": 5.5} ] } } diff --git a/keyboards/viktus/omnikey_bh/info.json b/keyboards/viktus/omnikey_bh/info.json index 0e29960d9418..d6779e758d07 100644 --- a/keyboards/viktus/omnikey_bh/info.json +++ b/keyboards/viktus/omnikey_bh/info.json @@ -17,7 +17,136 @@ "bootloader": "halfkay", "layouts": { "LAYOUT": { - "layout": [{"label":"K000", "x":0, "y":0}, {"label":"K001", "x":1, "y":0}, {"label":"K002", "x":2.5, "y":0}, {"label":"K003", "x":4.5, "y":0}, {"label":"K004", "x":5.5, "y":0}, {"label":"K005", "x":6.5, "y":0}, {"label":"K006", "x":7.5, "y":0}, {"label":"K007", "x":9, "y":0}, {"label":"K008", "x":10, "y":0}, {"label":"K009", "x":11, "y":0}, {"label":"K010", "x":12, "y":0}, {"label":"K011", "x":13.5, "y":0}, {"label":"K012", "x":14.5, "y":0}, {"label":"K013", "x":15.5, "y":0}, {"label":"K014", "x":16.5, "y":0}, {"label":"K015", "x":18, "y":0}, {"label":"K016", "x":19, "y":0}, {"label":"K017", "x":20, "y":0}, {"label":"K100", "x":0, "y":1.5}, {"label":"K101", "x":1, "y":1.5}, {"label":"K102", "x":2.5, "y":1.5}, {"label":"K103", "x":3.5, "y":1.5}, {"label":"K104", "x":4.5, "y":1.5}, {"label":"K105", "x":5.5, "y":1.5}, {"label":"K106", "x":6.5, "y":1.5}, {"label":"K107", "x":7.5, "y":1.5}, {"label":"K108", "x":8.5, "y":1.5}, {"label":"K109", "x":9.5, "y":1.5}, {"label":"K110", "x":10.5, "y":1.5}, {"label":"K111", "x":11.5, "y":1.5}, {"label":"K112", "x":12.5, "y":1.5}, {"label":"K113", "x":13.5, "y":1.5}, {"label":"K114", "x":14.5, "y":1.5}, {"label":"K115", "x":15.5, "y":1.5, "w":2}, {"label":"K116", "x":18, "y":1.5}, {"label":"K117", "x":19, "y":1.5}, {"label":"K118", "x":20, "y":1.5}, {"label":"K119", "x":21.5, "y":1.5}, {"label":"K120", "x":22.5, "y":1.5}, {"label":"K121", "x":23.5, "y":1.5}, {"label":"K122", "x":24.5, "y":1.5}, {"label":"K200", "x":0, "y":2.5}, {"label":"K201", "x":1, "y":2.5}, {"label":"K202", "x":2.5, "y":2.5, "w":1.5}, {"label":"K203", "x":4, "y":2.5}, {"label":"K204", "x":5, "y":2.5}, {"label":"K205", "x":6, "y":2.5}, {"label":"K206", "x":7, "y":2.5}, {"label":"K207", "x":8, "y":2.5}, {"label":"K208", "x":9, "y":2.5}, {"label":"K209", "x":10, "y":2.5}, {"label":"K210", "x":11, "y":2.5}, {"label":"K211", "x":12, "y":2.5}, {"label":"K212", "x":13, "y":2.5}, {"label":"K213", "x":14, "y":2.5}, {"label":"K214", "x":15, "y":2.5}, {"label":"K215", "x":16, "y":2.5, "w":1.5}, {"label":"K216", "x":18, "y":2.5}, {"label":"K217", "x":19, "y":2.5}, {"label":"K218", "x":20, "y":2.5}, {"label":"K219", "x":21.5, "y":2.5}, {"label":"K220", "x":22.5, "y":2.5}, {"label":"K221", "x":23.5, "y":2.5}, {"label":"K222", "x":24.5, "y":2.5}, {"label":"K300", "x":0, "y":3.5}, {"label":"K301", "x":1, "y":3.5}, {"label":"K302", "x":2.5, "y":3.5, "w":1.75}, {"label":"K303", "x":4.25, "y":3.5}, {"label":"K304", "x":5.25, "y":3.5}, {"label":"K305", "x":6.25, "y":3.5}, {"label":"K306", "x":7.25, "y":3.5}, {"label":"K307", "x":8.25, "y":3.5}, {"label":"K308", "x":9.25, "y":3.5}, {"label":"K309", "x":10.25, "y":3.5}, {"label":"K310", "x":11.25, "y":3.5}, {"label":"K311", "x":12.25, "y":3.5}, {"label":"K312", "x":13.25, "y":3.5}, {"label":"K313", "x":14.25, "y":3.5}, {"label":"K314", "x":15.25, "y":3.5, "w":2.25}, {"label":"K315", "x":18, "y":3.5}, {"label":"K316", "x":19, "y":3.5}, {"label":"K317", "x":20, "y":3.5}, {"label":"K318", "x":21.5, "y":3.5}, {"label":"K319", "x":22.5, "y":3.5}, {"label":"K320", "x":23.5, "y":3.5}, {"label":"K321", "x":24.5, "y":3.5}, {"label":"K400", "x":0, "y":4.5}, {"label":"K401", "x":1, "y":4.5}, {"label":"K402", "x":2.5, "y":4.5, "w":2.25}, {"label":"K403", "x":4.75, "y":4.5}, {"label":"K404", "x":5.75, "y":4.5}, {"label":"K405", "x":6.75, "y":4.5}, {"label":"K406", "x":7.75, "y":4.5}, {"label":"K407", "x":8.75, "y":4.5}, {"label":"K408", "x":9.75, "y":4.5}, {"label":"K409", "x":10.75, "y":4.5}, {"label":"K410", "x":11.75, "y":4.5}, {"label":"K411", "x":12.75, "y":4.5}, {"label":"K412", "x":13.75, "y":4.5}, {"label":"K413", "x":14.75, "y":4.5, "w":1.75}, {"label":"K414", "x":16.5, "y":4.5}, {"label":"K415", "x":18, "y":4.5}, {"label":"K416", "x":19, "y":4.5}, {"label":"K417", "x":20, "y":4.5}, {"label":"K418", "x":21.5, "y":4.5}, {"label":"K419", "x":22.5, "y":4.5}, {"label":"K420", "x":23.5, "y":4.5}, {"label":"K421", "x":24.5, "y":4.5, "h":2}, {"label":"K500", "x":0, "y":5.5}, {"label":"K501", "x":1, "y":5.5}, {"label":"K502", "x":2.5, "y":5.5, "w":1.5}, {"label":"K503", "x":4, "y":5.5}, {"label":"K504", "x":5, "y":5.5, "w":1.5}, {"label":"K507", "x":6.5, "y":5.5, "w":7}, {"label":"K512", "x":13.5, "y":5.5}, {"label":"K513", "x":14.5, "y":5.5}, {"label":"K514", "x":15.5, "y":5.5}, {"label":"K515", "x":16.5, "y":5.5}, {"label":"K516", "x":18, "y":5.5}, {"label":"K517", "x":19, "y":5.5}, {"label":"K518", "x":20, "y":5.5}, {"label":"K519", "x":21.5, "y":5.5, "w":2}, {"label":"K520", "x":23.5, "y":5.5}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 4.5, "y": 0}, + {"matrix": [0, 4], "x": 5.5, "y": 0}, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 9, "y": 0}, + {"matrix": [0, 8], "x": 10, "y": 0}, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13.5, "y": 0}, + {"matrix": [0, 12], "x": 14.5, "y": 0}, + {"matrix": [0, 13], "x": 15.5, "y": 0}, + {"matrix": [0, 14], "x": 16.5, "y": 0}, + {"matrix": [0, 15], "x": 18, "y": 0}, + {"matrix": [0, 16], "x": 19, "y": 0}, + {"matrix": [0, 17], "x": 20, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + {"matrix": [1, 13], "x": 13.5, "y": 1.5}, + {"matrix": [1, 14], "x": 14.5, "y": 1.5}, + {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2}, + {"matrix": [1, 16], "x": 18, "y": 1.5}, + {"matrix": [1, 17], "x": 19, "y": 1.5}, + {"matrix": [1, 18], "x": 20, "y": 1.5}, + {"matrix": [1, 19], "x": 21.5, "y": 1.5}, + {"matrix": [1, 20], "x": 22.5, "y": 1.5}, + {"matrix": [1, 21], "x": 23.5, "y": 1.5}, + {"matrix": [1, 22], "x": 24.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 3], "x": 4, "y": 2.5}, + {"matrix": [2, 4], "x": 5, "y": 2.5}, + {"matrix": [2, 5], "x": 6, "y": 2.5}, + {"matrix": [2, 6], "x": 7, "y": 2.5}, + {"matrix": [2, 7], "x": 8, "y": 2.5}, + {"matrix": [2, 8], "x": 9, "y": 2.5}, + {"matrix": [2, 9], "x": 10, "y": 2.5}, + {"matrix": [2, 10], "x": 11, "y": 2.5}, + {"matrix": [2, 11], "x": 12, "y": 2.5}, + {"matrix": [2, 12], "x": 13, "y": 2.5}, + {"matrix": [2, 13], "x": 14, "y": 2.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5}, + {"matrix": [2, 16], "x": 18, "y": 2.5}, + {"matrix": [2, 17], "x": 19, "y": 2.5}, + {"matrix": [2, 18], "x": 20, "y": 2.5}, + {"matrix": [2, 19], "x": 21.5, "y": 2.5}, + {"matrix": [2, 20], "x": 22.5, "y": 2.5}, + {"matrix": [2, 21], "x": 23.5, "y": 2.5}, + {"matrix": [2, 22], "x": 24.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.75}, + {"matrix": [3, 3], "x": 4.25, "y": 3.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.5}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, + {"matrix": [3, 6], "x": 7.25, "y": 3.5}, + {"matrix": [3, 7], "x": 8.25, "y": 3.5}, + {"matrix": [3, 8], "x": 9.25, "y": 3.5}, + {"matrix": [3, 9], "x": 10.25, "y": 3.5}, + {"matrix": [3, 10], "x": 11.25, "y": 3.5}, + {"matrix": [3, 11], "x": 12.25, "y": 3.5}, + {"matrix": [3, 12], "x": 13.25, "y": 3.5}, + {"matrix": [3, 13], "x": 14.25, "y": 3.5}, + {"matrix": [3, 14], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [3, 15], "x": 18, "y": 3.5}, + {"matrix": [3, 16], "x": 19, "y": 3.5}, + {"matrix": [3, 17], "x": 20, "y": 3.5}, + {"matrix": [3, 18], "x": 21.5, "y": 3.5}, + {"matrix": [3, 19], "x": 22.5, "y": 3.5}, + {"matrix": [3, 20], "x": 23.5, "y": 3.5}, + {"matrix": [3, 21], "x": 24.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 2.25}, + {"matrix": [4, 3], "x": 4.75, "y": 4.5}, + {"matrix": [4, 4], "x": 5.75, "y": 4.5}, + {"matrix": [4, 5], "x": 6.75, "y": 4.5}, + {"matrix": [4, 6], "x": 7.75, "y": 4.5}, + {"matrix": [4, 7], "x": 8.75, "y": 4.5}, + {"matrix": [4, 8], "x": 9.75, "y": 4.5}, + {"matrix": [4, 9], "x": 10.75, "y": 4.5}, + {"matrix": [4, 10], "x": 11.75, "y": 4.5}, + {"matrix": [4, 11], "x": 12.75, "y": 4.5}, + {"matrix": [4, 12], "x": 13.75, "y": 4.5}, + {"matrix": [4, 13], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 14], "x": 16.5, "y": 4.5}, + {"matrix": [4, 15], "x": 18, "y": 4.5}, + {"matrix": [4, 16], "x": 19, "y": 4.5}, + {"matrix": [4, 17], "x": 20, "y": 4.5}, + {"matrix": [4, 18], "x": 21.5, "y": 4.5}, + {"matrix": [4, 19], "x": 22.5, "y": 4.5}, + {"matrix": [4, 20], "x": 23.5, "y": 4.5}, + {"matrix": [4, 21], "x": 24.5, "y": 4.5, "h": 2}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 3], "x": 4, "y": 5.5}, + {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 7], "x": 6.5, "y": 5.5, "w": 7}, + {"matrix": [5, 12], "x": 13.5, "y": 5.5}, + {"matrix": [5, 13], "x": 14.5, "y": 5.5}, + {"matrix": [5, 14], "x": 15.5, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5}, + {"matrix": [5, 16], "x": 18, "y": 5.5}, + {"matrix": [5, 17], "x": 19, "y": 5.5}, + {"matrix": [5, 18], "x": 20, "y": 5.5}, + {"matrix": [5, 19], "x": 21.5, "y": 5.5, "w": 2}, + {"matrix": [5, 20], "x": 23.5, "y": 5.5} + ] } } } diff --git a/keyboards/viktus/omnikey_bh/omnikey_bh.h b/keyboards/viktus/omnikey_bh/omnikey_bh.h deleted file mode 100644 index f36184f3905a..000000000000 --- a/keyboards/viktus/omnikey_bh/omnikey_bh.h +++ /dev/null @@ -1,19 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, K121, K122, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, K221, K222, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, K319, K320, K321, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, K419, K420, K421, \ - K500, K501, K502, K503, K504, K507, K512, K513, K514, K515, K516, K517, K518, K519, K520 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, K017, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, K120, K121, K122 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, K220, K221, K222 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, K316, K317, K318, K319, K320, K321, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K415, K416, K417, K418, K419, K420, K421, KC_NO }, \ - { K500, K501, K502, K503, K504, KC_NO, KC_NO, K507, KC_NO, KC_NO, KC_NO, KC_NO, K512, K513, K514, K515, K516, K517, K518, K519, K520, KC_NO, KC_NO } \ -} diff --git a/keyboards/walletburner/neuron/info.json b/keyboards/walletburner/neuron/info.json index d66824fa2420..5387ebde1b23 100644 --- a/keyboards/walletburner/neuron/info.json +++ b/keyboards/walletburner/neuron/info.json @@ -20,7 +20,52 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back
Space", "x":11, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":6.25, "y":1}, {"label":"J", "x":7.25, "y":1}, {"label":"K", "x":8.25, "y":1}, {"label":"L", "x":9.25, "y":1}, {"label":"Enter", "x":10.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"label":"N", "x":6.75, "y":2}, {"label":"M", "x":7.75, "y":2}, {"label":"<", "x":8.75, "y":2}, {"label":"Shift", "x":9.75, "y":2, "w":1.25}, {"label":"Fn", "x":11, "y":2}, {"label":"Hyper", "x":1, "y":3, "w":1.25}, {"label":"Super", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3, "w":1.75}, {"x":5.25, "y":3}, {"x":6.25, "y":3, "w":2.25}, {"label":"Meta", "x":8.5, "y":3, "w":1.25}, {"label":"Super", "x":9.75, "y":3, "w":1.25}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2, "w": 1.25}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 1], "x": 1, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.5, "y": 3, "w": 1.75}, + {"matrix": [3, 6], "x": 5.25, "y": 3}, + {"matrix": [3, 8], "x": 6.25, "y": 3, "w": 2.25}, + {"matrix": [3, 10], "x": 8.5, "y": 3, "w": 1.25}, + {"matrix": [3, 11], "x": 9.75, "y": 3, "w": 1.25} + ] } } } diff --git a/keyboards/walletburner/neuron/neuron.h b/keyboards/walletburner/neuron/neuron.h deleted file mode 100644 index b224260d2f76..000000000000 --- a/keyboards/walletburner/neuron/neuron.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K111, \ - K200, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \ - K301, K302, K303, K306, K308, K310, K311 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K111 }, \ - { K200, KC_NO, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \ - { KC_NO, K301, K302, K303, KC_NO, KC_NO, K306, KC_NO, K308, KC_NO, K310, K311 } \ -} - diff --git a/keyboards/waterfowl/info.json b/keyboards/waterfowl/info.json index 0ee5b095b113..1ed35a14f2ce 100644 --- a/keyboards/waterfowl/info.json +++ b/keyboards/waterfowl/info.json @@ -27,49 +27,53 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":1}, - {"x":1, "y":0.25}, - {"x":2, "y":0}, - {"x":3, "y":0.375}, - {"x":4, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.375}, - {"x":11, "y":0}, - {"x":12, "y":0.25}, - {"x":13, "y":1}, + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 0.25}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0.375}, + {"matrix": [0, 4], "x": 4, "y": 0.5}, - {"x":0, "y":2}, - {"x":1, "y":1.25}, - {"x":2, "y":1}, - {"x":3, "y":1.375}, - {"x":4, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.375}, - {"x":11, "y":1}, - {"x":12, "y":1.25}, - {"x":13, "y":2}, + {"matrix": [4, 4], "x": 9, "y": 0.5}, + {"matrix": [4, 3], "x": 10, "y": 0.375}, + {"matrix": [4, 2], "x": 11, "y": 0}, + {"matrix": [4, 1], "x": 12, "y": 0.25}, + {"matrix": [4, 0], "x": 13, "y": 1}, - {"x":0, "y":3}, - {"x":1, "y":2.25}, - {"x":2, "y":2}, - {"x":3, "y":2.375}, - {"x":4, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.375}, - {"x":11, "y":2}, - {"x":12, "y":2.25}, - {"x":13, "y":3}, + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1.375}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, - {"x":2, "y":3.5}, - {"x":3.5, "y":3.5}, - {"x":4.5, "y":3.7}, - {"x":5.5, "y":4.1}, - {"x":5.5, "y":2.5}, - {"x":7.5, "y":2.5}, - {"x":7.5, "y":4.1}, - {"x":8.5, "y":3.7}, - {"x":9.5, "y":3.5}, - {"x":11, "y":3.5} + {"matrix": [5, 4], "x": 9, "y": 1.5}, + {"matrix": [5, 3], "x": 10, "y": 1.375}, + {"matrix": [5, 2], "x": 11, "y": 1}, + {"matrix": [5, 1], "x": 12, "y": 1.25}, + {"matrix": [5, 0], "x": 13, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2.375}, + {"matrix": [2, 4], "x": 4, "y": 2.5}, + + {"matrix": [6, 4], "x": 9, "y": 2.5}, + {"matrix": [6, 3], "x": 10, "y": 2.375}, + {"matrix": [6, 2], "x": 11, "y": 2}, + {"matrix": [6, 1], "x": 12, "y": 2.25}, + {"matrix": [6, 0], "x": 13, "y": 3}, + + {"matrix": [3, 0], "x": 2, "y": 3.5}, + {"matrix": [3, 1], "x": 3.5, "y": 3.5}, + {"matrix": [3, 2], "x": 4.5, "y": 3.7}, + {"matrix": [3, 3], "x": 5.5, "y": 4.1}, + {"matrix": [3, 4], "x": 5.5, "y": 2.5}, + + {"matrix": [7, 4], "x": 7.5, "y": 2.5}, + {"matrix": [7, 3], "x": 7.5, "y": 4.1}, + {"matrix": [7, 2], "x": 8.5, "y": 3.7}, + {"matrix": [7, 1], "x": 9.5, "y": 3.5}, + {"matrix": [7, 0], "x": 11, "y": 3.5} ] } } diff --git a/keyboards/waterfowl/waterfowl.c b/keyboards/waterfowl/waterfowl.c index 55dcdf4796f9..fb30fd00780d 100644 --- a/keyboards/waterfowl/waterfowl.c +++ b/keyboards/waterfowl/waterfowl.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "waterfowl.h" +#include "quantum.h" #ifdef ENCODER_ENABLE bool encoder_update_kb(uint8_t index, bool clockwise) { diff --git a/keyboards/waterfowl/waterfowl.h b/keyboards/waterfowl/waterfowl.h deleted file mode 100644 index 0c7f897dbfcd..000000000000 --- a/keyboards/waterfowl/waterfowl.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2022 CyanDuck -* -* 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 3 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, R04, R03, R02, R01, R00, \ - L05, L06, L07, L08, L09, R09, R08, R07, R06, R05, \ - L10, L11, L12, L13, L14, R14, R13, R12, R11, R10, \ - L15, L16, L17, L18, L19, R19, R18, R17, R16, R15 \ -) \ -{ \ - { L00, L01, L02, L03, L04 }, \ - { L05, L06, L07, L08, L09 }, \ - { L10, L11, L12, L13, L14 }, \ - { L15, L16, L17, L18, L19 }, \ - { R00, R01, R02, R03, R04 }, \ - { R05, R06, R07, R08, R09 }, \ - { R10, R11, R12, R13, R14 }, \ - { R15, R16, R17, R18, R19}, \ -} diff --git a/keyboards/weirdo/ls_60/info.json b/keyboards/weirdo/ls_60/info.json index 94cf75c25cd1..f386d40b6699 100644 --- a/keyboards/weirdo/ls_60/info.json +++ b/keyboards/weirdo/ls_60/info.json @@ -22,71 +22,75 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K0", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K010", "x":10, "y":0}, - {"label":"K011", "x":11, "y":0}, - {"label":"K012", "x":12, "y":0}, - {"label":"K013", "x":13, "y":0}, - {"label":"K014", "x":14, "y":0}, - {"label":"K10", "x":0, "y":1, "w":1.5}, - {"label":"K11", "x":1.5, "y":1}, - {"label":"K12", "x":2.5, "y":1}, - {"label":"K13", "x":3.5, "y":1}, - {"label":"K14", "x":4.5, "y":1}, - {"label":"K15", "x":5.5, "y":1}, - {"label":"K16", "x":6.5, "y":1}, - {"label":"K17", "x":7.5, "y":1}, - {"label":"K18", "x":8.5, "y":1}, - {"label":"K19", "x":9.5, "y":1}, - {"label":"K110", "x":10.5, "y":1}, - {"label":"K111", "x":11.5, "y":1}, - {"label":"K112", "x":12.5, "y":1}, - {"label":"K113", "x":13.5, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K21", "x":1.75, "y":2}, - {"label":"K22", "x":2.75, "y":2}, - {"label":"K23", "x":3.75, "y":2}, - {"label":"K24", "x":4.75, "y":2}, - {"label":"K25", "x":5.75, "y":2}, - {"label":"K26", "x":6.75, "y":2}, - {"label":"K27", "x":7.75, "y":2}, - {"label":"K28", "x":8.75, "y":2}, - {"label":"K29", "x":9.75, "y":2}, - {"label":"K210", "x":10.75, "y":2}, - {"label":"K211", "x":11.75, "y":2}, - {"label":"K212", "x":12.75, "y":2}, - {"label":"K213", "x":13.75, "y":2, "w":1.25}, - {"label":"K30", "x":0, "y":3, "w":1.25}, - {"label":"K31", "x":1.25, "y":3}, - {"label":"K32", "x":2.25, "y":3}, - {"label":"K33", "x":3.25, "y":3}, - {"label":"K34", "x":4.25, "y":3}, - {"label":"K35", "x":5.25, "y":3}, - {"label":"K36", "x":6.25, "y":3}, - {"label":"K37", "x":7.25, "y":3}, - {"label":"K38", "x":8.25, "y":3}, - {"label":"K39", "x":9.25, "y":3}, - {"label":"K310", "x":10.25, "y":3}, - {"label":"K311", "x":11.25, "y":3}, - {"label":"K312", "x":12.25, "y":3, "w":1.75}, - {"label":"K313", "x":14, "y":3}, - {"label":"K40", "x":0, "y":4, "w":1.25}, - {"label":"K41", "x":1.25, "y":4, "w":1.25}, - {"label":"K42", "x":2.5, "y":4, "w":1.25}, - {"label":"K46", "x":3.75, "y":4, "w":6.25}, - {"label":"K410", "x":10, "y":4, "w":1.25}, - {"label":"K411", "x":11.25, "y":4, "w":1.25}, - {"label":"K412", "x":12.5, "y":4, "w":1.25}, - {"label":"K413", "x":13.75, "y":4, "w":1.25} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 4], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 11.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 12.5, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 13.75, "y": 4, "w": 1.25} ] } } diff --git a/keyboards/weirdo/ls_60/ls_60.c b/keyboards/weirdo/ls_60/ls_60.c index 12950fdba53a..d21a250d702a 100644 --- a/keyboards/weirdo/ls_60/ls_60.c +++ b/keyboards/weirdo/ls_60/ls_60.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "ls_60.h" +#include "quantum.h" void led_update_ports(led_t led_state) { diff --git a/keyboards/weirdo/ls_60/ls_60.h b/keyboards/weirdo/ls_60/ls_60.h deleted file mode 100644 index b099521b9eab..000000000000 --- a/keyboards/weirdo/ls_60/ls_60.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2021 Weirdo -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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313, \ - K40, K41, K42, K46, K410, K411, K412, K413 ) \ - { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K010, K011, K012, K013, K014}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K110, K111, K112, K113 }, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K210, K211, K212, K213 }, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K310, K311, K312, K313 }, \ - {K40, K41, K42, K46, K410, K411, K412, K413 } \ - } diff --git a/keyboards/weirdo/naiping/npminila/info.json b/keyboards/weirdo/naiping/npminila/info.json index df826600daa4..5162849225e0 100644 --- a/keyboards/weirdo/naiping/npminila/info.json +++ b/keyboards/weirdo/naiping/npminila/info.json @@ -22,72 +22,76 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00", "x":0, "y":0}, - {"label":"K01", "x":1, "y":0}, - {"label":"K02", "x":2, "y":0}, - {"label":"K03", "x":3, "y":0}, - {"label":"K04", "x":4, "y":0}, - {"label":"K05", "x":5, "y":0}, - {"label":"K06", "x":6, "y":0}, - {"label":"K07", "x":7, "y":0}, - {"label":"K08", "x":8, "y":0}, - {"label":"K09", "x":9, "y":0}, - {"label":"K0A", "x":10, "y":0}, - {"label":"K0B", "x":11, "y":0}, - {"label":"K0C", "x":12, "y":0}, - {"label":"K0D", "x":13, "y":0, "w":2}, - {"label":"K10", "x":0, "y":1, "w":1.5}, - {"label":"K11", "x":1.5, "y":1}, - {"label":"K12", "x":2.5, "y":1}, - {"label":"K13", "x":3.5, "y":1}, - {"label":"K14", "x":4.5, "y":1}, - {"label":"K15", "x":5.5, "y":1}, - {"label":"K16", "x":6.5, "y":1}, - {"label":"K17", "x":7.5, "y":1}, - {"label":"K18", "x":8.5, "y":1}, - {"label":"K19", "x":9.5, "y":1}, - {"label":"K1A", "x":10.5, "y":1}, - {"label":"K1B", "x":11.5, "y":1}, - {"label":"K1C", "x":12.5, "y":1}, - {"label":"K1D", "x":13.5, "y":1, "w":1.5}, - {"label":"K20", "x":0, "y":2, "w":1.75}, - {"label":"K21", "x":1.75, "y":2}, - {"label":"K22", "x":2.75, "y":2}, - {"label":"K23", "x":3.75, "y":2}, - {"label":"K24", "x":4.75, "y":2}, - {"label":"K25", "x":5.75, "y":2}, - {"label":"K26", "x":6.75, "y":2}, - {"label":"K27", "x":7.75, "y":2}, - {"label":"K28", "x":8.75, "y":2}, - {"label":"K29", "x":9.75, "y":2}, - {"label":"K2A", "x":10.75, "y":2}, - {"label":"K2B", "x":11.75, "y":2}, - {"label":"K2D", "x":12.75, "y":2, "w":2.25}, - {"label":"K30", "x":0, "y":3, "w":2}, - {"label":"K31", "x":2, "y":3}, - {"label":"K32", "x":3, "y":3}, - {"label":"K33", "x":4, "y":3}, - {"label":"K34", "x":5, "y":3}, - {"label":"K35", "x":6, "y":3}, - {"label":"K36", "x":7, "y":3}, - {"label":"K37", "x":8, "y":3}, - {"label":"K38", "x":9, "y":3}, - {"label":"K39", "x":10, "y":3}, - {"label":"K3A", "x":11, "y":3}, - {"label":"K3B", "x":12, "y":3}, - {"label":"K3C", "x":13, "y":3}, - {"label":"K3D", "x":14, "y":3}, - {"label":"K40", "x":0, "y":4, "w":1.75}, - {"label":"K41", "x":1.75, "y":4, "w":1.25}, - {"label":"K42", "x":3, "y":4, "w":1.25}, - {"label":"K43", "x":4.25, "y":4, "w":1.25}, - {"label":"K46", "x":5.5, "y":4, "w":2.75}, - {"label":"K48", "x":8.25, "y":4, "w":1.25}, - {"label":"K49", "x":9.5, "y":4, "w":1.25}, - {"label":"K4A", "x":10.75, "y":4, "w":1.25}, - {"label":"K4B", "x":12, "y":4}, - {"label":"K4C", "x":13, "y":4}, - {"label":"K4D", "x":14, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 5.5, "y": 4, "w": 2.75}, + {"matrix": [4, 8], "x": 8.25, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 9.5, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/weirdo/naiping/npminila/npminila.h b/keyboards/weirdo/naiping/npminila/npminila.h deleted file mode 100644 index 3d0d927a0b66..000000000000 --- a/keyboards/weirdo/naiping/npminila/npminila.h +++ /dev/null @@ -1,30 +0,0 @@ -/* -Copyright 2021 Weirdo -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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \ - K40, K41, K42, K43, K46, K48, K49, K4A, K4B, K4C, K4D) \ - { \ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}, \ - {K40, K41, K42, K43, KC_NO, KC_NO, K46, KC_NO,K48, K49, K4A, K4B, K4C, K4D} \ - } diff --git a/keyboards/weirdo/tiger910/info.json b/keyboards/weirdo/tiger910/info.json index d09e61840873..526b9be4d16a 100644 --- a/keyboards/weirdo/tiger910/info.json +++ b/keyboards/weirdo/tiger910/info.json @@ -18,71 +18,76 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"K00 (B0,B5)", "x":0, "y":0}, - {"label":"K01 (B0,B6)", "x":1, "y":0}, - {"label":"K02 (B0,B7)", "x":2, "y":0}, - {"label":"K03 (B0,C0)", "x":3, "y":0}, - {"label":"K04 (B0,C1)", "x":4, "y":0}, - {"label":"K05 (B0,C2)", "x":5, "y":0}, - {"label":"K06 (B0,C3)", "x":6, "y":0}, - {"label":"K07 (B0,C4)", "x":7, "y":0}, - {"label":"K08 (B0,C5)", "x":8, "y":0}, - {"label":"K09 (B0,C6)", "x":9, "y":0}, - {"label":"K0A (B0,C7)", "x":10, "y":0}, - {"label":"K0B (B0,D0)", "x":11, "y":0}, - {"label":"K0C (B0,D1)", "x":12, "y":0}, - {"label":"K0E (B0,D3)", "x":13, "y":0, "w":2}, - {"label":"K10 (B1,B5)", "x":0, "y":1, "w":1.5}, - {"label":"K11 (B1,B6)", "x":1.5, "y":1}, - {"label":"K12 (B1,B7)", "x":2.5, "y":1}, - {"label":"K13 (B1,C0)", "x":3.5, "y":1}, - {"label":"K14 (B1,C1)", "x":4.5, "y":1}, - {"label":"K15 (B1,C2)", "x":5.5, "y":1}, - {"label":"K16 (B1,C3)", "x":6.5, "y":1}, - {"label":"K17 (B1,C4)", "x":7.5, "y":1}, - {"label":"K18 (B1,C5)", "x":8.5, "y":1}, - {"label":"K19 (B1,C6)", "x":9.5, "y":1}, - {"label":"K1A (B1,C7)", "x":10.5, "y":1}, - {"label":"K1B (B1,D0)", "x":11.5, "y":1}, - {"label":"K1C (B1,D1)", "x":12.5, "y":1}, - {"label":"K1E (B1,D3)", "x":13.5, "y":1, "w":1.5}, - {"label":"K1F (B1,D4)", "x":15, "y":1}, - {"label":"K20 (B2,B5)", "x":0, "y":2, "w":1.75}, - {"label":"K21 (B2,B6)", "x":1.75, "y":2}, - {"label":"K22 (B2,B7)", "x":2.75, "y":2}, - {"label":"K23 (B2,C0)", "x":3.75, "y":2}, - {"label":"K24 (B2,C1)", "x":4.75, "y":2}, - {"label":"K25 (B2,C2)", "x":5.75, "y":2}, - {"label":"K26 (B2,C3)", "x":6.75, "y":2}, - {"label":"K27 (B2,C4)", "x":7.75, "y":2}, - {"label":"K28 (B2,C5)", "x":8.75, "y":2}, - {"label":"K29 (B2,C6)", "x":9.75, "y":2}, - {"label":"K2A (B2,C7)", "x":10.75, "y":2}, - {"label":"K2B (B2,D0)", "x":11.75, "y":2}, - {"label":"K2D (B2,D2)", "x":12.75, "y":2, "w":2.25}, - {"label":"K2F (B2,D4)", "x":15, "y":2}, - {"label":"K30 (B3,B5)", "x":0, "y":3, "w":2.25}, - {"label":"K32 (B3,B7)", "x":2.25, "y":3}, - {"label":"K33 (B3,C0)", "x":3.25, "y":3}, - {"label":"K34 (B3,C1)", "x":4.25, "y":3}, - {"label":"K35 (B3,C2)", "x":5.25, "y":3}, - {"label":"K36 (B3,C3)", "x":6.25, "y":3}, - {"label":"K37 (B3,C4)", "x":7.25, "y":3}, - {"label":"K38 (B3,C5)", "x":8.25, "y":3}, - {"label":"K39 (B3,C6)", "x":9.25, "y":3}, - {"label":"K3A (B3,C7)", "x":10.25, "y":3}, - {"label":"K3B (B3,D0)", "x":11.25, "y":3}, - {"label":"K3C (B3,D1)", "x":12.25, "y":3, "w":1.75}, - {"label":"K3E (B3,D3)", "x":14, "y":3}, - {"label":"K3F (B3,D4)", "x":15, "y":3}, - {"label":"K40 (B4,B5)", "x":0, "y":4, "w":1.5}, - {"label":"K41 (B4,B6)", "x":1.5, "y":4}, - {"label":"K42 (B4,B7)", "x":2.5, "y":4, "w":1.5}, - {"label":"K46 (B4,C3)", "x":4, "y":4, "w":7}, - {"label":"K4B (B4,D0)", "x":11, "y":4, "w":1.5}, - {"label":"K4C (B4,D1)", "x":13, "y":4}, - {"label":"K4E (B4,D3)", "x":14, "y":4}, - {"label":"K4F (B4,D4)", "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 14], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 14], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 15], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 15], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 14, "y": 3}, + {"matrix": [3, 15], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 7}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 14], "x": 14, "y": 4}, + {"matrix": [4, 15], "x": 15, "y": 4} ] } } diff --git a/keyboards/weirdo/tiger910/tiger910.h b/keyboards/weirdo/tiger910/tiger910.h deleted file mode 100644 index 529c12fc5ee1..000000000000 --- a/keyboards/weirdo/tiger910/tiger910.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Weirdo - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1E, K1F, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2F, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, K3F, \ - K40, K41, K42, K46, K4B, K4C, K4E, K4F \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO, K0E, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, KC_NO, K1E, K1F }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO, K2F }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E, K3F }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, KC_NO, KC_NO, K4B, K4C, KC_NO, K4E, K4F }, \ -} diff --git a/keyboards/westfoxtrot/cyclops/cyclops.h b/keyboards/westfoxtrot/cyclops/cyclops.h deleted file mode 100644 index 50744929de37..000000000000 --- a/keyboards/westfoxtrot/cyclops/cyclops.h +++ /dev/null @@ -1,43 +0,0 @@ -/* Copyright 2018 westfoxtrot - * - * 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 XXX KC_NO - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - k10, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k4D, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ - k40, k41, k42, k46, k4A, k4B, k4C, k4E, k2E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, XXX, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ - { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4A, k4B, k4C, k4D, k4E } \ -} diff --git a/keyboards/westfoxtrot/cyclops/info.json b/keyboards/westfoxtrot/cyclops/info.json index 419a53588bfe..fe6b685be3cf 100644 --- a/keyboards/westfoxtrot/cyclops/info.json +++ b/keyboards/westfoxtrot/cyclops/info.json @@ -18,77 +18,79 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":7, "y":0}, - {"label":"*", "x":8, "y":0}, - {"label":"(", "x":9, "y":0}, - {"label":")", "x":10, "y":0}, - {"label":"_", "x":11, "y":0}, - {"label":"+", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Page Up", "x":15.5, "y":0}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"{", "x":11.5, "y":1}, - {"label":"}", "x":12.5, "y":1}, - {"label":"Page Down", "x":15.5, "y":1}, + {"matrix": [0, 14], "x": 15.5, "y": 0}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":":", "x":10.75, "y":2}, - {"label":"\"", "x":11.75, "y":2}, - {"label":"~", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 2], "x": 1.5, "y": 1}, + {"matrix": [1, 3], "x": 2.5, "y": 1}, + {"matrix": [1, 4], "x": 3.5, "y": 1}, + {"matrix": [1, 5], "x": 4.5, "y": 1}, + {"matrix": [1, 6], "x": 5.5, "y": 1}, + {"matrix": [1, 7], "x": 6.5, "y": 1}, + {"matrix": [1, 8], "x": 7.5, "y": 1}, + {"matrix": [1, 9], "x": 8.5, "y": 1}, + {"matrix": [1, 10], "x": 9.5, "y": 1}, + {"matrix": [1, 11], "x": 10.5, "y": 1}, + {"matrix": [1, 12], "x": 11.5, "y": 1}, + {"matrix": [1, 13], "x": 12.5, "y": 1}, - {"label":"Shift", "x":0, "y":3, "w":1.5}, - {"label":"|", "x":1.5, "y":3}, - {"label":"Z", "x":2.5, "y":3}, - {"label":"X", "x":3.5, "y":3}, - {"label":"C", "x":4.5, "y":3}, - {"label":"V", "x":5.5, "y":3}, - {"label":"B", "x":6.5, "y":3}, - {"label":"N", "x":7.5, "y":3}, - {"label":"M", "x":8.5, "y":3}, - {"label":"<", "x":9.5, "y":3}, - {"label":">", "x":10.5, "y":3}, - {"label":"?", "x":11.5, "y":3}, - {"x":12.5, "y":3}, - {"label":"Shift", "x":13.5, "y":3}, - {"label":"\u2191", "x":14.5, "y":3}, + {"matrix": [1, 14], "x": 15.5, "y": 1}, - {"label":"Ctrl", "x":0, "y":4, "w":1.5}, - {"label":"Win", "x":1.5, "y":4, "w":1.25}, - {"label":"Alt", "x":2.75, "y":4, "w":1.5}, - {"x":4.25, "y":4, "w":6.5}, - {"label":"Alt", "x":10.75, "y":4, "w":1.5}, - {"label":"Ctrl", "x":12.25, "y":4, "w":1.25}, - {"label":"\u2190", "x":13.5, "y":4}, - {"label":"\u2193", "x":14.5, "y":4}, - {"label":"\u2192", "x":15.5, "y":4} + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 2], "x": 1.75, "y": 2}, + {"matrix": [2, 3], "x": 2.75, "y": 2}, + {"matrix": [2, 4], "x": 3.75, "y": 2}, + {"matrix": [2, 5], "x": 4.75, "y": 2}, + {"matrix": [2, 6], "x": 5.75, "y": 2}, + {"matrix": [2, 7], "x": 6.75, "y": 2}, + {"matrix": [2, 8], "x": 7.75, "y": 2}, + {"matrix": [2, 9], "x": 8.75, "y": 2}, + {"matrix": [2, 10], "x": 9.75, "y": 2}, + {"matrix": [2, 11], "x": 10.75, "y": 2}, + {"matrix": [2, 12], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2}, + {"matrix": [4, 13], "x": 13.75, "y": 1, "w": 1.25, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.5}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [3, 7], "x": 7.5, "y": 3}, + {"matrix": [3, 8], "x": 8.5, "y": 3}, + {"matrix": [3, 9], "x": 9.5, "y": 3}, + {"matrix": [3, 10], "x": 10.5, "y": 3}, + {"matrix": [3, 11], "x": 11.5, "y": 3}, + {"matrix": [3, 12], "x": 12.5, "y": 3}, + {"matrix": [3, 13], "x": 13.5, "y": 3}, + {"matrix": [3, 14], "x": 14.5, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.75, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4.25, "y": 4, "w": 6.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13.5, "y": 4}, + {"matrix": [4, 14], "x": 14.5, "y": 4}, + {"matrix": [2, 14], "x": 15.5, "y": 4} ] } } diff --git a/keyboards/wilba_tech/rama_works_m50_a/info.json b/keyboards/wilba_tech/rama_works_m50_a/info.json index e26b56dd2fda..33efc06916d9 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/info.json +++ b/keyboards/wilba_tech/rama_works_m50_a/info.json @@ -17,7 +17,66 @@ "bootloader": "atmel-dfu", "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.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":8.25, "y":0}, {"x":9.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":0, "y":1}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":0, "y":2}, {"x":1.25, "y":2}, {"x":2.25, "y":2}, {"x":3.25, "y":2}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":0, "y":3}, {"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, "w":2}, {"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}] + "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1}, + {"matrix": [1, 12], "x": 12.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3, "w": 2}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3} + ] } } } diff --git a/keyboards/wilba_tech/rama_works_m50_a/rama_works_m50_a.h b/keyboards/wilba_tech/rama_works_m50_a/rama_works_m50_a.h index 25759acfbde3..24dae9d7d066 100644 --- a/keyboards/wilba_tech/rama_works_m50_a/rama_works_m50_a.h +++ b/keyboards/wilba_tech/rama_works_m50_a/rama_works_m50_a.h @@ -18,26 +18,3 @@ #include "quantum.h" #include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h" #include "via.h" - -#define ___ KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K38, K39, K3A, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, ___, K38, K39, K3A, K3B, K3C } \ -} - diff --git a/keyboards/wilba_tech/rama_works_m50_ax/info.json b/keyboards/wilba_tech/rama_works_m50_ax/info.json index fc296c275491..8126b7507f2d 100644 --- a/keyboards/wilba_tech/rama_works_m50_ax/info.json +++ b/keyboards/wilba_tech/rama_works_m50_ax/info.json @@ -17,7 +17,67 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.25, "y":0}, {"label":"0,6", "x":6.25, "y":0}, {"label":"0,7", "x":7.25, "y":0}, {"label":"0,8", "x":8.25, "y":0}, {"label":"0,9", "x":9.25, "y":0}, {"label":"0,10", "x":10.25, "y":0}, {"label":"0,11", "x":11.25, "y":0}, {"label":"0,12", "x":12.25, "y":0}, {"label":"1,0", "x":0, "y":1}, {"label":"1,1", "x":1.25, "y":1}, {"label":"1,2", "x":2.25, "y":1}, {"label":"1,3", "x":3.25, "y":1}, {"label":"1,4", "x":4.25, "y":1}, {"label":"1,5", "x":5.25, "y":1}, {"label":"1,6", "x":6.25, "y":1}, {"label":"1,7", "x":7.25, "y":1}, {"label":"1,8", "x":8.25, "y":1}, {"label":"1,9", "x":9.25, "y":1}, {"label":"1,10", "x":10.25, "y":1}, {"label":"1,11", "x":11.25, "y":1}, {"label":"1,12", "x":12.25, "y":1}, {"label":"2,0", "x":0, "y":2}, {"label":"2,1", "x":1.25, "y":2}, {"label":"2,2", "x":2.25, "y":2}, {"label":"2,3", "x":3.25, "y":2}, {"label":"2,4", "x":4.25, "y":2}, {"label":"2,5", "x":5.25, "y":2}, {"label":"2,6", "x":6.25, "y":2}, {"label":"2,7", "x":7.25, "y":2}, {"label":"2,8", "x":8.25, "y":2}, {"label":"2,9", "x":9.25, "y":2}, {"label":"2,10", "x":10.25, "y":2}, {"label":"2,11", "x":11.25, "y":2}, {"label":"2,12", "x":12.25, "y":2}, {"label":"3,0", "x":0, "y":3}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3}] + "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.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + {"matrix": [0, 7], "x": 7.25, "y": 0}, + {"matrix": [0, 8], "x": 8.25, "y": 0}, + {"matrix": [0, 9], "x": 9.25, "y": 0}, + {"matrix": [0, 10], "x": 10.25, "y": 0}, + {"matrix": [0, 11], "x": 11.25, "y": 0}, + {"matrix": [0, 12], "x": 12.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, + {"matrix": [1, 9], "x": 9.25, "y": 1}, + {"matrix": [1, 10], "x": 10.25, "y": 1}, + {"matrix": [1, 11], "x": 11.25, "y": 1}, + {"matrix": [1, 12], "x": 12.25, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2}, + {"matrix": [2, 7], "x": 7.25, "y": 2}, + {"matrix": [2, 8], "x": 8.25, "y": 2}, + {"matrix": [2, 9], "x": 9.25, "y": 2}, + {"matrix": [2, 10], "x": 10.25, "y": 2}, + {"matrix": [2, 11], "x": 11.25, "y": 2}, + {"matrix": [2, 12], "x": 12.25, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3} + ] } } } diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.h b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.h deleted file mode 100644 index 8b81e7613247..000000000000 --- a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Jason Williams (Wilba) - * - * 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" -#include "via.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C } \ -} - diff --git a/keyboards/wolf/kuku65/info.json b/keyboards/wolf/kuku65/info.json index 36022287d24e..e088a5b77790 100644 --- a/keyboards/wolf/kuku65/info.json +++ b/keyboards/wolf/kuku65/info.json @@ -18,283 +18,77 @@ "layouts": { "LAYOUT": { "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, - "w": 2 - }, - { - "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, - "w": 2.25 - }, - { - "x": 15, - "y": 2 - }, - { - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/wolf/kuku65/kuku65.h b/keyboards/wolf/kuku65/kuku65.h deleted file mode 100644 index d8ad847274df..000000000000 --- a/keyboards/wolf/kuku65/kuku65.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 -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" - -/* kuku65 Keymap Definitions */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4A, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, K2E }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, KC_NO, KC_NO, KC_NO, K46, KC_NO, KC_NO, K49, K4A, KC_NO, K4C, K4D, K4E } \ -} diff --git a/keyboards/wolf/ryujin/info.json b/keyboards/wolf/ryujin/info.json index 4a7c08060651..00e5e55c36c9 100644 --- a/keyboards/wolf/ryujin/info.json +++ b/keyboards/wolf/ryujin/info.json @@ -17,7 +17,81 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1, "y":0}, {"label":"0,2", "x":2, "y":0}, {"label":"0,3", "x":3, "y":0}, {"label":"0,4", "x":4, "y":0}, {"label":"0,5", "x":5, "y":0}, {"label":"0,6", "x":6, "y":0}, {"label":"0,7", "x":7, "y":0}, {"label":"0,8", "x":8, "y":0}, {"label":"0,9", "x":9, "y":0}, {"label":"0,10", "x":10, "y":0}, {"label":"0,11", "x":11, "y":0}, {"label":"0,12", "x":12, "y":0}, {"label":"0,13", "x":13, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"1,0", "x":0, "y":1, "w":1.5}, {"label":"1,1", "x":1.5, "y":1}, {"label":"1,2", "x":2.5, "y":1}, {"label":"1,3", "x":3.5, "y":1}, {"label":"1,4", "x":4.5, "y":1}, {"label":"1,5", "x":5.5, "y":1}, {"label":"1,6", "x":6.5, "y":1}, {"label":"1,7", "x":7.5, "y":1}, {"label":"1,8", "x":8.5, "y":1}, {"label":"1,9", "x":9.5, "y":1}, {"label":"1,10", "x":10.5, "y":1}, {"label":"1,11", "x":11.5, "y":1}, {"label":"1,12", "x":12.5, "y":1}, {"label":"1,13", "x":13.5, "y":1, "w":1.5}, {"label":"2,0", "x":0, "y":2, "w":1.75}, {"label":"2,1", "x":1.75, "y":2}, {"label":"2,2", "x":2.75, "y":2}, {"label":"2,3", "x":3.75, "y":2}, {"label":"2,4", "x":4.75, "y":2}, {"label":"2,5", "x":5.75, "y":2}, {"label":"2,6", "x":6.75, "y":2}, {"label":"2,7", "x":7.75, "y":2}, {"label":"2,8", "x":8.75, "y":2}, {"label":"2,9", "x":9.75, "y":2}, {"label":"2,10", "x":10.75, "y":2}, {"label":"2,11", "x":11.75, "y":2}, {"label":"2,12", "x":12.75, "y":2}, {"label":"2,13", "x":13.75, "y":2, "w":1.25}, {"label":"2,14", "x":15, "y":2}, {"label":"3,0", "x":0, "y":3, "w":1.25}, {"label":"3,1", "x":1.25, "y":3}, {"label":"3,2", "x":2.25, "y":3}, {"label":"3,3", "x":3.25, "y":3}, {"label":"3,4", "x":4.25, "y":3}, {"label":"3,5", "x":5.25, "y":3}, {"label":"3,6", "x":6.25, "y":3}, {"label":"3,7", "x":7.25, "y":3}, {"label":"3,8", "x":8.25, "y":3}, {"label":"3,9", "x":9.25, "y":3}, {"label":"3,10", "x":10.25, "y":3}, {"label":"3,11", "x":11.25, "y":3}, {"label":"3,12", "x":12.25, "y":3, "w":1.75}, {"label":"3,13", "x":14, "y":3}, {"label":"3,14", "x":15, "y":3}, {"label":"4,0", "x":0, "y":4, "w":1.25}, {"label":"4,1", "x":1.25, "y":4, "w":1.25}, {"label":"4,2", "x":2.5, "y":4, "w":1.25}, {"label":"4,5", "x":3.75, "y":4, "w":6.25}, {"label":"4,10", "x":10, "y":4, "w":1.25}, {"label":"4,11", "x":11.25, "y":4, "w":1.25}, {"label":"4,12", "x":13, "y":4}, {"label":"4,13", "x":14, "y":4}, {"label":"4,14", "x":15, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 1.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3}, + {"matrix": [3, 2], "x": 2.25, "y": 3}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 10], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 11], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } \ No newline at end of file diff --git a/keyboards/wolf/ryujin/ryujin.h b/keyboards/wolf/ryujin/ryujin.h deleted file mode 100644 index bd7a3ecddd90..000000000000 --- a/keyboards/wolf/ryujin/ryujin.h +++ /dev/null @@ -1,32 +0,0 @@ -/* -Copyright 2020 -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" - -/* Keymap Definitions */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K45, K4A, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, KC_NO, K4A, K4B, K4C, K4D, K4E } \ -} diff --git a/keyboards/wolf/sabre/info.json b/keyboards/wolf/sabre/info.json index 526422d945ea..96c2fce48f11 100644 --- a/keyboards/wolf/sabre/info.json +++ b/keyboards/wolf/sabre/info.json @@ -26,100 +26,113 @@ "layouts": { "LAYOUT": { "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":8.75, "y":0}, - {"label":"F6", "x":9.75, "y":0}, - {"label":"F7", "x":10.75, "y":0}, - {"label":"F8", "x":11.75, "y":0}, - {"label":"F9", "x":13, "y":0}, - {"label":"F10", "x":14, "y":0}, - {"label":"F11", "x":15, "y":0}, - {"label":"F12", "x":16, "y":0}, - {"label":"Print Screen", "x":17.25, "y":0}, - {"label":"Scroll Lock", "x":18.25, "y":0}, - {"label":"Pause", "x":19.25, "y":0}, - - {"label":"`\u00ac", "x":0, "y":1.25}, - {"label":"1!", "x":1, "y":1.25}, - {"label":"2\"", "x":2, "y":1.25}, - {"label":"3\u00a3", "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":9, "y":1.25}, - {"label":"8*", "x":10, "y":1.25}, - {"label":"9(", "x":11, "y":1.25}, - {"label":"0)", "x":12, "y":1.25}, - {"label":"-_", "x":13, "y":1.25}, - {"label":"=+", "x":14, "y":1.25}, - {"label":"BackSpace", "x":15, "y":1.25, "w":2}, - {"label":"Insert", "x":17.25, "y":1.25}, - {"label":"Home", "x":18.25, "y":1.25}, - {"label":"Page Up", "x":19.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":8.5, "y":2.25}, - {"label":"U", "x":9.5, "y":2.25}, - {"label":"I", "x":10.5, "y":2.25}, - {"label":"O", "x":11.5, "y":2.25}, - {"label":"P", "x":12.5, "y":2.25}, - {"label":"[{", "x":13.5, "y":2.25}, - {"label":"]}", "x":14.5, "y":2.25}, - {"label":"\\|", "x":15.5, "y":2.25, "w":1.5}, - {"label":"Delete", "x":17.25, "y":2.25}, - {"label":"End", "x":18.25, "y":2.25}, - {"label":"Page Down", "x":19.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":8.75, "y":3.25}, - {"label":"J", "x":9.75, "y":3.25}, - {"label":"K", "x":10.75, "y":3.25}, - {"label":"L", "x":11.75, "y":3.25}, - {"label":";:", "x":12.75, "y":3.25}, - {"label":"'@", "x":13.75, "y":3.25}, - {"label":"Enter", "x":14.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":"B", "x":8.25, "y":4.25}, - {"label":"N", "x":9.25, "y":4.25}, - {"label":"M", "x":10.25, "y":4.25}, - {"label":",<", "x":11.25, "y":4.25}, - {"label":".>", "x":12.25, "y":4.25}, - {"label":"/?", "x":13.25, "y":4.25}, - {"label":"Shift", "x":14.25, "y":4.25, "w":1.75}, - {"label":"Fn", "x":16, "y":4.25}, - {"label":"\u2191", "x":18.25, "y":4.25}, - - {"label":"Ctrl", "x":0, "y":5.25, "w":1.5}, - {"label":"GUI", "x":2.5, "y":5.25, "w":1.5}, - {"label":"Alt", "x":4, "y":5.25}, - {"label":"Space", "x":5, "y":5.25, "w":2.25}, - {"label":"Space", "x":8.25, "y":5.25, "w":2.75}, - {"label":"Alt", "x":11, "y":5.25}, - {"label":"GUI", "x":12, "y":5.25, "w":1.5}, - {"label":"Ctrl", "x":14.5, "y":5.25, "w":1.5}, - {"label":"\u2190", "x":17.25, "y":5.25}, - {"label":"\u2193", "x":18.25, "y":5.25}, - {"label":"\u2192", "x":19.25, "y":5.25} + {"matrix": [0, 0], "x": 0, "y": 0}, + + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0}, + {"matrix": [1, 2], "x": 5, "y": 0}, + + {"matrix": [1, 3], "x": 8.75, "y": 0}, + {"matrix": [0, 4], "x": 9.75, "y": 0}, + {"matrix": [1, 4], "x": 10.75, "y": 0}, + {"matrix": [0, 5], "x": 11.75, "y": 0}, + + {"matrix": [1, 5], "x": 13, "y": 0}, + {"matrix": [0, 6], "x": 14, "y": 0}, + {"matrix": [1, 6], "x": 15, "y": 0}, + {"matrix": [0, 7], "x": 16, "y": 0}, + + {"matrix": [1, 7], "x": 17.25, "y": 0}, + {"matrix": [0, 8], "x": 18.25, "y": 0}, + {"matrix": [1, 8], "x": 19.25, "y": 0}, + + {"matrix": [2, 0], "x": 0, "y": 1.25}, + {"matrix": [3, 0], "x": 1, "y": 1.25}, + {"matrix": [2, 1], "x": 2, "y": 1.25}, + {"matrix": [3, 1], "x": 3, "y": 1.25}, + {"matrix": [2, 2], "x": 4, "y": 1.25}, + {"matrix": [3, 2], "x": 5, "y": 1.25}, + {"matrix": [2, 3], "x": 6, "y": 1.25}, + + {"matrix": [3, 3], "x": 9, "y": 1.25}, + {"matrix": [2, 4], "x": 10, "y": 1.25}, + {"matrix": [3, 4], "x": 11, "y": 1.25}, + {"matrix": [2, 5], "x": 12, "y": 1.25}, + {"matrix": [3, 5], "x": 13, "y": 1.25}, + {"matrix": [2, 6], "x": 14, "y": 1.25}, + {"matrix": [3, 6], "x": 15, "y": 1.25, "w": 2}, + + {"matrix": [3, 7], "x": 17.25, "y": 1.25}, + {"matrix": [2, 8], "x": 18.25, "y": 1.25}, + {"matrix": [3, 8], "x": 19.25, "y": 1.25}, + + {"matrix": [4, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [5, 0], "x": 1.5, "y": 2.25}, + {"matrix": [4, 1], "x": 2.5, "y": 2.25}, + {"matrix": [5, 1], "x": 3.5, "y": 2.25}, + {"matrix": [4, 2], "x": 4.5, "y": 2.25}, + {"matrix": [5, 2], "x": 5.5, "y": 2.25}, + + {"matrix": [4, 3], "x": 8.5, "y": 2.25}, + {"matrix": [5, 3], "x": 9.5, "y": 2.25}, + {"matrix": [4, 4], "x": 10.5, "y": 2.25}, + {"matrix": [5, 4], "x": 11.5, "y": 2.25}, + {"matrix": [4, 5], "x": 12.5, "y": 2.25}, + {"matrix": [5, 5], "x": 13.5, "y": 2.25}, + {"matrix": [4, 6], "x": 14.5, "y": 2.25}, + {"matrix": [5, 6], "x": 15.5, "y": 2.25, "w": 1.5}, + + {"matrix": [5, 7], "x": 17.25, "y": 2.25}, + {"matrix": [4, 8], "x": 18.25, "y": 2.25}, + {"matrix": [5, 8], "x": 19.25, "y": 2.25}, + + {"matrix": [6, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [7, 0], "x": 1.75, "y": 3.25}, + {"matrix": [6, 1], "x": 2.75, "y": 3.25}, + {"matrix": [7, 1], "x": 3.75, "y": 3.25}, + {"matrix": [6, 2], "x": 4.75, "y": 3.25}, + {"matrix": [7, 2], "x": 5.75, "y": 3.25}, + + {"matrix": [6, 3], "x": 8.75, "y": 3.25}, + {"matrix": [7, 3], "x": 9.75, "y": 3.25}, + {"matrix": [6, 4], "x": 10.75, "y": 3.25}, + {"matrix": [7, 4], "x": 11.75, "y": 3.25}, + {"matrix": [6, 5], "x": 12.75, "y": 3.25}, + {"matrix": [7, 5], "x": 13.75, "y": 3.25}, + {"matrix": [7, 6], "x": 14.75, "y": 3.25, "w": 2.25}, + + {"matrix": [8, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [9, 0], "x": 2.25, "y": 4.25}, + {"matrix": [8, 1], "x": 3.25, "y": 4.25}, + {"matrix": [9, 1], "x": 4.25, "y": 4.25}, + {"matrix": [8, 2], "x": 5.25, "y": 4.25}, + {"matrix": [9, 2], "x": 6.25, "y": 4.25}, + + {"matrix": [8, 3], "x": 8.25, "y": 4.25}, + {"matrix": [9, 3], "x": 9.25, "y": 4.25}, + {"matrix": [8, 4], "x": 10.25, "y": 4.25}, + {"matrix": [9, 4], "x": 11.25, "y": 4.25}, + {"matrix": [8, 5], "x": 12.25, "y": 4.25}, + {"matrix": [9, 5], "x": 13.25, "y": 4.25}, + {"matrix": [8, 6], "x": 14.25, "y": 4.25, "w": 1.75}, + {"matrix": [9, 6], "x": 16, "y": 4.25}, + + {"matrix": [8, 8], "x": 18.25, "y": 4.25}, + + {"matrix": [10, 0], "x": 0, "y": 5.25, "w": 1.5}, + {"matrix": [11, 0], "x": 2.5, "y": 5.25, "w": 1.5}, + {"matrix": [10, 1], "x": 4, "y": 5.25}, + {"matrix": [10, 2], "x": 5, "y": 5.25, "w": 2.25}, + + {"matrix": [11, 3], "x": 8.25, "y": 5.25, "w": 2.75}, + {"matrix": [11, 4], "x": 11, "y": 5.25}, + {"matrix": [10, 5], "x": 12, "y": 5.25, "w": 1.5}, + {"matrix": [10, 6], "x": 14.5, "y": 5.25, "w": 1.5}, + + {"matrix": [11, 7], "x": 17.25, "y": 5.25}, + {"matrix": [10, 8], "x": 18.25, "y": 5.25}, + {"matrix": [11, 8], "x": 19.25, "y": 5.25} ] } } diff --git a/keyboards/wolf/sabre/sabre.h b/keyboards/wolf/sabre/sabre.h deleted file mode 100644 index adc9872cc306..000000000000 --- a/keyboards/wolf/sabre/sabre.h +++ /dev/null @@ -1,63 +0,0 @@ -/* -Copyright 2020 -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" - -/* - * ┌───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐ - * │00 │ │01 │11 │02 │12 │ │13 │04 │14 │05 │ │15 │06 │16 │07 │ │17 │08 │18 │ - * └───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘ - * ┌───┬───┬───┬───┬───┬───┬───┐ ┌───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ - * │20 │30 │21 │31 │22 │32 │23 │ │33 │24 │34 │25 │35 │26 │36 │ │37 │28 │38 │ - * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ - * │40 │50 │41 │51 │42 │52 │ │43 │53 │44 │54 │45 │55 │46 │56 │ │57 │48 │58 │ - * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ - * │60 │70 │61 │71 │62 │72 │ │63 │73 │64 │74 │65 │75 │76 │ - * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐ ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ ┌──────────┐ - * │80 │90 │81 │91 │82 │92 │ │83 │93 │84 │94 │85 │95 │86 │96 │ │88 │ │86 │ 2.75u RShift - * ├─────┬──┴┬──┴──┬┴──┬┴───┴───┤ ├───┴───┴──┬┴──┬┴───┴┬──┴┬────┬┴───┘ ┌───┼───┼───┐ └──────────┘ - * │A0 │ │B0 │A1 │A2 │ │B3 │B4 │A5 │ │A6 │ │B7 │A8 │B8 │ - * └─────┘ └─────┴───┴────────┘ └──────────┴───┴─────┘ └────┘ └───┴───┴───┘ - * ┌───┬─────┐ ┌─────┬───┐ - * │B0 │A1 │ │B4 │A5 │ - * └───┴─────┘ └─────┴───┘ - * ┌────┬────┐ ┌────┬────┐ - * │B0 │A1 │ │B4 │A5 │ - * └────┴────┘ └────┴────┘ - */ - -/* sabre Keymap Definitions */ -#define LAYOUT( \ - K00, K01, K11, K02, K12, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \ - K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K37, K28, K38, \ - K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K57, K48, K58, \ - K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K76, \ - K80, K90, K81, K91, K82, K92, K83, K93, K84, K94, K85, K95, K86, K96, K88, \ - KA0, KB0, KA1, KA2, KB3, KB4, KA5, KA6, KB7, KA8, KB8 \ -) { \ - { K00, K01, K02, KC_NO, K04, K05, K06, K07, K08 }, \ - { KC_NO, K11, K12, K13, K14, K15, K16, K17, K18 }, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO, K28 }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38 }, \ - { K40, K41, K42, K43, K44, K45, K46, KC_NO, K48 }, \ - { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \ - { K60, K61, K62, K63, K64, K65, KC_NO, KC_NO, KC_NO }, \ - { K70, K71, K72, K73, K74, K75, K76, KC_NO, KC_NO }, \ - { K80, K81, K82, K83, K84, K85, K86, KC_NO, K88 }, \ - { K90, K91, K92, K93, K94, K95, K96, KC_NO, KC_NO }, \ - { KA0, KA1, KA2, KC_NO, KC_NO, KA5, KA6, KC_NO, KA8 }, \ - { KB0, KC_NO, KC_NO, KB3, KB4, KC_NO, KC_NO, KB7, KB8 } \ -} diff --git a/keyboards/wolfmarkclub/wm1/info.json b/keyboards/wolfmarkclub/wm1/info.json index 8d61f9ed090a..ea48cc2ff449 100644 --- a/keyboards/wolfmarkclub/wm1/info.json +++ b/keyboards/wolfmarkclub/wm1/info.json @@ -18,7 +18,90 @@ "diode_direction": "COL2ROW", "layouts": { "LAYOUT": { - "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":8.75, "y":0}, {"x":9.75, "y":0}, {"x":10.75, "y":0}, {"x":11.75, "y":0}, {"x":12.75, "y":0}, {"x":13.75, "y":0}, {"x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "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":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1}, {"x":12.25, "y":1}, {"x":13.25, "y":1}, {"x":14.25, "y":1}, {"x":15.25, "y":1, "w":1.5}, {"x":17, "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":8.5, "y":2}, {"x":9.5, "y":2}, {"x":10.5, "y":2}, {"x":11.5, "y":2}, {"x":12.5, "y":2}, {"x":13.5, "y":2}, {"x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"x":0, "y":3, "w":2.25}, {"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":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3, "w":1.75}, {"x":16.25, "y":3.25}, {"x":0, "y":4, "w":1.5}, {"x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2}, {"x":6.5, "y":4}, {"x":8, "y":4, "w":2.75}, {"x":10.75, "y":4, "w":1.5}, {"x":13.25, "y":4, "w":1.5}, {"x":15.25, "y":4.25}, {"x":16.25, "y":4.25}, {"x":17.25, "y":4.25}] + "layout": [ + {"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": 8.75, "y": 0}, + {"matrix": [0, 8], "x": 9.75, "y": 0}, + {"matrix": [0, 9], "x": 10.75, "y": 0}, + {"matrix": [0, 10], "x": 11.75, "y": 0}, + {"matrix": [0, 11], "x": 12.75, "y": 0}, + {"matrix": [0, 12], "x": 13.75, "y": 0}, + {"matrix": [0, 13], "x": 14.75, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, + + {"matrix": [2, 13], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 8.25, "y": 1}, + {"matrix": [1, 7], "x": 9.25, "y": 1}, + {"matrix": [1, 8], "x": 10.25, "y": 1}, + {"matrix": [1, 9], "x": 11.25, "y": 1}, + {"matrix": [1, 10], "x": 12.25, "y": 1}, + {"matrix": [1, 11], "x": 13.25, "y": 1}, + {"matrix": [1, 12], "x": 14.25, "y": 1}, + {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5}, + + {"matrix": [1, 14], "x": 17, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.5, "y": 2}, + {"matrix": [2, 7], "x": 9.5, "y": 2}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 11.5, "y": 2}, + {"matrix": [2, 10], "x": 12.5, "y": 2}, + {"matrix": [2, 11], "x": 13.5, "y": 2}, + {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25}, + + {"matrix": [2, 14], "x": 17, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [3, 6], "x": 8, "y": 3}, + {"matrix": [3, 7], "x": 9, "y": 3}, + {"matrix": [3, 8], "x": 10, "y": 3}, + {"matrix": [3, 9], "x": 11, "y": 3}, + {"matrix": [3, 10], "x": 12, "y": 3}, + {"matrix": [3, 11], "x": 13, "y": 3}, + {"matrix": [3, 12], "x": 14, "y": 3, "w": 1.75}, + + {"matrix": [3, 14], "x": 16.25, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 3], "x": 4.5, "y": 4, "w": 2}, + {"matrix": [4, 5], "x": 6.5, "y": 4}, + {"matrix": [4, 7], "x": 8, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 10.75, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 13.25, "y": 4, "w": 1.5}, + + {"matrix": [4, 12], "x": 15.25, "y": 4.25}, + {"matrix": [4, 13], "x": 16.25, "y": 4.25}, + {"matrix": [4, 14], "x": 17.25, "y": 4.25} + ] } } } diff --git a/keyboards/wolfmarkclub/wm1/wm1.c b/keyboards/wolfmarkclub/wm1/wm1.c index 0ad1ade4cc3f..370f9c7cfa5d 100644 --- a/keyboards/wolfmarkclub/wm1/wm1.c +++ b/keyboards/wolfmarkclub/wm1/wm1.c @@ -1,4 +1,4 @@ -#include "wm1.h" +#include "quantum.h" void bootloader_jump(void) { // This board doesn't use the "standard" stm32duino bootloader, and no information is available regarding how to enter bootloader mode. All we can do here is reset. diff --git a/keyboards/wolfmarkclub/wm1/wm1.h b/keyboards/wolfmarkclub/wm1/wm1.h deleted file mode 100644 index 1750b6366a56..000000000000 --- a/keyboards/wolfmarkclub/wm1/wm1.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2019 - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2D, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3E, \ - K40, K42, K43, K45, K47, K49, K4B, K4C, K4D, K4E \ -)\ -{\ - {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \ - {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \ - {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \ - {K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, KC_NO, K3E}, \ - {K40, KC_NO, K42, K43, KC_NO, K45, KC_NO, K47, KC_NO, K49, KC_NO, K4B, K4C, K4D, K4E } \ -} diff --git a/keyboards/wren/info.json b/keyboards/wren/info.json index 06fa7ddf10bb..a496d4babab8 100644 --- a/keyboards/wren/info.json +++ b/keyboards/wren/info.json @@ -31,100 +31,115 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"L00","x":0, "y":0.5}, - {"label":"L01","x":1, "y":0.5}, - {"label":"L02","x":2, "y":0.5}, - {"label":"L03","x":3, "y":0.5}, - {"label":"L04","x":4.5, "y":0.5}, - {"label":"L05","x":5.5, "y":0.5}, - {"label":"L06","x":6.5, "y":0.25}, - {"label":"L07","x":7.5, "y":0}, - {"label":"L08","x":8.5, "y":0.25}, - {"label":"L09","x":9.5, "y":0.5}, - {"label":"R00","x":14, "y":0.5}, - {"label":"R01","x":15, "y":0.25}, - {"label":"R02","x":16, "y":0}, - {"label":"R03","x":17, "y":0.25}, - {"label":"R04","x":18, "y":0.5}, - {"label":"R05","x":19, "y":0.5}, - {"label":"R06","x":20.5, "y":0.5}, - {"label":"R07","x":21.5, "y":0.5}, - {"label":"R08","x":22.5, "y":0.5}, - {"label":"R09","x":23.5, "y":0.5}, - - {"label":"L10","x":0, "y":1.5}, - {"label":"L11","x":1, "y":1.5}, - {"label":"L12","x":2, "y":1.5}, - {"label":"L13","x":3, "y":1.5}, - {"label":"L14","x":4.5, "y":1.5}, - {"label":"L15","x":5.5, "y":1.5}, - {"label":"L16","x":6.5, "y":1.25}, - {"label":"L17","x":7.5, "y":1}, - {"label":"L18","x":8.5, "y":1.25}, - {"label":"L19","x":9.5, "y":1.5}, - {"label":"R10","x":14, "y":1.5}, - {"label":"R11","x":15, "y":1.25}, - {"label":"R12","x":16, "y":1}, - {"label":"R13","x":17, "y":1.25}, - {"label":"R14","x":18, "y":1.5}, - {"label":"R15","x":19, "y":1.5}, - {"label":"R16","x":20.5, "y":1.5}, - {"label":"R17","x":21.5, "y":1.5}, - {"label":"R18","x":22.5, "y":1.5}, - {"label":"R19","x":23.5, "y":1.5}, - - {"label":"L20","x":0, "y":2.5}, - {"label":"L21","x":1, "y":2.5}, - {"label":"L22","x":2, "y":2.5}, - {"label":"L23","x":3, "y":2.5}, - {"label":"L24","x":4.5, "y":2.5}, - {"label":"L25","x":5.5, "y":2.5}, - {"label":"L26","x":6.5, "y":2.25}, - {"label":"L27","x":7.5, "y":2}, - {"label":"L28","x":8.5, "y":2.25}, - {"label":"L29","x":9.5, "y":2.5}, - {"label":"R20","x":14, "y":2.5}, - {"label":"R21","x":15, "y":2.25}, - {"label":"R22","x":16, "y":2}, - {"label":"R23","x":17, "y":2.25}, - {"label":"R24","x":18, "y":2.5}, - {"label":"R25","x":19, "y":2.5}, - {"label":"R26","x":20.5, "y":2.5}, - {"label":"R27","x":21.5, "y":2.5}, - {"label":"R28","x":22.5, "y":2.5}, - {"label":"R29","x":23.5, "y":2.5}, - - {"label":"L30","x":0, "y":3.5}, - {"label":"L31","x":1, "y":3.5}, - {"label":"L32","x":2, "y":3.5}, - {"label":"L33","x":3, "y":3.5}, - {"label":"L34","x":4.5, "y":3.5}, - {"label":"L35","x":5.5, "y":3.5}, - {"label":"L36","x":6.5, "y":3.25}, - {"label":"L37","x":7.5, "y":3}, - {"label":"L38","x":8.5, "y":3.25}, - {"label":"L39","x":9.5, "y":3.5}, - {"label":"R30","x":14, "y":3.5}, - {"label":"R31","x":15, "y":3.25}, - {"label":"R32","x":16, "y":3}, - {"label":"R33","x":17, "y":3.25}, - {"label":"R34","x":18, "y":3.5}, - {"label":"R35","x":19, "y":3.5}, - {"label":"R36","x":20.5, "y":3.5}, - {"label":"R37","x":21.5, "y":3.5}, - {"label":"R38","x":22.5, "y":3.5}, - {"label":"R39","x":23.5, "y":3.5}, - - {"label":"LT0","x":6, "y":4.5}, - {"label":"LT1","x":7, "y":4.5}, - {"label":"LT2","x":8, "y":4.5}, - {"label":"LT3","x":9, "y":4.75}, - {"label":"LT4","x":10.75, "y":4, "h":2}, - {"label":"RT0","x":12.75, "y":4, "h":2}, - {"label":"RT1","x":14.5, "y":4.75}, - {"label":"RT2","x":15.5, "y":4.5}, - {"label":"RT3","x":16.5, "y":4.5}, - {"label":"RT4","x":17.5, "y":4.5} + {"matrix": [0, 9], "x": 0, "y": 0.5}, + {"matrix": [0, 8], "x": 1, "y": 0.5}, + {"matrix": [0, 7], "x": 2, "y": 0.5}, + {"matrix": [0, 6], "x": 3, "y": 0.5}, + + {"matrix": [0, 5], "x": 4.5, "y": 0.5}, + {"matrix": [0, 4], "x": 5.5, "y": 0.5}, + {"matrix": [0, 3], "x": 6.5, "y": 0.25}, + {"matrix": [0, 2], "x": 7.5, "y": 0}, + {"matrix": [0, 1], "x": 8.5, "y": 0.25}, + {"matrix": [0, 0], "x": 9.5, "y": 0.5}, + + {"matrix": [5, 0], "x": 14, "y": 0.5}, + {"matrix": [5, 1], "x": 15, "y": 0.25}, + {"matrix": [5, 2], "x": 16, "y": 0}, + {"matrix": [5, 3], "x": 17, "y": 0.25}, + {"matrix": [5, 4], "x": 18, "y": 0.5}, + {"matrix": [5, 5], "x": 19, "y": 0.5}, + + {"matrix": [5, 6], "x": 20.5, "y": 0.5}, + {"matrix": [5, 7], "x": 21.5, "y": 0.5}, + {"matrix": [5, 8], "x": 22.5, "y": 0.5}, + {"matrix": [5, 9], "x": 23.5, "y": 0.5}, + + {"matrix": [1, 9], "x": 0, "y": 1.5}, + {"matrix": [1, 8], "x": 1, "y": 1.5}, + {"matrix": [1, 7], "x": 2, "y": 1.5}, + {"matrix": [1, 6], "x": 3, "y": 1.5}, + + {"matrix": [1, 5], "x": 4.5, "y": 1.5}, + {"matrix": [1, 4], "x": 5.5, "y": 1.5}, + {"matrix": [1, 3], "x": 6.5, "y": 1.25}, + {"matrix": [1, 2], "x": 7.5, "y": 1}, + {"matrix": [1, 1], "x": 8.5, "y": 1.25}, + {"matrix": [1, 0], "x": 9.5, "y": 1.5}, + + {"matrix": [6, 0], "x": 14, "y": 1.5}, + {"matrix": [6, 1], "x": 15, "y": 1.25}, + {"matrix": [6, 2], "x": 16, "y": 1}, + {"matrix": [6, 3], "x": 17, "y": 1.25}, + {"matrix": [6, 4], "x": 18, "y": 1.5}, + {"matrix": [6, 5], "x": 19, "y": 1.5}, + + {"matrix": [6, 6], "x": 20.5, "y": 1.5}, + {"matrix": [6, 7], "x": 21.5, "y": 1.5}, + {"matrix": [6, 8], "x": 22.5, "y": 1.5}, + {"matrix": [6, 9], "x": 23.5, "y": 1.5}, + + {"matrix": [2, 9], "x": 0, "y": 2.5}, + {"matrix": [2, 8], "x": 1, "y": 2.5}, + {"matrix": [2, 7], "x": 2, "y": 2.5}, + {"matrix": [2, 6], "x": 3, "y": 2.5}, + + {"matrix": [2, 5], "x": 4.5, "y": 2.5}, + {"matrix": [2, 4], "x": 5.5, "y": 2.5}, + {"matrix": [2, 3], "x": 6.5, "y": 2.25}, + {"matrix": [2, 2], "x": 7.5, "y": 2}, + {"matrix": [2, 1], "x": 8.5, "y": 2.25}, + {"matrix": [2, 0], "x": 9.5, "y": 2.5}, + + {"matrix": [7, 0], "x": 14, "y": 2.5}, + {"matrix": [7, 1], "x": 15, "y": 2.25}, + {"matrix": [7, 2], "x": 16, "y": 2}, + {"matrix": [7, 3], "x": 17, "y": 2.25}, + {"matrix": [7, 4], "x": 18, "y": 2.5}, + {"matrix": [7, 5], "x": 19, "y": 2.5}, + + {"matrix": [7, 6], "x": 20.5, "y": 2.5}, + {"matrix": [7, 7], "x": 21.5, "y": 2.5}, + {"matrix": [7, 8], "x": 22.5, "y": 2.5}, + {"matrix": [7, 9], "x": 23.5, "y": 2.5}, + + {"matrix": [3, 9], "x": 0, "y": 3.5}, + {"matrix": [3, 8], "x": 1, "y": 3.5}, + {"matrix": [3, 7], "x": 2, "y": 3.5}, + {"matrix": [3, 6], "x": 3, "y": 3.5}, + + {"matrix": [3, 5], "x": 4.5, "y": 3.5}, + {"matrix": [3, 4], "x": 5.5, "y": 3.5}, + {"matrix": [3, 3], "x": 6.5, "y": 3.25}, + {"matrix": [3, 2], "x": 7.5, "y": 3}, + {"matrix": [3, 1], "x": 8.5, "y": 3.25}, + {"matrix": [3, 0], "x": 9.5, "y": 3.5}, + + {"matrix": [8, 0], "x": 14, "y": 3.5}, + {"matrix": [8, 1], "x": 15, "y": 3.25}, + {"matrix": [8, 2], "x": 16, "y": 3}, + {"matrix": [8, 3], "x": 17, "y": 3.25}, + {"matrix": [8, 4], "x": 18, "y": 3.5}, + {"matrix": [8, 5], "x": 19, "y": 3.5}, + + {"matrix": [8, 6], "x": 20.5, "y": 3.5}, + {"matrix": [8, 7], "x": 21.5, "y": 3.5}, + {"matrix": [8, 8], "x": 22.5, "y": 3.5}, + {"matrix": [8, 9], "x": 23.5, "y": 3.5}, + + {"matrix": [4, 4], "x": 6, "y": 4.5}, + {"matrix": [4, 3], "x": 7, "y": 4.5}, + {"matrix": [4, 2], "x": 8, "y": 4.5}, + {"matrix": [4, 1], "x": 9, "y": 4.75}, + + {"matrix": [4, 0], "x": 10.75, "y": 4, "h": 2}, + + {"matrix": [9, 0], "x": 12.75, "y": 4, "h": 2}, + + {"matrix": [9, 1], "x": 14.5, "y": 4.75}, + {"matrix": [9, 2], "x": 15.5, "y": 4.5}, + {"matrix": [9, 3], "x": 16.5, "y": 4.5}, + {"matrix": [9, 4], "x": 17.5, "y": 4.5} ] } } diff --git a/keyboards/wren/wren.c b/keyboards/wren/wren.c index 487c9d307003..c775a888d5dc 100644 --- a/keyboards/wren/wren.c +++ b/keyboards/wren/wren.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "wren.h" +#include "quantum.h" bool encoder_update_kb(uint8_t index, bool clockwise) { if (!encoder_update_user(index, clockwise)) { return false; } diff --git a/keyboards/wren/wren.h b/keyboards/wren/wren.h deleted file mode 100644 index ee589fe23cc4..000000000000 --- a/keyboards/wren/wren.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Copyright 2021 Walter Hanley - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, L07, L08, L09, R00, R01, R02, R03, R04, R05, R06, R07, R08, R09, \ - L10, L11, L12, L13, L14, L15, L16, L17, L18, L19, R10, R11, R12, R13, R14, R15, R16, R17, R18, R19, \ - L20, L21, L22, L23, L24, L25, L26, L27, L28, L29, R20, R21, R22, R23, R24, R25, R26, R27, R28, R29, \ - L30, L31, L32, L33, L34, L35, L36, L37, L38, L39, R30, R31, R32, R33, R34, R35, R36, R37, R38, R39, \ - LT0, LT1, LT2, LT3, LT4, RT0, RT1, RT2, RT3, RT4 \ -) { \ - { L09, L08, L07, L06, L05, L04, L03, L02, L01, L00 }, \ - { L19, L18, L17, L16, L15, L14, L13, L12, L11, L10 }, \ - { L29, L28, L27, L26, L25, L24, L23, L22, L21, L20 }, \ - { L39, L38, L37, L36, L35, L34, L33, L32, L31, L30 }, \ - { LT4, LT3, LT2, LT1, LT0, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { R00, R01, R02, R03, R04, R05, R06, R07, R08, R09 }, \ - { R10, R11, R12, R13, R14, R15, R16, R17, R18, R19 }, \ - { R20, R21, R22, R23, R24, R25, R26, R27, R28, R29 }, \ - { R30, R31, R32, R33, R34, R35, R36, R37, R38, R39 }, \ - { RT0, RT1, RT2, RT3, RT4, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ -} diff --git a/keyboards/wsk/alpha9/alpha9.h b/keyboards/wsk/alpha9/alpha9.h deleted file mode 100644 index ce43bdf0f705..000000000000 --- a/keyboards/wsk/alpha9/alpha9.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 Worldspawn - * - * 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( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c,\ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c,\ - K20, K21, K22, K23, K24, K25, K26, K28, K2a, K2b, K2c \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c }, \ - { K20, K21, K22, K23, K24, K25, K26, KC_NO, K28, KC_NO, K2a, K2b, K2c } \ -} - diff --git a/keyboards/wsk/alpha9/info.json b/keyboards/wsk/alpha9/info.json index 8ca664054255..0b1586305993 100644 --- a/keyboards/wsk/alpha9/info.json +++ b/keyboards/wsk/alpha9/info.json @@ -24,7 +24,50 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":"Enter", "x":12.5, "y":1}, {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"label":"Z", "x":4, "y":2}, {"label":"X", "x":5, "y":2}, {"label":"C", "x":6, "y":2}, {"label":"V", "x":7, "y":2}, {"x":8, "y":2, "w":2}, {"label":"B", "x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}] - } + "layout": [ + {"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.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "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, 8], "x": 8, "y": 2, "w": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + {"matrix": [2, 12], "x": 12, "y": 2} + ] } + } } diff --git a/keyboards/wsk/g4m3ralpha/g4m3ralpha.c b/keyboards/wsk/g4m3ralpha/g4m3ralpha.c index 66652e3ddcc0..fb9344a1bfb4 100644 --- a/keyboards/wsk/g4m3ralpha/g4m3ralpha.c +++ b/keyboards/wsk/g4m3ralpha/g4m3ralpha.c @@ -14,7 +14,7 @@ * along with this program. If not, see . */ -#include "g4m3ralpha.h" +#include "quantum.h" void matrix_init_kb(void) { diff --git a/keyboards/wsk/g4m3ralpha/g4m3ralpha.h b/keyboards/wsk/g4m3ralpha/g4m3ralpha.h deleted file mode 100644 index 53da90f9e5de..000000000000 --- a/keyboards/wsk/g4m3ralpha/g4m3ralpha.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2020 Worldspawn - * - * 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( \ - K00, K01, K02, K03, K04, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K32, K33, K35, K37, K38, K39 \ -) { \ - { K00, K01, K02, K03, K04, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO}, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, K32, K33, KC_NO, K35, KC_NO, K37, K38, K39 } \ -} - diff --git a/keyboards/wsk/g4m3ralpha/info.json b/keyboards/wsk/g4m3ralpha/info.json index 9f70410b2333..e9c24279f3da 100644 --- a/keyboards/wsk/g4m3ralpha/info.json +++ b/keyboards/wsk/g4m3ralpha/info.json @@ -20,7 +20,44 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"!", "x":0.5, "y":0}, {"label":"@", "x":1.5, "y":0}, {"label":"#", "x":2.5, "y":0}, {"label":"$", "x":3.5, "y":0}, {"label":"%", "x":4.5, "y":0}, {"label":"Q", "x":0, "y":1}, {"label":"W", "x":1, "y":1}, {"label":"E", "x":2, "y":1}, {"label":"R", "x":3, "y":1}, {"label":"T", "x":4, "y":1}, {"label":"Y", "x":5, "y":1}, {"label":"U", "x":6, "y":1}, {"label":"I", "x":7, "y":1}, {"label":"O", "x":8, "y":1}, {"label":"P", "x":9, "y":1}, {"label":"A", "x":0, "y":2}, {"label":"S", "x":1, "y":2}, {"label":"D", "x":2, "y":2}, {"label":"F", "x":3, "y":2}, {"label":"G", "x":4, "y":2}, {"label":"H", "x":5, "y":2}, {"label":"J", "x":6, "y":2}, {"label":"K", "x":7, "y":2}, {"label":"L", "x":8, "y":2}, {"label":"Enter", "x":9, "y":2}, {"label":"Z", "x":0.5, "y":3}, {"label":"X", "x":1.5, "y":3}, {"label":"C", "x":2.5, "y":3}, {"label":"V", "x":3.5, "y":3}, {"x":4.5, "y":3, "w":2}, {"label":"B", "x":6.5, "y":3}, {"label":"N", "x":7.5, "y":3}, {"label":"M", "x":8.5, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + + {"matrix": [3, 0], "x": 0.5, "y": 3}, + {"matrix": [3, 1], "x": 1.5, "y": 3}, + {"matrix": [3, 2], "x": 2.5, "y": 3}, + {"matrix": [3, 3], "x": 3.5, "y": 3}, + {"matrix": [3, 5], "x": 4.5, "y": 3, "w": 2}, + {"matrix": [3, 7], "x": 6.5, "y": 3}, + {"matrix": [3, 8], "x": 7.5, "y": 3}, + {"matrix": [3, 9], "x": 8.5, "y": 3} + ] } } } diff --git a/keyboards/wsk/gothic50/gothic50.h b/keyboards/wsk/gothic50/gothic50.h deleted file mode 100644 index 03d2a975acdb..000000000000 --- a/keyboards/wsk/gothic50/gothic50.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \ - k30, k31, k32, k34, k35, k37, k39, k3A, k3B, k3C, k3D \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, KC_NO, k1D }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \ - { k30, k31, k32, KC_NO, k34, k35, KC_NO, k37, KC_NO, k39, k3A, k3B, k3C, k3D } \ -} diff --git a/keyboards/wsk/gothic50/info.json b/keyboards/wsk/gothic50/info.json index a3fb3dd0e608..73250dbad701 100644 --- a/keyboards/wsk/gothic50/info.json +++ b/keyboards/wsk/gothic50/info.json @@ -20,7 +20,72 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":8.25, "y":0}, {"label":"U", "x":9.25, "y":0}, {"label":"I", "x":10.25, "y":0}, {"label":"O", "x":11.25, "y":0}, {"label":"P", "x":12.25, "y":0}, {"label":"{", "x":13.25, "y":0}, {"label":"}", "x":14.25, "y":0}, {"x":15.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":":", "x":12.5, "y":1}, {"label":"Enter", "x":13.5, "y":1, "w":1.75}, {"x":15.5, "y":1}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"x":15.5, "y":2}, {"x":14.25, "y":2.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":3.25, "y":3, "w":1.25}, {"x":4.5, "y":3}, {"x":5.5, "y":3, "w":1.25}, {"x":8, "y":3, "w":1.75}, {"label":"Alt", "x":9.75, "y":3}, {"label":"Win", "x":10.75, "y":3, "w":1.25}, {"x":13.25, "y":3.25}, {"x":14.25, "y":3.25}, {"x":15.25, "y":3.25}] + "layout": [ + {"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": 8.25, "y": 0}, + {"matrix": [0, 7], "x": 9.25, "y": 0}, + {"matrix": [0, 8], "x": 10.25, "y": 0}, + {"matrix": [0, 9], "x": 11.25, "y": 0}, + {"matrix": [0, 10], "x": 12.25, "y": 0}, + {"matrix": [0, 11], "x": 13.25, "y": 0}, + {"matrix": [0, 12], "x": 14.25, "y": 0}, + + {"matrix": [0, 13], "x": 15.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + + {"matrix": [1, 6], "x": 8.5, "y": 1}, + {"matrix": [1, 7], "x": 9.5, "y": 1}, + {"matrix": [1, 8], "x": 10.5, "y": 1}, + {"matrix": [1, 9], "x": 11.5, "y": 1}, + {"matrix": [1, 10], "x": 12.5, "y": 1}, + {"matrix": [1, 11], "x": 13.5, "y": 1, "w": 1.75}, + + {"matrix": [1, 13], "x": 15.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + + {"matrix": [2, 12], "x": 15.5, "y": 2}, + + {"matrix": [2, 13], "x": 14.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 3.25, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 4.5, "y": 3}, + {"matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.25}, + + {"matrix": [3, 7], "x": 8, "y": 3, "w": 1.75}, + {"matrix": [3, 9], "x": 9.75, "y": 3}, + {"matrix": [3, 10], "x": 10.75, "y": 3, "w": 1.25}, + + {"matrix": [3, 11], "x": 13.25, "y": 3.25}, + {"matrix": [3, 12], "x": 14.25, "y": 3.25}, + {"matrix": [3, 13], "x": 15.25, "y": 3.25} + ] } } } diff --git a/keyboards/wsk/gothic70/gothic70.h b/keyboards/wsk/gothic70/gothic70.h deleted file mode 100644 index 532eca8808ba..000000000000 --- a/keyboards/wsk/gothic70/gothic70.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Fate - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k1E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k2E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k3E, \ - k30, k31, k32, k33, k34, k35, k46, k36, k37, k38, k39, k3A, k3B, k3D, \ - k40, k41, k42, k44, k45, k47, k49, k4A, k4C, k4D, k4E \ -) \ -{ \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, KC_NO, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, KC_NO, k3D, k3E }, \ - { k40, k41, k42, KC_NO, k44, k45, k46, k47, KC_NO, k49, k4A, KC_NO, k4C, k4D, k4E } \ -} diff --git a/keyboards/wsk/gothic70/info.json b/keyboards/wsk/gothic70/info.json index 34483ca2bfe2..4ff0889a3573 100644 --- a/keyboards/wsk/gothic70/info.json +++ b/keyboards/wsk/gothic70/info.json @@ -20,7 +20,91 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":8.75, "y":0}, {"label":"*", "x":9.75, "y":0}, {"label":"(", "x":10.75, "y":0}, {"label":")", "x":11.75, "y":0}, {"label":"_", "x":12.75, "y":0}, {"label":"+", "x":13.75, "y":0}, {"label":"BS", "x":14.75, "y":0}, {"x":15.75, "y":0}, {"x":17, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":8.25, "y":1}, {"label":"U", "x":9.25, "y":1}, {"label":"I", "x":10.25, "y":1}, {"label":"O", "x":11.25, "y":1}, {"label":"P", "x":12.25, "y":1}, {"label":"{", "x":13.25, "y":1}, {"label":"}", "x":14.25, "y":1}, {"label":"|", "x":15.25, "y":1, "w":1.5}, {"x":17, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":8.5, "y":2}, {"label":"J", "x":9.5, "y":2}, {"label":"K", "x":10.5, "y":2}, {"label":"L", "x":11.5, "y":2}, {"label":":", "x":12.5, "y":2}, {"label":"\"", "x":13.5, "y":2}, {"label":"Enter", "x":14.5, "y":2, "w":2.25}, {"x":17, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"x":8, "y":3}, {"label":"N", "x":9, "y":3}, {"label":"M", "x":10, "y":3}, {"label":"<", "x":11, "y":3}, {"label":">", "x":12, "y":3}, {"label":"?", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3, "w":1.75}, {"x":16, "y":3.25}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":3, "y":4, "w":1.5}, {"x":4.5, "y":4, "w":2.25}, {"x":6.75, "y":4}, {"x":8.5, "y":4, "w":2.75}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Win", "x":13.5, "y":4, "w":1.25}, {"x":15, "y":4.25}, {"x":16, "y":4.25}, {"x":17, "y":4.25}] + "layout": [ + {"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": 8.75, "y": 0}, + {"matrix": [0, 8], "x": 9.75, "y": 0}, + {"matrix": [0, 9], "x": 10.75, "y": 0}, + {"matrix": [0, 10], "x": 11.75, "y": 0}, + {"matrix": [0, 11], "x": 12.75, "y": 0}, + {"matrix": [0, 12], "x": 13.75, "y": 0}, + {"matrix": [0, 13], "x": 14.75, "y": 0}, + {"matrix": [0, 14], "x": 15.75, "y": 0}, + + {"matrix": [1, 14], "x": 17, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 8.25, "y": 1}, + {"matrix": [1, 7], "x": 9.25, "y": 1}, + {"matrix": [1, 8], "x": 10.25, "y": 1}, + {"matrix": [1, 9], "x": 11.25, "y": 1}, + {"matrix": [1, 10], "x": 12.25, "y": 1}, + {"matrix": [1, 11], "x": 13.25, "y": 1}, + {"matrix": [1, 12], "x": 14.25, "y": 1}, + {"matrix": [1, 13], "x": 15.25, "y": 1, "w": 1.5}, + + {"matrix": [2, 14], "x": 17, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8.5, "y": 2}, + {"matrix": [2, 7], "x": 9.5, "y": 2}, + {"matrix": [2, 8], "x": 10.5, "y": 2}, + {"matrix": [2, 9], "x": 11.5, "y": 2}, + {"matrix": [2, 10], "x": 12.5, "y": 2}, + {"matrix": [2, 11], "x": 13.5, "y": 2}, + {"matrix": [2, 12], "x": 14.5, "y": 2, "w": 2.25}, + + {"matrix": [3, 14], "x": 17, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + + {"matrix": [4, 6], "x": 8, "y": 3}, + {"matrix": [3, 6], "x": 9, "y": 3}, + {"matrix": [3, 7], "x": 10, "y": 3}, + {"matrix": [3, 8], "x": 11, "y": 3}, + {"matrix": [3, 9], "x": 12, "y": 3}, + {"matrix": [3, 10], "x": 13, "y": 3}, + {"matrix": [3, 11], "x": 14, "y": 3, "w": 1.75}, + + {"matrix": [3, 13], "x": 16, "y": 3.25}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.5}, + {"matrix": [4, 4], "x": 4.5, "y": 4, "w": 2.25}, + {"matrix": [4, 5], "x": 6.75, "y": 4}, + {"matrix": [4, 7], "x": 8.5, "y": 4, "w": 2.75}, + {"matrix": [4, 9], "x": 11.25, "y": 4, "w": 1.5}, + {"matrix": [4, 10], "x": 13.5, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 15, "y": 4.25}, + {"matrix": [4, 13], "x": 16, "y": 4.25}, + {"matrix": [4, 14], "x": 17, "y": 4.25} + ] } } } diff --git a/keyboards/wsk/houndstooth/houndstooth.h b/keyboards/wsk/houndstooth/houndstooth.h deleted file mode 100644 index 41a680ec9ba2..000000000000 --- a/keyboards/wsk/houndstooth/houndstooth.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K40, K41, K42, K43, K44, K45,\ - K10, K11, K12, K13, K14, K15, K50, K51, K52, K53, K54, K55,\ - K20, K21, K22, K23, K24, K25, K60, K61, K62, K63, K64, K65,\ - K30, K31, K32, K33, K34, K35, K70, K71, K72, K73, K74, K75 \ -) { \ - { K00, K01, K02, K03, K04, K05 }, \ - { K10, K11, K12, K13, K14, K15 }, \ - { K20, K21, K22, K23, K24, K25 }, \ - { K30, K31, K32, K33, K34, K35 }, \ - { K40, K41, K42, K43, K44, K45 }, \ - { K50, K51, K52, K53, K54, K55 }, \ - { K60, K61, K62, K63, K64, K65 }, \ - { K70, K71, K72, K73, K74, K75 } \ -} - diff --git a/keyboards/wsk/houndstooth/info.json b/keyboards/wsk/houndstooth/info.json index bdcfebbdb48b..d281bff0455b 100644 --- a/keyboards/wsk/houndstooth/info.json +++ b/keyboards/wsk/houndstooth/info.json @@ -20,7 +20,63 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"Back Space", "x":11.5, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6.5, "y":1}, {"label":"J", "x":7.5, "y":1}, {"label":"K", "x":8.5, "y":1}, {"label":"L", "x":9.5, "y":1}, {"label":";", "x":10.5, "y":1}, {"label":"'", "x":11.5, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6.5, "y":2}, {"label":"M", "x":7.5, "y":2}, {"label":",", "x":8.5, "y":2}, {"label":".", "x":9.5, "y":2}, {"label":"/", "x":10.5, "y":2}, {"label":"Return", "x":11.5, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"⇓", "x":4, "y":3}, {"x":5, "y":3}, {"x":6.5, "y":3}, {"label":"⇑", "x":7.5, "y":3}, {"label":"←", "x":8.5, "y":3}, {"label":"↓", "x":9.5, "y":3}, {"label":"↑", "x":10.5, "y":3}, {"label":"→", "x":11.5, "y":3}] + "layout": [ + {"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": [4, 0], "x": 6.5, "y": 0}, + {"matrix": [4, 1], "x": 7.5, "y": 0}, + {"matrix": [4, 2], "x": 8.5, "y": 0}, + {"matrix": [4, 3], "x": 9.5, "y": 0}, + {"matrix": [4, 4], "x": 10.5, "y": 0}, + {"matrix": [4, 5], "x": 11.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + + {"matrix": [5, 0], "x": 6.5, "y": 1}, + {"matrix": [5, 1], "x": 7.5, "y": 1}, + {"matrix": [5, 2], "x": 8.5, "y": 1}, + {"matrix": [5, 3], "x": 9.5, "y": 1}, + {"matrix": [5, 4], "x": 10.5, "y": 1}, + {"matrix": [5, 5], "x": 11.5, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + + {"matrix": [6, 0], "x": 6.5, "y": 2}, + {"matrix": [6, 1], "x": 7.5, "y": 2}, + {"matrix": [6, 2], "x": 8.5, "y": 2}, + {"matrix": [6, 3], "x": 9.5, "y": 2}, + {"matrix": [6, 4], "x": 10.5, "y": 2}, + {"matrix": [6, 5], "x": 11.5, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3}, + {"matrix": [3, 5], "x": 5, "y": 3}, + + {"matrix": [7, 0], "x": 6.5, "y": 3}, + {"matrix": [7, 1], "x": 7.5, "y": 3}, + {"matrix": [7, 2], "x": 8.5, "y": 3}, + {"matrix": [7, 3], "x": 9.5, "y": 3}, + {"matrix": [7, 4], "x": 10.5, "y": 3}, + {"matrix": [7, 5], "x": 11.5, "y": 3} + ] } } } diff --git a/keyboards/wsk/jerkin/info.json b/keyboards/wsk/jerkin/info.json index 19099a4f5619..73894c66198d 100644 --- a/keyboards/wsk/jerkin/info.json +++ b/keyboards/wsk/jerkin/info.json @@ -17,7 +17,51 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Esc", "x":0.5, "y":0}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":7.75, "y":0}, {"label":"U", "x":8.75, "y":0}, {"label":"I", "x":9.75, "y":0}, {"label":"O", "x":10.75, "y":0}, {"label":"P", "x":11.75, "y":0}, {"label":"{", "x":12.75, "y":0}, {"label":"Back
Space", "x":13.75, "y":0}, {"label":"Tab", "x":0.25, "y":1, "w":1.25}, {"label":"A", "x":1.5, "y":1}, {"label":"S", "x":2.5, "y":1}, {"label":"D", "x":3.5, "y":1}, {"label":"F", "x":4.5, "y":1}, {"label":"G", "x":5.5, "y":1}, {"label":"H", "x":8.25, "y":1}, {"label":"J", "x":9.25, "y":1}, {"label":"K", "x":10.25, "y":1}, {"label":"L", "x":11.25, "y":1}, {"label":"\"", "x":12.25, "y":1}, {"label":"Enter", "x":13.25, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":1.75}, {"label":"Z", "x":1.75, "y":2}, {"label":"X", "x":2.75, "y":2}, {"label":"C", "x":3.75, "y":2}, {"label":"V", "x":4.75, "y":2}, {"label":"B", "x":5.75, "y":2}, {"x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"label":"Shift", "x":14, "y":2, "w":1.25}] + "layout": [ + {"matrix": [0, 0], "x": 0.5, "y": 0}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + + {"matrix": [0, 6], "x": 7.75, "y": 0}, + {"matrix": [0, 7], "x": 8.75, "y": 0}, + {"matrix": [0, 8], "x": 9.75, "y": 0}, + {"matrix": [0, 9], "x": 10.75, "y": 0}, + {"matrix": [0, 10], "x": 11.75, "y": 0}, + {"matrix": [0, 11], "x": 12.75, "y": 0}, + {"matrix": [0, 12], "x": 13.75, "y": 0}, + + {"matrix": [1, 0], "x": 0.25, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + + {"matrix": [1, 6], "x": 8.25, "y": 1}, + {"matrix": [1, 7], "x": 9.25, "y": 1}, + {"matrix": [1, 8], "x": 10.25, "y": 1}, + {"matrix": [1, 9], "x": 11.25, "y": 1}, + {"matrix": [1, 10], "x": 12.25, "y": 1}, + {"matrix": [1, 11], "x": 13.25, "y": 1, "w": 1.75}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 6], "x": 8, "y": 2}, + {"matrix": [2, 7], "x": 9, "y": 2}, + {"matrix": [2, 8], "x": 10, "y": 2}, + {"matrix": [2, 9], "x": 11, "y": 2}, + {"matrix": [2, 10], "x": 12, "y": 2}, + {"matrix": [2, 11], "x": 13, "y": 2}, + {"matrix": [2, 12], "x": 14, "y": 2, "w": 1.25} + ] } } } diff --git a/keyboards/wsk/jerkin/jerkin.h b/keyboards/wsk/jerkin/jerkin.h deleted file mode 100644 index 201a9db13bd4..000000000000 --- a/keyboards/wsk/jerkin/jerkin.h +++ /dev/null @@ -1,13 +0,0 @@ - #pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, KC_NO }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212 } \ -} diff --git a/keyboards/wsk/kodachi50/info.json b/keyboards/wsk/kodachi50/info.json index af2112d63bff..b5d0f9459b71 100644 --- a/keyboards/wsk/kodachi50/info.json +++ b/keyboards/wsk/kodachi50/info.json @@ -20,7 +20,65 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"{", "x":6.5, "y":0}, {"label":"}", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"Backspace", "x":13.5, "y":0, "w":1.5}, {"label":"Caps Lock", "x":0, "y":1, "w":1.25}, {"label":"A", "x":1.25, "y":1}, {"label":"S", "x":2.25, "y":1}, {"label":"D", "x":3.25, "y":1}, {"label":"F", "x":4.25, "y":1}, {"label":"G", "x":5.25, "y":1}, {"label":"|", "x":6.25, "y":1, "w":1.25}, {"label":"Alt", "x":7.5, "y":1, "w":1.25}, {"label":"H", "x":8.75, "y":1}, {"label":"J", "x":9.75, "y":1}, {"label":"K", "x":10.75, "y":1}, {"label":"L", "x":11.75, "y":1}, {"label":"\"", "x":12.75, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"~", "x":6, "y":2}, {"label":"_", "x":7, "y":2}, {"label":"+", "x":8, "y":2}, {"label":"N", "x":9, "y":2}, {"label":"M", "x":10, "y":2}, {"label":"<", "x":11, "y":2}, {"label":">", "x":12, "y":2}, {"label":"?", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.75}, {"x":6.5, "y":3}, {"x":7.5, "y":3, "w":2.25}, {"label":"Win", "x":9.75, "y":3, "w":1.25}, {"label":"Left", "x":11, "y":3}, {"label":"Down", "x":12, "y":3}, {"label":"Up", "x":13, "y":3}, {"label":"Right", "x":14, "y":3}] + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [7, 6], "x": 7.5, "y": 0}, + {"matrix": [7, 5], "x": 8.5, "y": 0}, + {"matrix": [7, 4], "x": 9.5, "y": 0}, + {"matrix": [7, 3], "x": 10.5, "y": 0}, + {"matrix": [7, 2], "x": 11.5, "y": 0}, + {"matrix": [7, 1], "x": 12.5, "y": 0}, + {"matrix": [7, 0], "x": 13.5, "y": 0, "w": 1.5}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1, "w": 1.25}, + {"matrix": [6, 6], "x": 7.5, "y": 1, "w": 1.25}, + {"matrix": [6, 5], "x": 8.75, "y": 1}, + {"matrix": [6, 4], "x": 9.75, "y": 1}, + {"matrix": [6, 3], "x": 10.75, "y": 1}, + {"matrix": [6, 2], "x": 11.75, "y": 1}, + {"matrix": [6, 1], "x": 12.75, "y": 1}, + {"matrix": [6, 0], "x": 13.75, "y": 1, "w": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [3, 5], "x": 6, "y": 2}, + {"matrix": [2, 6], "x": 7, "y": 2}, + {"matrix": [5, 6], "x": 8, "y": 2}, + {"matrix": [5, 5], "x": 9, "y": 2}, + {"matrix": [5, 4], "x": 10, "y": 2}, + {"matrix": [5, 3], "x": 11, "y": 2}, + {"matrix": [5, 2], "x": 12, "y": 2}, + {"matrix": [5, 1], "x": 13, "y": 2}, + {"matrix": [5, 0], "x": 14, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 1.25}, + {"matrix": [3, 1], "x": 1.25, "y": 3, "w": 1.25}, + {"matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, + {"matrix": [3, 4], "x": 3.75, "y": 3, "w": 2.75}, + {"matrix": [3, 6], "x": 6.5, "y": 3}, + {"matrix": [4, 6], "x": 7.5, "y": 3, "w": 2.25}, + {"matrix": [4, 4], "x": 9.75, "y": 3, "w": 1.25}, + {"matrix": [4, 3], "x": 11, "y": 3}, + {"matrix": [4, 2], "x": 12, "y": 3}, + {"matrix": [4, 1], "x": 13, "y": 3}, + {"matrix": [4, 0], "x": 14, "y": 3} + ] } } } diff --git a/keyboards/wsk/kodachi50/kodachi50.h b/keyboards/wsk/kodachi50/kodachi50.h deleted file mode 100644 index 15fc9ac0ce22..000000000000 --- a/keyboards/wsk/kodachi50/kodachi50.h +++ /dev/null @@ -1,20 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K76, K75, K74, K73, K72, K71, K70, \ - K10, K11, K12, K13, K14, K15, K16, K66, K65, K64, K63, K62, K61, K60, \ - K20, K21, K22, K23, K24, K25, K35, K26, K56, K55, K54, K53, K52, K51, K50, \ - K30, K31, K32, K34, K36, K46, K44, K43, K42, K41, K40 \ -) { \ - { K00, K01, K02, K03, K04, K05, K06 }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ - { K20, K21, K22, K23, K24, K25, K26 }, \ - { K30, K31, K32, KC_NO, K34, K35, K36 }, \ - { K40, K41, K42, K43, K44, KC_NO, K46 }, \ - { K50, K51, K52, K53, K54, K55, K56 }, \ - { K60, K61, K62, K63, K64, K65, K66 }, \ - { K70, K71, K72, K73, K74, K75, K76 } \ -} - diff --git a/keyboards/wsk/pain27/info.json b/keyboards/wsk/pain27/info.json index c82080bad6a9..bbea2a211f08 100644 --- a/keyboards/wsk/pain27/info.json +++ b/keyboards/wsk/pain27/info.json @@ -21,36 +21,36 @@ "layouts": { "LAYOUT": { "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}, + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, - {"x":0.25, "y":1}, - {"x":1.25, "y":1}, - {"x":2.25, "y":1}, - {"x":3.25, "y":1}, - {"x":4.25, "y":1}, - {"x":5.25, "y":1}, - {"x":6.25, "y":1}, - {"x":7.25, "y":1}, - {"x":8.25, "y":1}, + {"matrix": [1, 0], "x": 0.25, "y": 1}, + {"matrix": [1, 1], "x": 1.25, "y": 1}, + {"matrix": [1, 2], "x": 2.25, "y": 1}, + {"matrix": [1, 3], "x": 3.25, "y": 1}, + {"matrix": [1, 4], "x": 4.25, "y": 1}, + {"matrix": [1, 5], "x": 5.25, "y": 1}, + {"matrix": [1, 6], "x": 6.25, "y": 1}, + {"matrix": [1, 7], "x": 7.25, "y": 1}, + {"matrix": [1, 8], "x": 8.25, "y": 1}, - {"x":0.75, "y":2}, - {"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}, + {"matrix": [2, 0], "x": 0.75, "y": 2}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, - {"x":2.25, "y":3, "w":6.25} + {"matrix": [2, 7], "x": 2.25, "y": 3, "w": 6.25} ] } } diff --git a/keyboards/wsk/pain27/pain27.h b/keyboards/wsk/pain27/pain27.h deleted file mode 100644 index 918b1aaf1e91..000000000000 --- a/keyboards/wsk/pain27/pain27.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, \ - K200, K201, K202, K203, K204, K205, K206, K207 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, KC_NO }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, KC_NO, KC_NO } \ -} - diff --git a/keyboards/wsk/tkl30/info.json b/keyboards/wsk/tkl30/info.json index b9dfc3d58a32..10465560518d 100644 --- a/keyboards/wsk/tkl30/info.json +++ b/keyboards/wsk/tkl30/info.json @@ -21,54 +21,54 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0, "w":1.5}, - {"x":1.5, "y":0}, - {"x":2.5, "y":0}, - {"x":3.5, "y":0}, - {"x":4.5, "y":0}, - {"x":5.5, "y":0}, - {"x":6.5, "y":0}, - {"x":7.5, "y":0}, - {"x":8.5, "y":0}, - {"x":9.5, "y":0}, - {"x":10.5, "y":0}, - {"x":11.5, "y":0}, - {"x":12.5, "y":0}, - {"x":13.5, "y":0, "w":1.5}, + {"matrix": [0, 0], "x": 0, "y": 0, "w": 1.5}, + {"matrix": [0, 1], "x": 1.5, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 3.5, "y": 0}, + {"matrix": [0, 4], "x": 4.5, "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.5, "y": 0}, + {"matrix": [0, 10], "x": 10.5, "y": 0}, + {"matrix": [0, 11], "x": 11.5, "y": 0}, + {"matrix": [0, 12], "x": 12.5, "y": 0}, + {"matrix": [0, 13], "x": 13.5, "y": 0, "w": 1.5}, - {"x":0, "y":1, "w":1.75}, - {"x":1.75, "y":1}, - {"x":2.75, "y":1}, - {"x":3.75, "y":1}, - {"x":4.75, "y":1}, - {"x":5.75, "y":1}, - {"x":6.75, "y":1}, - {"x":7.75, "y":1}, - {"x":8.75, "y":1}, - {"x":9.75, "y":1}, - {"x":10.75, "y":1}, - {"x":11.75, "y":1}, - {"x":12.75, "y":1, "w":2.25}, + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.75}, + {"matrix": [1, 1], "x": 1.75, "y": 1}, + {"matrix": [1, 2], "x": 2.75, "y": 1}, + {"matrix": [1, 3], "x": 3.75, "y": 1}, + {"matrix": [1, 4], "x": 4.75, "y": 1}, + {"matrix": [1, 5], "x": 5.75, "y": 1}, + {"matrix": [1, 6], "x": 6.75, "y": 1}, + {"matrix": [1, 7], "x": 7.75, "y": 1}, + {"matrix": [1, 8], "x": 8.75, "y": 1}, + {"matrix": [1, 9], "x": 9.75, "y": 1}, + {"matrix": [1, 10], "x": 10.75, "y": 1}, + {"matrix": [1, 11], "x": 11.75, "y": 1}, + {"matrix": [1, 12], "x": 12.75, "y": 1, "w": 2.25}, - {"x":16.25, "y":1}, + {"matrix": [1, 13], "x": 16.25, "y": 1}, - {"x":0, "y":2, "w":1.25}, - {"x":1.25, "y":2}, - {"x":2.25, "y":2}, - {"x":3.25, "y":2}, - {"x":4.25, "y":2}, - {"x":5.25, "y":2}, - {"x":6.25, "y":2, "w":2}, - {"x":8.25, "y":2}, - {"x":9.25, "y":2}, - {"x":10.25, "y":2}, - {"x":11.25, "y":2}, - {"x":12.25, "y":2}, - {"x":13.25, "y":2, "w":1.75}, + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.25}, + {"matrix": [2, 1], "x": 1.25, "y": 2}, + {"matrix": [2, 2], "x": 2.25, "y": 2}, + {"matrix": [2, 3], "x": 3.25, "y": 2}, + {"matrix": [2, 4], "x": 4.25, "y": 2}, + {"matrix": [2, 5], "x": 5.25, "y": 2}, + {"matrix": [2, 6], "x": 6.25, "y": 2, "w": 2}, + {"matrix": [2, 7], "x": 8.25, "y": 2}, + {"matrix": [2, 8], "x": 9.25, "y": 2}, + {"matrix": [2, 9], "x": 10.25, "y": 2}, + {"matrix": [2, 10], "x": 11.25, "y": 2}, + {"matrix": [2, 11], "x": 12.25, "y": 2}, + {"matrix": [2, 12], "x": 13.25, "y": 2, "w": 1.75}, - {"x":15.25, "y":2}, - {"x":16.25, "y":2}, - {"x":17.25, "y":2} + {"matrix": [2, 13], "x": 15.25, "y": 2}, + {"matrix": [1, 14], "x": 16.25, "y": 2}, + {"matrix": [2, 14], "x": 17.25, "y": 2} ] } } diff --git a/keyboards/wsk/tkl30/tkl30.h b/keyboards/wsk/tkl30/tkl30.h deleted file mode 100644 index 3beba7245d20..000000000000 --- a/keyboards/wsk/tkl30/tkl30.h +++ /dev/null @@ -1,14 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K114, K214 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 } \ -} - diff --git a/keyboards/wuque/creek70/creek70.h b/keyboards/wuque/creek70/creek70.h deleted file mode 100644 index d182671cc40f..000000000000 --- a/keyboards/wuque/creek70/creek70.h +++ /dev/null @@ -1,49 +0,0 @@ -/* Copyright 2023 wuque - * - * 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" - - -/* Standard Arrangement - * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐┌───┬───┬───┐ - * │01 │02 │03 │04 │05 │06 │07 │08 │09 │0A │0B │0C │0D │0E │2E ││0F │0G │0H │ - * ┌───┐├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤├───┼───┼───┤ - * |10 |│11 │12 │13 │14 │15 │16 │17 │18 │19 │1A │1B │1C │1D │1E ││1F │1G │1H │ - * ├───┤├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤└───┴───┴───┘ - * |20 |│21 │22 │23 │24 │25 │26 │27 │28 │29 │2A │2B │2C │2D │ - * ├───┤├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤ ┌───┐ - * |30 |│31 │32 │33 │34 │35 │36 │37 │38 │39 │3A │3B │3C │3D │3E │ │3G │ - * ├───┤├────┼───┴┬──┴─┬─┴───┴───┼───┴┬──┴───┴──┬┴───┼───┴┬────┬┴───┤┌───┼───┼───┐ - * |40 |│41 │42 │43 │46 │47 │48 │4B │4C │4D │4E ││4F │4G │4H │ - * └───┘└────┴────┴────┴─────────┴────┴─────────┴────┴────┴────┴────┘└───┴───┴───┘ - */ - -#define LAYOUT( \ - K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K2E, K0F, K0G, K0H, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, K3G, \ - K40, K41, K42, K43, K46, K47, K48, K4B, K4C, K4D, K4E, K4F, K4G, K4H \ -) { \ - { KC_NO, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, K0H }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, K1H }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, KC_NO, KC_NO, KC_NO }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, KC_NO, K3G, KC_NO }, \ - { K40, K41, K42, K43, KC_NO, KC_NO, K46, K47, K48, KC_NO, KC_NO, K4B, K4C, K4D, K4E, K4F, K4G, K4H }, \ -} - diff --git a/keyboards/wuque/creek70/info.json b/keyboards/wuque/creek70/info.json index 4760e16d6b82..866d0413ca46 100644 --- a/keyboards/wuque/creek70/info.json +++ b/keyboards/wuque/creek70/info.json @@ -51,90 +51,94 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "~", "x": 1, "y": 0 }, - { "label": "1", "x": 2, "y": 0 }, - { "label": "2", "x": 3, "y": 0 }, - { "label": "3", "x": 4, "y": 0 }, - { "label": "4", "x": 5, "y": 0 }, - { "label": "5", "x": 6, "y": 0 }, - { "label": "6", "x": 7, "y": 0 }, - { "label": "7", "x": 8, "y": 0 }, - { "label": "8", "x": 9, "y": 0 }, - { "label": "9", "x": 10, "y": 0 }, - { "label": "0", "x": 11, "y": 0 }, - { "label": "-", "x": 12, "y": 0 }, - { "label": "=", "x": 13, "y": 0 }, - { "label": "Backspace", "x": 14, "y": 0 }, - { "label": "Insert", "x": 16.25, "y": 0 }, - { "label": "Home", "x": 17.25, "y": 0 }, - { "label": "PageUp", "x": 18.25, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, - { "label": "Func1", "x": 0, "y": 1 }, - { "label": "Tab", "x": 1, "y": 1, "w": 1.5 }, - { "label": "Q", "x": 2.5, "y": 1 }, - { "label": "W", "x": 3.5, "y": 1 }, - { "label": "E", "x": 4.5, "y": 1 }, - { "label": "R", "x": 5.5, "y": 1 }, - { "label": "T", "x": 6.5, "y": 1 }, - { "label": "Y", "x": 7.5, "y": 1 }, - { "label": "U", "x": 8.5, "y": 1 }, - { "label": "I", "x": 9.5, "y": 1 }, - { "label": "O", "x": 10.5, "y": 1 }, - { "label": "P", "x": 11.5, "y": 1 }, - { "label": "[", "x": 12.5, "y": 1 }, - { "label": "]", "x": 13.5, "y": 1 }, - { "label": "\\", "x": 14.5, "y": 1, "w": 1.5 }, - { "label": "Delete", "x": 16.25, "y": 1 }, - { "label": "End", "x": 17.25, "y": 1 }, - { "label": "PageDown", "x": 18.25, "y": 1 }, + {"matrix": [2, 14], "x": 16.25, "y": 0}, + {"matrix": [0, 15], "x": 17.25, "y": 0}, + {"matrix": [0, 16], "x": 18.25, "y": 0}, - { "label": "Func2", "x": 0, "y": 2 }, - { "label": "Caps Lock", "x": 1, "y": 2, "w": 1.75 }, - { "label": "A", "x": 2.75, "y": 2 }, - { "label": "S", "x": 3.75, "y": 2 }, - { "label": "D", "x": 4.75, "y": 2 }, - { "label": "F", "x": 5.75, "y": 2 }, - { "label": "G", "x": 6.75, "y": 2 }, - { "label": "H", "x": 7.75, "y": 2 }, - { "label": "J", "x": 8.75, "y": 2 }, - { "label": "K", "x": 9.75, "y": 2 }, - { "label": "L", "x": 10.75, "y": 2 }, - { "label": ";", "x": 11.75, "y": 2 }, - { "label": "'", "x": 12.75, "y": 2 }, - { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 }, - { "label": "Backspace1", "x": 15, "y": 0 }, + {"matrix": [0, 17], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 2.5, "y": 1}, + {"matrix": [1, 2], "x": 3.5, "y": 1}, + {"matrix": [1, 3], "x": 4.5, "y": 1}, + {"matrix": [1, 4], "x": 5.5, "y": 1}, + {"matrix": [1, 5], "x": 6.5, "y": 1}, + {"matrix": [1, 6], "x": 7.5, "y": 1}, + {"matrix": [1, 7], "x": 8.5, "y": 1}, + {"matrix": [1, 8], "x": 9.5, "y": 1}, + {"matrix": [1, 9], "x": 10.5, "y": 1}, + {"matrix": [1, 10], "x": 11.5, "y": 1}, + {"matrix": [1, 11], "x": 12.5, "y": 1}, + {"matrix": [1, 12], "x": 13.5, "y": 1}, + {"matrix": [1, 13], "x": 14.5, "y": 1, "w": 1.5}, - { "label": "Func3", "x": 0, "y": 3 }, - { "label": "Shift1", "x": 1, "y": 3 }, - { "label": "Shift2", "x": 2, "y": 3, "w": 1.25 }, - { "label": "Z", "x": 3.25, "y": 3 }, - { "label": "X", "x": 4.25, "y": 3 }, - { "label": "C", "x": 5.25, "y": 3 }, - { "label": "V", "x": 6.25, "y": 3 }, - { "label": "B", "x": 7.25, "y": 3 }, - { "label": "N", "x": 8.25, "y": 3 }, - { "label": "M", "x": 9.25, "y": 3 }, - { "label": ",", "x": 10.25, "y": 3 }, - { "label": ".", "x": 11.25, "y": 3 }, - { "label": "/", "x": 12.25, "y": 3 }, - { "label": "Shift1", "x": 13.25, "y": 3, "w": 1.75 }, - { "label": "Shift2", "x": 15, "y": 3 }, - { "label": "\u2191", "x": 17.25, "y": 3 }, + {"matrix": [1, 14], "x": 16.25, "y": 1}, + {"matrix": [1, 15], "x": 17.25, "y": 1}, + {"matrix": [1, 16], "x": 18.25, "y": 1}, - { "label": "Func4", "x": 0, "y": 4 }, - { "label": "Ctrl", "x": 1, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 2.25, "y": 4, "w": 1.25 }, - { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 4.75, "y": 4, "w": 2.5 }, - { "label": "Space", "x": 7.25, "y": 4, "w": 1.25 }, - { "label": "Space", "x": 8.5, "y": 4, "w": 2.5 }, - { "label": "Alt", "x": 11, "y": 4, "w": 1.25 }, - { "label": "Win", "x": 12.25, "y": 4, "w": 1.25 }, - { "label": "Fn", "x": 13.5, "y": 4, "w": 1.25 }, - { "label": "Ctrl", "x": 14.75, "y": 4, "w": 1.25 }, - { "label": "\u2190", "x": 16.25, "y": 4 }, - { "label": "\u2193", "x": 17.25, "y": 4 }, - { "label": "\u2192", "x": 18.25, "y": 4 } + {"matrix": [1, 17], "x": 0, "y": 2}, + {"matrix": [2, 0], "x": 1, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 2.75, "y": 2}, + {"matrix": [2, 2], "x": 3.75, "y": 2}, + {"matrix": [2, 3], "x": 4.75, "y": 2}, + {"matrix": [2, 4], "x": 5.75, "y": 2}, + {"matrix": [2, 5], "x": 6.75, "y": 2}, + {"matrix": [2, 6], "x": 7.75, "y": 2}, + {"matrix": [2, 7], "x": 8.75, "y": 2}, + {"matrix": [2, 8], "x": 9.75, "y": 2}, + {"matrix": [2, 9], "x": 10.75, "y": 2}, + {"matrix": [2, 10], "x": 11.75, "y": 2}, + {"matrix": [2, 11], "x": 12.75, "y": 2}, + {"matrix": [2, 12], "x": 13.75, "y": 2, "w": 2.25}, + {"matrix": [2, 13], "x": 15, "y": 0}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3, "w": 1.25}, + {"matrix": [3, 3], "x": 3.25, "y": 3}, + {"matrix": [3, 4], "x": 4.25, "y": 3}, + {"matrix": [3, 5], "x": 5.25, "y": 3}, + {"matrix": [3, 6], "x": 6.25, "y": 3}, + {"matrix": [3, 7], "x": 7.25, "y": 3}, + {"matrix": [3, 8], "x": 8.25, "y": 3}, + {"matrix": [3, 9], "x": 9.25, "y": 3}, + {"matrix": [3, 10], "x": 10.25, "y": 3}, + {"matrix": [3, 11], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3}, + {"matrix": [3, 13], "x": 13.25, "y": 3, "w": 1.75}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [3, 16], "x": 17.25, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 3.5, "y": 4, "w": 1.25}, + {"matrix": [4, 6], "x": 4.75, "y": 4, "w": 2.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4, "w": 1.25}, + {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 2.5}, + {"matrix": [4, 11], "x": 11, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 12.25, "y": 4, "w": 1.25}, + {"matrix": [4, 13], "x": 13.5, "y": 4, "w": 1.25}, + {"matrix": [4, 14], "x": 14.75, "y": 4, "w": 1.25}, + + {"matrix": [4, 15], "x": 16.25, "y": 4}, + {"matrix": [4, 16], "x": 17.25, "y": 4}, + {"matrix": [4, 17], "x": 18.25, "y": 4} ] } } diff --git a/keyboards/wuque/tata80/wk/info.json b/keyboards/wuque/tata80/wk/info.json index 23146206c4ac..68c4973c0d60 100644 --- a/keyboards/wuque/tata80/wk/info.json +++ b/keyboards/wuque/tata80/wk/info.json @@ -21,99 +21,108 @@ "layouts": { "LAYOUT": { "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": "F13", "x": 14, "y": 0 }, - { "label": "Print", "x": 15.25, "y": 0 }, - { "label": "Scroll", "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": "PageUp", "x": 17.25, "y": 1.25 }, + {"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}, - { "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": "PageDown", "x": 17.25, "y": 2.25 }, + {"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}, - { "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": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "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, 13], "x": 14, "y": 0}, - { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 }, - { "label": "Win", "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": "Win", "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 } + {"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.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, 13], "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/wuque/tata80/wk/wk.h b/keyboards/wuque/tata80/wk/wk.h deleted file mode 100644 index d166d4312c9b..000000000000 --- a/keyboards/wuque/tata80/wk/wk.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2022 wuque - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k000, k001, 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, k501, k502, k506, k509, k510, k511, k513, k514, k515, k516 \ -) \ -{ \ - { k000, k001, 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, k501, k502, KC_NO, KC_NO, KC_NO, k506, KC_NO, KC_NO, k509, k510, k511, KC_NO, k513, k514, k515, k516 } \ -} diff --git a/keyboards/wuque/tata80/wkl/info.json b/keyboards/wuque/tata80/wkl/info.json index 166511380cd2..498ce63cb1ad 100644 --- a/keyboards/wuque/tata80/wkl/info.json +++ b/keyboards/wuque/tata80/wkl/info.json @@ -21,96 +21,105 @@ "layouts": { "LAYOUT": { "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": "F13", "x": 14, "y": 0 }, - { "label": "Print", "x": 15.25, "y": 0 }, - { "label": "Scroll", "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": "PageUp", "x": 17.25, "y": 1.25 }, + {"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}, - { "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": "PageDown", "x": 17.25, "y": 2.25 }, + {"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}, - { "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": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "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, 13], "x": 14, "y": 0}, - { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.5 }, - { "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": "Fn", "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": [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, 6], "x": 4, "y": 5.25, "w": 7}, + {"matrix": [5, 9], "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/wuque/tata80/wkl/wkl.h b/keyboards/wuque/tata80/wkl/wkl.h deleted file mode 100644 index 2981f26d550a..000000000000 --- a/keyboards/wuque/tata80/wkl/wkl.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2022 wuque - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k000, k001, 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, k506, k509, k513, k514, k515, k516 \ -) \ -{ \ - { k000, k001, 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, k506, KC_NO, KC_NO, k509, KC_NO, KC_NO, KC_NO, k513, k514, k515, k516 } \ -} diff --git a/keyboards/xbows/knight/info.json b/keyboards/xbows/knight/info.json index 9cce952dd765..3d507b38a919 100644 --- a/keyboards/xbows/knight/info.json +++ b/keyboards/xbows/knight/info.json @@ -22,98 +22,111 @@ "layouts": { "LAYOUT": { "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":"Delete", "x":14, "y":0, "w":2}, - {"label":"Print Screen", "x":16, "y":0, "w":2}, - - {"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":9, "y":1.5}, - {"label":"&", "x":10, "y":1.5}, - {"label":"*", "x":11, "y":1.5}, - {"label":"(", "x":12, "y":1.5}, - {"label":")", "x":13, "y":1.5}, - {"label":"_", "x":14, "y":1.5}, - {"label":"+", "x":15, "y":1.5}, - {"label":"Backspace", "x":16, "y":1.5, "w":2}, - - {"label":"Tab", "x":0, "y":2.5}, - {"label":"Q", "x":1, "y":2.5}, - {"label":"W", "x":2, "y":2.5}, - {"label":"E", "x":3, "y":2.5}, - {"label":"R", "x":4, "y":2.5}, - {"label":"T", "x":5, "y":2.5}, - {"label":"Y", "x":9, "y":2.5}, - {"label":"U", "x":10, "y":2.5}, - {"label":"I", "x":11, "y":2.5}, - {"label":"O", "x":12, "y":2.5}, - {"label":"P", "x":13, "y":2.5}, - {"label":"{", "x":14, "y":2.5}, - {"label":"}", "x":15, "y":2.5}, - {"label":"|", "x":16, "y":2.5}, - {"label":"Page Up", "x":17, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5}, - {"label":"A", "x":1, "y":3.5}, - {"label":"S", "x":2, "y":3.5}, - {"label":"D", "x":3, "y":3.5}, - {"label":"F", "x":4, "y":3.5}, - {"label":"G", "x":5, "y":3.5}, - {"label":"Backspace", "x":6.75, "y":3.5, "w":1.5}, - {"label":"H", "x":9, "y":3.5}, - {"label":"J", "x":10, "y":3.5}, - {"label":"K", "x":11, "y":3.5}, - {"label":"L", "x":12, "y":3.5}, - {"label":":", "x":13, "y":3.5}, - {"label":"\"", "x":14, "y":3.5}, - {"label":"Enter", "x":15, "y":3.5, "w":2}, - {"label":"Page Down", "x":17, "y":3.5}, - - {"label":"Shift", "x":0, "y":4.5}, - {"label":"Z", "x":1, "y":4.5}, - {"label":"X", "x":2, "y":4.5}, - {"label":"C", "x":3, "y":4.5}, - {"label":"V", "x":4, "y":4.5}, - {"label":"B", "x":5, "y":4.5}, - {"label":"Enter", "x":6.5, "y":4.5, "w":2}, - {"label":"N", "x":9, "y":4.5}, - {"label":"M", "x":10, "y":4.5}, - {"label":"<", "x":11, "y":4.5}, - {"label":">", "x":12, "y":4.5}, - {"label":"?", "x":13, "y":4.5}, - {"label":"Shift", "x":14, "y":4.5}, - {"label":"Up", "x":16, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5}, - {"label":"Win", "x":1, "y":5.5}, - {"label":"Alt", "x":2, "y":5.5, "w":2}, - {"label":"Space", "x":4, "y":5.5, "w":2}, - {"label":"Ctrl", "x":6, "y":5.5, "w":1.5}, - {"label":"Shift", "x":7.5, "y":5.5, "w":1.5}, - {"label":"Space", "x":9, "y":5.5, "w":2}, - {"label":"Alt", "x":11, "y":5.5, "w":2}, - {"label":"Fn", "x":13, "y":5.5}, - {"label":"Ctrl", "x":14, "y":5.5}, - {"label":"Left", "x":15, "y":5.5}, - {"label":"Down", "x":16, "y":5.5}, - {"label":"Right", "x":17, "y":5.5} + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0, "w": 2}, + + {"label": "Print Screen", "matrix": [0, 14], "x": 16, "y": 0, "w": 2}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5}, + + {"label": "^", "matrix": [1, 7], "x": 9, "y": 1.5}, + {"label": "&", "matrix": [1, 8], "x": 10, "y": 1.5}, + {"label": "*", "matrix": [1, 9], "x": 11, "y": 1.5}, + {"label": "(", "matrix": [1, 10], "x": 12, "y": 1.5}, + {"label": ")", "matrix": [1, 11], "x": 13, "y": 1.5}, + {"label": "_", "matrix": [1, 12], "x": 14, "y": 1.5}, + {"label": "+", "matrix": [1, 13], "x": 15, "y": 1.5}, + {"label": "Backspace", "matrix": [1, 14], "x": 16, "y": 1.5, "w": 2}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "Q", "matrix": [2, 1], "x": 1, "y": 2.5}, + {"label": "W", "matrix": [2, 2], "x": 2, "y": 2.5}, + {"label": "E", "matrix": [2, 3], "x": 3, "y": 2.5}, + {"label": "R", "matrix": [2, 4], "x": 4, "y": 2.5}, + {"label": "T", "matrix": [2, 5], "x": 5, "y": 2.5}, + + {"label": "Y", "matrix": [2, 7], "x": 9, "y": 2.5}, + {"label": "U", "matrix": [2, 8], "x": 10, "y": 2.5}, + {"label": "I", "matrix": [2, 9], "x": 11, "y": 2.5}, + {"label": "O", "matrix": [2, 10], "x": 12, "y": 2.5}, + {"label": "P", "matrix": [2, 11], "x": 13, "y": 2.5}, + {"label": "{", "matrix": [2, 12], "x": 14, "y": 2.5}, + {"label": "}", "matrix": [2, 13], "x": 15, "y": 2.5}, + {"label": "|", "matrix": [2, 14], "x": 16, "y": 2.5}, + {"label": "Page Up", "matrix": [2, 6], "x": 17, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5}, + {"label": "A", "matrix": [3, 1], "x": 1, "y": 3.5}, + {"label": "S", "matrix": [3, 2], "x": 2, "y": 3.5}, + {"label": "D", "matrix": [3, 3], "x": 3, "y": 3.5}, + {"label": "F", "matrix": [3, 4], "x": 4, "y": 3.5}, + {"label": "G", "matrix": [3, 5], "x": 5, "y": 3.5}, + + {"label": "Backspace", "matrix": [3, 6], "x": 6.75, "y": 3.5, "w": 1.5}, + + {"label": "H", "matrix": [3, 7], "x": 9, "y": 3.5}, + {"label": "J", "matrix": [3, 8], "x": 10, "y": 3.5}, + {"label": "K", "matrix": [3, 9], "x": 11, "y": 3.5}, + {"label": "L", "matrix": [3, 10], "x": 12, "y": 3.5}, + {"label": ":", "matrix": [3, 11], "x": 13, "y": 3.5}, + {"label": "\"", "matrix": [3, 12], "x": 14, "y": 3.5}, + {"label": "Enter", "matrix": [3, 13], "x": 15, "y": 3.5, "w": 2}, + + {"label": "Page Down", "matrix": [3, 14], "x": 17, "y": 3.5}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5}, + {"label": "Z", "matrix": [4, 1], "x": 1, "y": 4.5}, + {"label": "X", "matrix": [4, 2], "x": 2, "y": 4.5}, + {"label": "C", "matrix": [4, 3], "x": 3, "y": 4.5}, + {"label": "V", "matrix": [4, 4], "x": 4, "y": 4.5}, + {"label": "B", "matrix": [4, 5], "x": 5, "y": 4.5}, + + {"label": "Enter", "matrix": [4, 6], "x": 6.5, "y": 4.5, "w": 2}, + + {"label": "N", "matrix": [4, 7], "x": 9, "y": 4.5}, + {"label": "M", "matrix": [4, 8], "x": 10, "y": 4.5}, + {"label": "<", "matrix": [4, 9], "x": 11, "y": 4.5}, + {"label": ">", "matrix": [4, 10], "x": 12, "y": 4.5}, + {"label": "?", "matrix": [4, 11], "x": 13, "y": 4.5}, + {"label": "Shift", "matrix": [4, 12], "x": 14, "y": 4.5}, + + {"label": "Up", "matrix": [4, 13], "x": 16, "y": 4.5}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5}, + {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5.5}, + {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5.5, "w": 2}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.5, "w": 2}, + {"label": "Ctrl", "matrix": [5, 5], "x": 6, "y": 5.5, "w": 1.5}, + {"label": "Shift", "matrix": [5, 6], "x": 7.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [5, 7], "x": 9, "y": 5.5, "w": 2}, + + {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.5, "w": 2}, + {"label": "Fn", "matrix": [5, 10], "x": 13, "y": 5.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 14, "y": 5.5}, + {"label": "Left", "matrix": [5, 12], "x": 15, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 16, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 17, "y": 5.5} ] } } diff --git a/keyboards/xbows/knight/knight.c b/keyboards/xbows/knight/knight.c index 377c79555d26..5be49f9d6fc1 100644 --- a/keyboards/xbows/knight/knight.c +++ b/keyboards/xbows/knight/knight.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "knight.h" + #include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/xbows/knight/knight.h b/keyboards/xbows/knight/knight.h deleted file mode 100644 index a6497119ba27..000000000000 --- a/keyboards/xbows/knight/knight.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Shulin Huang - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K206, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \ - K500, K501, K502, K504, K505, K506, K507, K509, K510, K511, K512, K513, K514 \ -) \ - { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \ - { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 } \ -} diff --git a/keyboards/xbows/knight_plus/info.json b/keyboards/xbows/knight_plus/info.json index 837d292932dc..7aa1fe74f5c5 100644 --- a/keyboards/xbows/knight_plus/info.json +++ b/keyboards/xbows/knight_plus/info.json @@ -22,98 +22,111 @@ "layouts": { "LAYOUT": { "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":"Delete", "x":14, "y":0, "w":2}, - {"label":"Print Screen", "x":16, "y":0, "w":2}, - - {"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":9, "y":1.5}, - {"label":"&", "x":10, "y":1.5}, - {"label":"*", "x":11, "y":1.5}, - {"label":"(", "x":12, "y":1.5}, - {"label":")", "x":13, "y":1.5}, - {"label":"_", "x":14, "y":1.5}, - {"label":"+", "x":15, "y":1.5}, - {"label":"Backspace", "x":16, "y":1.5, "w":2}, - - {"label":"Tab", "x":0, "y":2.5}, - {"label":"Q", "x":1, "y":2.5}, - {"label":"W", "x":2, "y":2.5}, - {"label":"E", "x":3, "y":2.5}, - {"label":"R", "x":4, "y":2.5}, - {"label":"T", "x":5, "y":2.5}, - {"label":"Y", "x":9, "y":2.5}, - {"label":"U", "x":10, "y":2.5}, - {"label":"I", "x":11, "y":2.5}, - {"label":"O", "x":12, "y":2.5}, - {"label":"P", "x":13, "y":2.5}, - {"label":"{", "x":14, "y":2.5}, - {"label":"}", "x":15, "y":2.5}, - {"label":"|", "x":16, "y":2.5}, - {"label":"Page Up", "x":17, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5}, - {"label":"A", "x":1, "y":3.5}, - {"label":"S", "x":2, "y":3.5}, - {"label":"D", "x":3, "y":3.5}, - {"label":"F", "x":4, "y":3.5}, - {"label":"G", "x":5, "y":3.5}, - {"label":"Backspace", "x":6.75, "y":3.5, "w":1.5}, - {"label":"H", "x":9, "y":3.5}, - {"label":"J", "x":10, "y":3.5}, - {"label":"K", "x":11, "y":3.5}, - {"label":"L", "x":12, "y":3.5}, - {"label":":", "x":13, "y":3.5}, - {"label":"\"", "x":14, "y":3.5}, - {"label":"Enter", "x":15, "y":3.5, "w":2}, - {"label":"Page Down", "x":17, "y":3.5}, - - {"label":"Shift", "x":0, "y":4.5}, - {"label":"Z", "x":1, "y":4.5}, - {"label":"X", "x":2, "y":4.5}, - {"label":"C", "x":3, "y":4.5}, - {"label":"V", "x":4, "y":4.5}, - {"label":"B", "x":5, "y":4.5}, - {"label":"Enter", "x":6.5, "y":4.5, "w":2}, - {"label":"N", "x":9, "y":4.5}, - {"label":"M", "x":10, "y":4.5}, - {"label":"<", "x":11, "y":4.5}, - {"label":">", "x":12, "y":4.5}, - {"label":"?", "x":13, "y":4.5}, - {"label":"Shift", "x":14, "y":4.5}, - {"label":"Up", "x":16, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5}, - {"label":"Win", "x":1, "y":5.5}, - {"label":"Alt", "x":2, "y":5.5, "w":2}, - {"label":"Space", "x":4, "y":5.5, "w":2}, - {"label":"Ctrl", "x":6, "y":5.5, "w":1.5}, - {"label":"Shift", "x":7.5, "y":5.5, "w":1.5}, - {"label":"Space", "x":9, "y":5.5, "w":2}, - {"label":"Alt", "x":11, "y":5.5, "w":2}, - {"label":"Fn", "x":13, "y":5.5}, - {"label":"Ctrl", "x":14, "y":5.5}, - {"label":"Left", "x":15, "y":5.5}, - {"label":"Down", "x":16, "y":5.5}, - {"label":"Right", "x":17, "y":5.5} + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0, "w": 2}, + + {"label": "Print Screen", "matrix": [0, 14], "x": 16, "y": 0, "w": 2}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5}, + + {"label": "^", "matrix": [1, 7], "x": 9, "y": 1.5}, + {"label": "&", "matrix": [1, 8], "x": 10, "y": 1.5}, + {"label": "*", "matrix": [1, 9], "x": 11, "y": 1.5}, + {"label": "(", "matrix": [1, 10], "x": 12, "y": 1.5}, + {"label": ")", "matrix": [1, 11], "x": 13, "y": 1.5}, + {"label": "_", "matrix": [1, 12], "x": 14, "y": 1.5}, + {"label": "+", "matrix": [1, 13], "x": 15, "y": 1.5}, + {"label": "Backspace", "matrix": [1, 14], "x": 16, "y": 1.5, "w": 2}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "Q", "matrix": [2, 1], "x": 1, "y": 2.5}, + {"label": "W", "matrix": [2, 2], "x": 2, "y": 2.5}, + {"label": "E", "matrix": [2, 3], "x": 3, "y": 2.5}, + {"label": "R", "matrix": [2, 4], "x": 4, "y": 2.5}, + {"label": "T", "matrix": [2, 5], "x": 5, "y": 2.5}, + + {"label": "Y", "matrix": [2, 6], "x": 9, "y": 2.5}, + {"label": "U", "matrix": [2, 7], "x": 10, "y": 2.5}, + {"label": "I", "matrix": [2, 8], "x": 11, "y": 2.5}, + {"label": "O", "matrix": [2, 9], "x": 12, "y": 2.5}, + {"label": "P", "matrix": [2, 10], "x": 13, "y": 2.5}, + {"label": "{", "matrix": [2, 11], "x": 14, "y": 2.5}, + {"label": "}", "matrix": [2, 12], "x": 15, "y": 2.5}, + {"label": "|", "matrix": [2, 13], "x": 16, "y": 2.5}, + {"label": "Page Up", "matrix": [2, 14], "x": 17, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5}, + {"label": "A", "matrix": [3, 1], "x": 1, "y": 3.5}, + {"label": "S", "matrix": [3, 2], "x": 2, "y": 3.5}, + {"label": "D", "matrix": [3, 3], "x": 3, "y": 3.5}, + {"label": "F", "matrix": [3, 4], "x": 4, "y": 3.5}, + {"label": "G", "matrix": [3, 5], "x": 5, "y": 3.5}, + + {"label": "Backspace", "matrix": [3, 6], "x": 6.75, "y": 3.5, "w": 1.5}, + + {"label": "H", "matrix": [3, 7], "x": 9, "y": 3.5}, + {"label": "J", "matrix": [3, 8], "x": 10, "y": 3.5}, + {"label": "K", "matrix": [3, 9], "x": 11, "y": 3.5}, + {"label": "L", "matrix": [3, 10], "x": 12, "y": 3.5}, + {"label": ":", "matrix": [3, 11], "x": 13, "y": 3.5}, + {"label": "\"", "matrix": [3, 12], "x": 14, "y": 3.5}, + {"label": "Enter", "matrix": [3, 13], "x": 15, "y": 3.5, "w": 2}, + + {"label": "Page Down", "matrix": [3, 14], "x": 17, "y": 3.5}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5}, + {"label": "Z", "matrix": [4, 1], "x": 1, "y": 4.5}, + {"label": "X", "matrix": [4, 2], "x": 2, "y": 4.5}, + {"label": "C", "matrix": [4, 3], "x": 3, "y": 4.5}, + {"label": "V", "matrix": [4, 4], "x": 4, "y": 4.5}, + {"label": "B", "matrix": [4, 5], "x": 5, "y": 4.5}, + + {"label": "Enter", "matrix": [4, 6], "x": 6.5, "y": 4.5, "w": 2}, + + {"label": "N", "matrix": [4, 7], "x": 9, "y": 4.5}, + {"label": "M", "matrix": [4, 8], "x": 10, "y": 4.5}, + {"label": "<", "matrix": [4, 9], "x": 11, "y": 4.5}, + {"label": ">", "matrix": [4, 10], "x": 12, "y": 4.5}, + {"label": "?", "matrix": [4, 11], "x": 13, "y": 4.5}, + {"label": "Shift", "matrix": [4, 12], "x": 14, "y": 4.5}, + + {"label": "Up", "matrix": [4, 13], "x": 16, "y": 4.5}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5}, + {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5.5}, + {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5.5, "w": 2}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.5, "w": 2}, + {"label": "Ctrl", "matrix": [5, 5], "x": 6, "y": 5.5, "w": 1.5}, + {"label": "Shift", "matrix": [5, 6], "x": 7.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [5, 7], "x": 9, "y": 5.5, "w": 2}, + + {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.5, "w": 2}, + {"label": "Fn", "matrix": [5, 10], "x": 13, "y": 5.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 14, "y": 5.5}, + {"label": "Left", "matrix": [5, 12], "x": 15, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 16, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 17, "y": 5.5} ] } } diff --git a/keyboards/xbows/knight_plus/knight_plus.c b/keyboards/xbows/knight_plus/knight_plus.c index 2c377aaf51a0..ce718d22a52f 100644 --- a/keyboards/xbows/knight_plus/knight_plus.c +++ b/keyboards/xbows/knight_plus/knight_plus.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "knight_plus.h" + #include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/xbows/knight_plus/knight_plus.h b/keyboards/xbows/knight_plus/knight_plus.h deleted file mode 100644 index 735c3d051e95..000000000000 --- a/keyboards/xbows/knight_plus/knight_plus.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2021 Shulin Huang - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \ - K500, K501, K502, K504, K505, K506, K507, K509, K510, K511, K512, K513, K514 \ -) \ - { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \ - { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 } \ -} diff --git a/keyboards/xbows/nature/info.json b/keyboards/xbows/nature/info.json index fdabd72f3261..0287c13ee4a4 100644 --- a/keyboards/xbows/nature/info.json +++ b/keyboards/xbows/nature/info.json @@ -22,98 +22,109 @@ "layouts": { "LAYOUT": { "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":"Delete", "x":14, "y":0, "w":2}, - {"label":"Print Screen", "x":16, "y":0, "w":2}, - - {"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":9, "y":1.5}, - {"label":"&", "x":10, "y":1.5}, - {"label":"*", "x":11, "y":1.5}, - {"label":"(", "x":12, "y":1.5}, - {"label":")", "x":13, "y":1.5}, - {"label":"_", "x":14, "y":1.5}, - {"label":"+", "x":15, "y":1.5}, - {"label":"Backspace", "x":16, "y":1.5, "w":2}, - - {"label":"Tab", "x":0, "y":2.5}, - {"label":"Q", "x":1, "y":2.5}, - {"label":"W", "x":2, "y":2.5}, - {"label":"E", "x":3, "y":2.5}, - {"label":"R", "x":4, "y":2.5}, - {"label":"T", "x":5, "y":2.5}, - {"label":"Y", "x":9, "y":2.5}, - {"label":"U", "x":10, "y":2.5}, - {"label":"I", "x":11, "y":2.5}, - {"label":"O", "x":12, "y":2.5}, - {"label":"P", "x":13, "y":2.5}, - {"label":"{", "x":14, "y":2.5}, - {"label":"}", "x":15, "y":2.5}, - {"label":"|", "x":16, "y":2.5}, - {"label":"Page Up", "x":17, "y":2.5}, - - {"label":"Caps Lock", "x":0, "y":3.5}, - {"label":"A", "x":1, "y":3.5}, - {"label":"S", "x":2, "y":3.5}, - {"label":"D", "x":3, "y":3.5}, - {"label":"F", "x":4, "y":3.5}, - {"label":"G", "x":5, "y":3.5}, - {"label":"Backspace", "x":6, "y":3.5, "w":3}, - {"label":"H", "x":9, "y":3.5}, - {"label":"J", "x":10, "y":3.5}, - {"label":"K", "x":11, "y":3.5}, - {"label":"L", "x":12, "y":3.5}, - {"label":":", "x":13, "y":3.5}, - {"label":"\"", "x":14, "y":3.5}, - {"label":"Enter", "x":15, "y":3.5, "w":2}, - {"label":"Page Down", "x":17, "y":3.5}, - - {"label":"Shift", "x":0, "y":4.5}, - {"label":"Z", "x":1, "y":4.5}, - {"label":"X", "x":2, "y":4.5}, - {"label":"C", "x":3, "y":4.5}, - {"label":"V", "x":4, "y":4.5}, - {"label":"B", "x":5, "y":4.5}, - {"label":"Enter", "x":6, "y":4.5, "w":3}, - {"label":"N", "x":9, "y":4.5}, - {"label":"M", "x":10, "y":4.5}, - {"label":"<", "x":11, "y":4.5}, - {"label":">", "x":12, "y":4.5}, - {"label":"?", "x":13, "y":4.5}, - {"label":"Shift", "x":14, "y":4.5}, - {"label":"Up", "x":16, "y":4.5}, - - {"label":"Ctrl", "x":0, "y":5.5}, - {"label":"Win", "x":1, "y":5.5}, - {"label":"Alt", "x":2, "y":5.5, "w":2}, - {"label":"Space", "x":4, "y":5.5, "w":2}, - {"label":"Ctrl", "x":6, "y":5.5, "w":1.5}, - {"label":"Shift", "x":7.5, "y":5.5, "w":1.5}, - {"label":"Space", "x":9, "y":5.5, "w":2}, - {"label":"Alt", "x":11, "y":5.5, "w":2}, - {"label":"Fn", "x":13, "y":5.5}, - {"label":"Ctrl", "x":14, "y":5.5}, - {"label":"Left", "x":15, "y":5.5}, - {"label":"Down", "x":16, "y":5.5}, - {"label":"Right", "x":17, "y":5.5} + {"label": "Esc", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "F1", "matrix": [0, 1], "x": 1.25, "y": 0}, + {"label": "F2", "matrix": [0, 2], "x": 2.25, "y": 0}, + {"label": "F3", "matrix": [0, 3], "x": 3.25, "y": 0}, + {"label": "F4", "matrix": [0, 4], "x": 4.25, "y": 0}, + + {"label": "F5", "matrix": [0, 5], "x": 5.5, "y": 0}, + {"label": "F6", "matrix": [0, 6], "x": 6.5, "y": 0}, + {"label": "F7", "matrix": [0, 7], "x": 7.5, "y": 0}, + {"label": "F8", "matrix": [0, 8], "x": 8.5, "y": 0}, + + {"label": "F9", "matrix": [0, 9], "x": 9.75, "y": 0}, + {"label": "F10", "matrix": [0, 10], "x": 10.75, "y": 0}, + {"label": "F11", "matrix": [0, 11], "x": 11.75, "y": 0}, + {"label": "F12", "matrix": [0, 12], "x": 12.75, "y": 0}, + + {"label": "Delete", "matrix": [0, 13], "x": 14, "y": 0, "w": 2}, + + {"label": "Print Screen", "matrix": [0, 14], "x": 16, "y": 0, "w": 2}, + + {"label": "~", "matrix": [1, 0], "x": 0, "y": 1.5}, + {"label": "!", "matrix": [1, 1], "x": 1, "y": 1.5}, + {"label": "@", "matrix": [1, 2], "x": 2, "y": 1.5}, + {"label": "#", "matrix": [1, 3], "x": 3, "y": 1.5}, + {"label": "$", "matrix": [1, 4], "x": 4, "y": 1.5}, + {"label": "%", "matrix": [1, 5], "x": 5, "y": 1.5}, + + {"label": "^", "matrix": [1, 7], "x": 9, "y": 1.5}, + {"label": "&", "matrix": [1, 8], "x": 10, "y": 1.5}, + {"label": "*", "matrix": [1, 9], "x": 11, "y": 1.5}, + {"label": "(", "matrix": [1, 10], "x": 12, "y": 1.5}, + {"label": ")", "matrix": [1, 11], "x": 13, "y": 1.5}, + {"label": "_", "matrix": [1, 12], "x": 14, "y": 1.5}, + {"label": "+", "matrix": [1, 13], "x": 15, "y": 1.5}, + {"label": "Backspace", "matrix": [1, 14], "x": 16, "y": 1.5, "w": 2}, + + {"label": "Tab", "matrix": [2, 0], "x": 0, "y": 2.5}, + {"label": "Q", "matrix": [2, 1], "x": 1, "y": 2.5}, + {"label": "W", "matrix": [2, 2], "x": 2, "y": 2.5}, + {"label": "E", "matrix": [2, 3], "x": 3, "y": 2.5}, + {"label": "R", "matrix": [2, 4], "x": 4, "y": 2.5}, + {"label": "T", "matrix": [2, 5], "x": 5, "y": 2.5}, + + {"label": "Y", "matrix": [2, 7], "x": 9, "y": 2.5}, + {"label": "U", "matrix": [2, 8], "x": 10, "y": 2.5}, + {"label": "I", "matrix": [2, 9], "x": 11, "y": 2.5}, + {"label": "O", "matrix": [2, 10], "x": 12, "y": 2.5}, + {"label": "P", "matrix": [2, 11], "x": 13, "y": 2.5}, + {"label": "{", "matrix": [2, 12], "x": 14, "y": 2.5}, + {"label": "}", "matrix": [2, 13], "x": 15, "y": 2.5}, + {"label": "|", "matrix": [2, 14], "x": 16, "y": 2.5}, + {"label": "Page Up", "matrix": [2, 6], "x": 17, "y": 2.5}, + + {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5}, + {"label": "A", "matrix": [3, 1], "x": 1, "y": 3.5}, + {"label": "S", "matrix": [3, 2], "x": 2, "y": 3.5}, + {"label": "D", "matrix": [3, 3], "x": 3, "y": 3.5}, + {"label": "F", "matrix": [3, 4], "x": 4, "y": 3.5}, + {"label": "G", "matrix": [3, 5], "x": 5, "y": 3.5}, + {"label": "Backspace", "matrix": [3, 6], "x": 6, "y": 3.5, "w": 3}, + + {"label": "H", "matrix": [3, 7], "x": 9, "y": 3.5}, + {"label": "J", "matrix": [3, 8], "x": 10, "y": 3.5}, + {"label": "K", "matrix": [3, 9], "x": 11, "y": 3.5}, + {"label": "L", "matrix": [3, 10], "x": 12, "y": 3.5}, + {"label": ":", "matrix": [3, 11], "x": 13, "y": 3.5}, + {"label": "\"", "matrix": [3, 12], "x": 14, "y": 3.5}, + {"label": "Enter", "matrix": [3, 13], "x": 15, "y": 3.5, "w": 2}, + + {"label": "Page Down", "matrix": [3, 14], "x": 17, "y": 3.5}, + + {"label": "Shift", "matrix": [4, 0], "x": 0, "y": 4.5}, + {"label": "Z", "matrix": [4, 1], "x": 1, "y": 4.5}, + {"label": "X", "matrix": [4, 2], "x": 2, "y": 4.5}, + {"label": "C", "matrix": [4, 3], "x": 3, "y": 4.5}, + {"label": "V", "matrix": [4, 4], "x": 4, "y": 4.5}, + {"label": "B", "matrix": [4, 5], "x": 5, "y": 4.5}, + {"label": "Enter", "matrix": [4, 6], "x": 6, "y": 4.5, "w": 3}, + + {"label": "N", "matrix": [4, 7], "x": 9, "y": 4.5}, + {"label": "M", "matrix": [4, 8], "x": 10, "y": 4.5}, + {"label": "<", "matrix": [4, 9], "x": 11, "y": 4.5}, + {"label": ">", "matrix": [4, 10], "x": 12, "y": 4.5}, + {"label": "?", "matrix": [4, 11], "x": 13, "y": 4.5}, + {"label": "Shift", "matrix": [4, 12], "x": 14, "y": 4.5}, + + {"label": "Up", "matrix": [4, 13], "x": 16, "y": 4.5}, + + {"label": "Ctrl", "matrix": [5, 0], "x": 0, "y": 5.5}, + {"label": "Win", "matrix": [5, 1], "x": 1, "y": 5.5}, + {"label": "Alt", "matrix": [5, 2], "x": 2, "y": 5.5, "w": 2}, + {"label": "Space", "matrix": [5, 4], "x": 4, "y": 5.5, "w": 2}, + {"label": "Ctrl", "matrix": [5, 5], "x": 6, "y": 5.5, "w": 1.5}, + {"label": "Shift", "matrix": [5, 6], "x": 7.5, "y": 5.5, "w": 1.5}, + {"label": "Space", "matrix": [5, 7], "x": 9, "y": 5.5, "w": 2}, + + {"label": "Alt", "matrix": [5, 9], "x": 11, "y": 5.5, "w": 2}, + {"label": "Fn", "matrix": [5, 10], "x": 13, "y": 5.5}, + {"label": "Ctrl", "matrix": [5, 11], "x": 14, "y": 5.5}, + {"label": "Left", "matrix": [5, 12], "x": 15, "y": 5.5}, + {"label": "Down", "matrix": [5, 13], "x": 16, "y": 5.5}, + {"label": "Right", "matrix": [5, 14], "x": 17, "y": 5.5} ] } } diff --git a/keyboards/xbows/nature/nature.c b/keyboards/xbows/nature/nature.c index faa84921237f..da0cb54a60e9 100644 --- a/keyboards/xbows/nature/nature.c +++ b/keyboards/xbows/nature/nature.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #include "nature.h" + #include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/xbows/nature/nature.h b/keyboards/xbows/nature/nature.h deleted file mode 100644 index 02e1af5205f9..000000000000 --- a/keyboards/xbows/nature/nature.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2020 Shulin Huang - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K206, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \ - K500, K501, K502, K504, K505, K506, K507, K509, K510, K511, K512, K513, K514 \ -) \ - { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \ - { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 } \ -} diff --git a/keyboards/xbows/woody/info.json b/keyboards/xbows/woody/info.json index add3a3301454..437563ac99f4 100644 --- a/keyboards/xbows/woody/info.json +++ b/keyboards/xbows/woody/info.json @@ -21,7 +21,79 @@ "debounce": 3, "layouts": { "LAYOUT": { - "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, "w":2}, {"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, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"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.5}, {"x":4, "y":4, "w":6.25}, {"x":10.25, "y":4, "w":1.5}, {"x":11.75, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"matrix": [4, 6], "x": 4, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4, "w": 1.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/xbows/woody/woody.c b/keyboards/xbows/woody/woody.c index 1f85907f95d6..9757bde9c94d 100644 --- a/keyboards/xbows/woody/woody.c +++ b/keyboards/xbows/woody/woody.c @@ -1,4 +1,4 @@ -#include "woody.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/xbows/woody/woody.h b/keyboards/xbows/woody/woody.h deleted file mode 100644 index 48eab82a6821..000000000000 --- a/keyboards/xbows/woody/woody.h +++ /dev/null @@ -1,16 +0,0 @@ -#pragma once -#define XXX KC_NO -#include "quantum.h" -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, K2E, \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, K3D, K3E, \ - K40, K41, K42, K46, K49, K4B, K4C, K4D, K4E \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, XXX, K2D, K2E }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, XXX, K3C, K3D, K3E }, \ - { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, XXX, K4B, K4C, K4D, K4E } \ -} diff --git a/keyboards/xenon/info.json b/keyboards/xenon/info.json index 0e3cb5af1048..2bc916fde4ab 100644 --- a/keyboards/xenon/info.json +++ b/keyboards/xenon/info.json @@ -26,64 +26,69 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0.75}, - {"x":1, "y":0.75}, - {"x":2, "y":0.25}, - {"x":3, "y":0}, - {"x":4, "y":0.25}, - {"x":5, "y":0.5}, - {"x":9, "y":0.5}, - {"x":10, "y":0.25}, - {"x":11, "y":0}, - {"x":12, "y":0.25}, - {"x":13, "y":0.75}, - {"x":14, "y":0.75}, + {"matrix": [0, 6], "x": 0, "y": 0.75}, + {"matrix": [0, 5], "x": 1, "y": 0.75}, + {"matrix": [0, 4], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 2], "x": 4, "y": 0.25}, + {"matrix": [0, 1], "x": 5, "y": 0.5}, - {"x":0, "y":1.75}, - {"x":1, "y":1.75}, - {"x":2, "y":1.25}, - {"x":3, "y":1}, - {"x":4, "y":1.25}, - {"x":5, "y":1.5}, - {"x":9, "y":1.5}, - {"x":10, "y":1.25}, - {"x":11, "y":1}, - {"x":12, "y":1.25}, - {"x":13, "y":1.75}, - {"x":14, "y":1.75}, + {"matrix": [5, 1], "x": 9, "y": 0.5}, + {"matrix": [5, 2], "x": 10, "y": 0.25}, + {"matrix": [5, 3], "x": 11, "y": 0}, + {"matrix": [5, 4], "x": 12, "y": 0.25}, + {"matrix": [5, 5], "x": 13, "y": 0.75}, + {"matrix": [5, 6], "x": 14, "y": 0.75}, - {"x":0, "y":2.75}, - {"x":1, "y":2.75}, - {"x":2, "y":2.25}, - {"x":3, "y":2}, - {"x":4, "y":2.25}, - {"x":5, "y":2.5}, - {"x":9, "y":2.5}, - {"x":10, "y":2.25}, - {"x":11, "y":2}, - {"x":12, "y":2.25}, - {"x":13, "y":2.75}, - {"x":14, "y":2.75}, + {"matrix": [1, 6], "x": 0, "y": 1.75}, + {"matrix": [1, 5], "x": 1, "y": 1.75}, + {"matrix": [1, 4], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 2], "x": 4, "y": 1.25}, + {"matrix": [1, 1], "x": 5, "y": 1.5}, - {"x":2, "y":3.25}, - {"x":3, "y":3}, - {"x":4, "y":3.25}, - {"x":5, "y":3.5}, - {"x":6, "y":3.5}, - {"x":8, "y":3.5}, - {"x":9, "y":3.5}, - {"x":10, "y":3.25}, - {"x":11, "y":3}, - {"x":12, "y":3.25}, + {"matrix": [6, 1], "x": 9, "y": 1.5}, + {"matrix": [6, 2], "x": 10, "y": 1.25}, + {"matrix": [6, 3], "x": 11, "y": 1}, + {"matrix": [6, 4], "x": 12, "y": 1.25}, + {"matrix": [6, 5], "x": 13, "y": 1.75}, + {"matrix": [6, 6], "x": 14, "y": 1.75}, - {"x":3, "y":4}, - {"x":4, "y":4.25}, - {"x":5, "y":4.5}, - {"x":6, "y":4.5}, - {"x":8, "y":4.5}, - {"x":9, "y":4.5}, - {"x":10, "y":4.25}, - {"x":11, "y":4} + {"matrix": [2, 6], "x": 0, "y": 2.75}, + {"matrix": [2, 5], "x": 1, "y": 2.75}, + {"matrix": [2, 4], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 2], "x": 4, "y": 2.25}, + {"matrix": [2, 1], "x": 5, "y": 2.5}, + + {"matrix": [7, 1], "x": 9, "y": 2.5}, + {"matrix": [7, 2], "x": 10, "y": 2.25}, + {"matrix": [7, 3], "x": 11, "y": 2}, + {"matrix": [7, 4], "x": 12, "y": 2.25}, + {"matrix": [7, 5], "x": 13, "y": 2.75}, + {"matrix": [7, 6], "x": 14, "y": 2.75}, + + {"matrix": [3, 4], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 2], "x": 4, "y": 3.25}, + {"matrix": [3, 1], "x": 5, "y": 3.5}, + {"matrix": [3, 0], "x": 6, "y": 3.5}, + + {"matrix": [8, 0], "x": 8, "y": 3.5}, + {"matrix": [8, 1], "x": 9, "y": 3.5}, + {"matrix": [8, 2], "x": 10, "y": 3.25}, + {"matrix": [8, 3], "x": 11, "y": 3}, + {"matrix": [8, 4], "x": 12, "y": 3.25}, + + {"matrix": [4, 3], "x": 3, "y": 4}, + {"matrix": [4, 2], "x": 4, "y": 4.25}, + {"matrix": [4, 1], "x": 5, "y": 4.5}, + {"matrix": [4, 0], "x": 6, "y": 4.5}, + + {"matrix": [9, 0], "x": 8, "y": 4.5}, + {"matrix": [9, 1], "x": 9, "y": 4.5}, + {"matrix": [9, 2], "x": 10, "y": 4.25}, + {"matrix": [9, 3], "x": 11, "y": 4} ] } } diff --git a/keyboards/xenon/xenon.c b/keyboards/xenon/xenon.c index 9ca572077616..e298c6667fd6 100644 --- a/keyboards/xenon/xenon.c +++ b/keyboards/xenon/xenon.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "xenon.h" +#include "quantum.h" #ifdef OLED_ENABLE oled_rotation_t oled_init_kb(oled_rotation_t rotation) { diff --git a/keyboards/xenon/xenon.h b/keyboards/xenon/xenon.h deleted file mode 100644 index 030d9bcb8c18..000000000000 --- a/keyboards/xenon/xenon.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 Kyrre Havik Eriksen - * - * 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 XXX KC_NO - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R06, R07, R08, R09, R10, R11, \ - L12, L13, L14, L15, L16, L17, R18, R19, R20, R21, R22, R23, \ - L24, L25, L26, L27, L28, L29, R30, R31, R32, R33, R34, R35, \ - L36, L37, L38, L39, L40, R41, R42, R43, R44, R45, \ - L46, L47, L48, L49, R50, R51, R52, R53 \ -) \ -{ \ - { XXX, L05, L04, L03, L02, L01, L00 }, \ - { XXX, L17, L16, L15, L14, L13, L12 }, \ - { XXX, L29, L28, L27, L26, L25, L24 }, \ - { L40, L39, L38, L37, L36, XXX, XXX }, \ - { L49, L48, L47, L46, XXX, XXX, XXX }, \ - { XXX, R06, R07, R08, R09, R10, R11 }, \ - { XXX, R18, R19, R20, R21, R22, R23 }, \ - { XXX, R30, R31, R32, R33, R34, R35 }, \ - { R41, R42, R43, R44, R45, XXX, XXX }, \ - { R50, R51, R52, R53, XXX, XXX, XXX } \ -} diff --git a/keyboards/yandrstudio/buff67v3/buff67v3.c b/keyboards/yandrstudio/buff67v3/buff67v3.c index 5ba95efbccbc..567cd03d565c 100644 --- a/keyboards/yandrstudio/buff67v3/buff67v3.c +++ b/keyboards/yandrstudio/buff67v3/buff67v3.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "buff67v3.h" +#include "quantum.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/yandrstudio/buff67v3/buff67v3.h b/keyboards/yandrstudio/buff67v3/buff67v3.h deleted file mode 100644 index 64970d3863e4..000000000000 --- a/keyboards/yandrstudio/buff67v3/buff67v3.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ - K400, K401, K402, K405, K409, K410, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 } \ -} diff --git a/keyboards/yandrstudio/buff67v3/info.json b/keyboards/yandrstudio/buff67v3/info.json index 34702641a8c6..69d4903bd635 100644 --- a/keyboards/yandrstudio/buff67v3/info.json +++ b/keyboards/yandrstudio/buff67v3/info.json @@ -18,353 +18,78 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "~", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 7, - "y": 0 - }, - { - "label": "*", - "x": 8, - "y": 0 - }, - { - "label": "(", - "x": 9, - "y": 0 - }, - { - "label": ")", - "x": 10, - "y": 0 - }, - { - "label": "_", - "x": 11, - "y": 0 - }, - { - "label": "+", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "Insert", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "{", - "x": 11.5, - "y": 1 - }, - { - "label": "}", - "x": 12.5, - "y": 1 - }, - { - "label": "|", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "PgUp", - "x": 15, - "y": 1 - }, - { - "label": "Caps Lock", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": ":", - "x": 10.75, - "y": 2 - }, - { - "label": "\"", - "x": 11.75, - "y": 2 - }, - { - "label": "Enter", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "PgDn", - "x": 15, - "y": 2 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": "<", - "x": 9.25, - "y": 3 - }, - { - "label": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "Shift", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "\u2191", - "x": 14, - "y": 3 - }, - { - "label": "Delete", - "x": 15, - "y": 3 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "Alt", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "Fn", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2190", - "x": 13, - "y": 4 - }, - { - "label": "\u2193", - "x": 14, - "y": 4 - }, - { - "label": "\u2192", - "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/yandrstudio/eau87/eau87.h b/keyboards/yandrstudio/eau87/eau87.h deleted file mode 100644 index 681079783758..000000000000 --- a/keyboards/yandrstudio/eau87/eau87.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - 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, K501, K502, K506, K510, K511, K512, 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, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, KC_NO, K510, K511, K512, K513, K514, K515, K516 } \ -} diff --git a/keyboards/yandrstudio/eau87/info.json b/keyboards/yandrstudio/eau87/info.json index 94770678053e..39eeac8564bd 100644 --- a/keyboards/yandrstudio/eau87/info.json +++ b/keyboards/yandrstudio/eau87/info.json @@ -14,455 +14,106 @@ "layouts": { "LAYOUT": { "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.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, - "w": 2 - }, - { - "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": "Enter", - "x": 12.75, - "y": 3.5, - "w": 2.25 - }, - { - "label": "Shift", - "x": 0, - "y": 4.5, - "w": 2.25 - }, - { - "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": "Shift", - "x": 12.25, - "y": 4.5, - "w": 2.75 - }, - { - "label": "\u2191", - "x": 16.25, - "y": 4.5 - }, - { - "label": "Ctrl", - "x": 0, - "y": 5.5, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 5.5, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 5.5, - "w": 1.25 - }, - { - "x": 3.75, - "y": 5.5, - "w": 6.25 - }, - { - "label": "Alt", - "x": 10, - "y": 5.5, - "w": 1.25 - }, - { - "label": "Win", - "x": 11.25, - "y": 5.5, - "w": 1.25 - }, - { - "label": "Menu", - "x": 12.5, - "y": 5.5, - "w": 1.25 - }, - { - "label": "Ctrl", - "x": 13.75, - "y": 5.5, - "w": 1.25 - }, - { - "label": "\u2190", - "x": 15.25, - "y": 5.5 - }, - { - "label": "\u2193", - "x": 16.25, - "y": 5.5 - }, - { - "label": "\u2192", - "x": 17.25, - "y": 5.5 - } + {"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.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + + {"matrix": [1, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.25, "y": 1.5}, + {"matrix": [1, 16], "x": 17.25, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + + {"matrix": [2, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.25, "y": 2.5}, + {"matrix": [2, 16], "x": 17.25, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 13], "x": 12.25, "y": 4.5, "w": 2.75}, + + {"matrix": [4, 15], "x": 16.25, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 13], "x": 13.75, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 14], "x": 15.25, "y": 5.5}, + {"matrix": [5, 15], "x": 16.25, "y": 5.5}, + {"matrix": [5, 16], "x": 17.25, "y": 5.5} ] } } diff --git a/keyboards/yandrstudio/eau_r2/eau_r2.c b/keyboards/yandrstudio/eau_r2/eau_r2.c index f9d5ec32db53..0b1704eae6f1 100644 --- a/keyboards/yandrstudio/eau_r2/eau_r2.c +++ b/keyboards/yandrstudio/eau_r2/eau_r2.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "eau_r2.h" +#include "quantum.h" void board_init(void) { AFIO->MAPR |= AFIO_MAPR_TIM1_REMAP_PARTIALREMAP; diff --git a/keyboards/yandrstudio/eau_r2/eau_r2.h b/keyboards/yandrstudio/eau_r2/eau_r2.h deleted file mode 100644 index 4dc9f59cbb8d..000000000000 --- a/keyboards/yandrstudio/eau_r2/eau_r2.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - K000, K002, K003, K004, K005, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, K116, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, K216, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K413, K415, \ - K500, K501, K502, K505, K509, K510, K513, K514, K515, K516 \ - )\ - { \ - { K000, KC_NO, K002, K003, K004, K005, KC_NO, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115, K116 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215, K216 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, KC_NO, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, KC_NO, K413, KC_NO, K415, KC_NO }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, KC_NO, KC_NO, K513, K514, K515, K516 } \ -} - diff --git a/keyboards/yandrstudio/eau_r2/info.json b/keyboards/yandrstudio/eau_r2/info.json index bdf9be5f1edf..a999291ed960 100644 --- a/keyboards/yandrstudio/eau_r2/info.json +++ b/keyboards/yandrstudio/eau_r2/info.json @@ -18,434 +18,102 @@ "layouts": { "LAYOUT": { "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": "\u00ac", - "x": 0, - "y": 1.25 - }, - { - "label": "!", - "x": 1, - "y": 1.25 - }, - { - "label": "\"", - "x": 2, - "y": 1.25 - }, - { - "label": "\u00a3", - "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": "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": "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": 15.25, - "y": 4.25 - }, - { - "label": "Ctrl", - "x": 0, - "y": 5.25, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 5.25, - "w": 1.25 - }, - { - "x": 3.75, - "y": 5.25, - "w": 6.25 - }, - { - "label": "AltGr", - "x": 10, - "y": 5.25, - "w": 1.25 - }, - { - "label": "Win", - "x": 11.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "Menu", - "x": 12.5, - "y": 5.25, - "w": 1.25 - }, - { - "label": "\u2190", - "x": 14.25, - "y": 5.25 - }, - { - "label": "\u2193", - "x": 15.25, - "y": 5.25 - }, - { - "label": "\u2192", - "x": 16.25, - "y": 5.25 - } + {"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, 7], "x": 6.5, "y": 0}, + {"matrix": [0, 8], "x": 7.5, "y": 0}, + {"matrix": [0, 9], "x": 8.5, "y": 0}, + {"matrix": [0, 10], "x": 9.5, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.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, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.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, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.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, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 15], "x": 15.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, 5], "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, 13], "x": 12.5, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 14], "x": 14.25, "y": 5.25}, + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25} ] } } diff --git a/keyboards/yandrstudio/nightstar75/info.json b/keyboards/yandrstudio/nightstar75/info.json index 899e4a757632..879da94d80c9 100644 --- a/keyboards/yandrstudio/nightstar75/info.json +++ b/keyboards/yandrstudio/nightstar75/info.json @@ -18,414 +18,94 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "0,0", - "x": 0, - "y": 0 - }, - { - "label": "0,1", - "x": 1.25, - "y": 0 - }, - { - "label": "0,2", - "x": 2.25, - "y": 0 - }, - { - "label": "0,3", - "x": 3.25, - "y": 0 - }, - { - "label": "0,4", - "x": 4.25, - "y": 0 - }, - { - "label": "0,5", - "x": 5.5, - "y": 0 - }, - { - "label": "0,6", - "x": 6.5, - "y": 0 - }, - { - "label": "0,7", - "x": 7.5, - "y": 0 - }, - { - "label": "0,8", - "x": 8.5, - "y": 0 - }, - { - "label": "0,9", - "x": 9.75, - "y": 0 - }, - { - "label": "0,10", - "x": 10.75, - "y": 0 - }, - { - "label": "0,11", - "x": 11.75, - "y": 0 - }, - { - "label": "0,12", - "x": 12.75, - "y": 0 - }, - { - "label": "1,0", - "x": 0, - "y": 1.5 - }, - { - "label": "1,1", - "x": 1, - "y": 1.5 - }, - { - "label": "1,2", - "x": 2, - "y": 1.5 - }, - { - "label": "1,3", - "x": 3, - "y": 1.5 - }, - { - "label": "1,4", - "x": 4, - "y": 1.5 - }, - { - "label": "1,5", - "x": 5, - "y": 1.5 - }, - { - "label": "1,6", - "x": 6, - "y": 1.5 - }, - { - "label": "1,7", - "x": 7, - "y": 1.5 - }, - { - "label": "1,8", - "x": 8, - "y": 1.5 - }, - { - "label": "1,9", - "x": 9, - "y": 1.5 - }, - { - "label": "1,10", - "x": 10, - "y": 1.5 - }, - { - "label": "1,11", - "x": 11, - "y": 1.5 - }, - { - "label": "1,12", - "x": 12, - "y": 1.5 - }, - { - "label": "1,13", - "x": 13, - "y": 1.5, - "w": 2 - }, - { - "label": "1,14", - "x": 15, - "y": 1.5 - }, - { - "label": "2,0", - "x": 0, - "y": 2.5, - "w": 1.5 - }, - { - "label": "2,1", - "x": 1.5, - "y": 2.5 - }, - { - "label": "2,2", - "x": 2.5, - "y": 2.5 - }, - { - "label": "2,3", - "x": 3.5, - "y": 2.5 - }, - { - "label": "2,4", - "x": 4.5, - "y": 2.5 - }, - { - "label": "2,5", - "x": 5.5, - "y": 2.5 - }, - { - "label": "2,6", - "x": 6.5, - "y": 2.5 - }, - { - "label": "2,7", - "x": 7.5, - "y": 2.5 - }, - { - "label": "2,8", - "x": 8.5, - "y": 2.5 - }, - { - "label": "2,9", - "x": 9.5, - "y": 2.5 - }, - { - "label": "2,10", - "x": 10.5, - "y": 2.5 - }, - { - "label": "2,11", - "x": 11.5, - "y": 2.5 - }, - { - "label": "2,12", - "x": 12.5, - "y": 2.5 - }, - { - "label": "2,13", - "x": 13.5, - "y": 2.5, - "w": 1.5 - }, - { - "label": "2,14", - "x": 15, - "y": 2.5 - }, - { - "label": "3,0", - "x": 0, - "y": 3.5, - "w": 1.75 - }, - { - "label": "3,1", - "x": 1.75, - "y": 3.5 - }, - { - "label": "3,2", - "x": 2.75, - "y": 3.5 - }, - { - "label": "3,3", - "x": 3.75, - "y": 3.5 - }, - { - "label": "3,4", - "x": 4.75, - "y": 3.5 - }, - { - "label": "3,5", - "x": 5.75, - "y": 3.5 - }, - { - "label": "3,6", - "x": 6.75, - "y": 3.5 - }, - { - "label": "3,7", - "x": 7.75, - "y": 3.5 - }, - { - "label": "3,8", - "x": 8.75, - "y": 3.5 - }, - { - "label": "3,9", - "x": 9.75, - "y": 3.5 - }, - { - "label": "3,10", - "x": 10.75, - "y": 3.5 - }, - { - "label": "3,11", - "x": 11.75, - "y": 3.5 - }, - { - "label": "3,13", - "x": 12.75, - "y": 3.5, - "w": 2.25 - }, - { - "label": "3,14", - "x": 15, - "y": 3.5 - }, - { - "label": "4,0", - "x": 0, - "y": 4.5, - "w": 2.25 - }, - { - "label": "4,2", - "x": 2.25, - "y": 4.5 - }, - { - "label": "4,3", - "x": 3.25, - "y": 4.5 - }, - { - "label": "4,4", - "x": 4.25, - "y": 4.5 - }, - { - "label": "4,5", - "x": 5.25, - "y": 4.5 - }, - { - "label": "4,6", - "x": 6.25, - "y": 4.5 - }, - { - "label": "4,7", - "x": 7.25, - "y": 4.5 - }, - { - "label": "4,8", - "x": 8.25, - "y": 4.5 - }, - { - "label": "4,9", - "x": 9.25, - "y": 4.5 - }, - { - "label": "4,10", - "x": 10.25, - "y": 4.5 - }, - { - "label": "4,11", - "x": 11.25, - "y": 4.5 - }, - { - "label": "4,12", - "x": 12.25, - "y": 4.5, - "w": 1.75 - }, - { - "label": "4,13", - "x": 14, - "y": 4.5 - }, - { - "label": "5,0", - "x": 0, - "y": 5.5, - "w": 1.25 - }, - { - "label": "5,1", - "x": 1.25, - "y": 5.5, - "w": 1.25 - }, - { - "label": "5,3", - "x": 2.5, - "y": 5.5, - "w": 1.25 - }, - { - "label": "5,6", - "x": 3.75, - "y": 5.5, - "w": 6.25 - }, - { - "label": "5,10", - "x": 10, - "y": 5.5, - "w": 1.25 - }, - { - "label": "5,11", - "x": 11.25, - "y": 5.5, - "w": 1.25 - }, - { - "label": "5,12", - "x": 13, - "y": 5.5 - }, - { - "label": "5,13", - "x": 14, - "y": 5.5 - }, - { - "label": "5,14", - "x": 15, - "y": 5.5 - } + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [1, 14], "x": 15, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 14], "x": 15, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 10], "x": 10, "y": 5.5, "w": 1.25}, + {"matrix": [5, 11], "x": 11.25, "y": 5.5, "w": 1.25}, + + {"matrix": [5, 12], "x": 13, "y": 5.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5}, + {"matrix": [5, 14], "x": 15, "y": 5.5} ] } } diff --git a/keyboards/yandrstudio/nightstar75/nightstar75.c b/keyboards/yandrstudio/nightstar75/nightstar75.c index 55fc6b9bcd29..2c0e8bc2ee1f 100644 --- a/keyboards/yandrstudio/nightstar75/nightstar75.c +++ b/keyboards/yandrstudio/nightstar75/nightstar75.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "nightstar75.h" +#include "quantum.h" #ifdef RGBLIGHT_ENABLE const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS( diff --git a/keyboards/yandrstudio/nightstar75/nightstar75.h b/keyboards/yandrstudio/nightstar75/nightstar75.h deleted file mode 100644 index 8b914602972b..000000000000 --- a/keyboards/yandrstudio/nightstar75/nightstar75.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, K414, \ - K500, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, \ - K600, K601, K603, K606, K610, K611, K612, K613, K614 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO, KC_NO }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, K414 }, \ - { K500, KC_NO, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, KC_NO }, \ - { K600, K601, KC_NO, K603, KC_NO, KC_NO, K606, KC_NO, KC_NO, KC_NO, K610, K611, K612, K613, K614 } \ -} diff --git a/keyboards/yandrstudio/nz64/info.json b/keyboards/yandrstudio/nz64/info.json index 105014757e41..6c054018d181 100644 --- a/keyboards/yandrstudio/nz64/info.json +++ b/keyboards/yandrstudio/nz64/info.json @@ -20,7 +20,76 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "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, "w":2}, {"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":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, "w":2.25}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "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}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 1], "x": 2, "y": 3}, + {"matrix": [3, 2], "x": 3, "y": 3}, + {"matrix": [3, 3], "x": 4, "y": 3}, + {"matrix": [3, 4], "x": 5, "y": 3}, + {"matrix": [3, 5], "x": 6, "y": 3}, + {"matrix": [3, 6], "x": 7, "y": 3}, + {"matrix": [3, 7], "x": 8, "y": 3}, + {"matrix": [3, 8], "x": 9, "y": 3}, + {"matrix": [3, 9], "x": 10, "y": 3}, + {"matrix": [3, 10], "x": 11, "y": 3}, + {"matrix": [3, 11], "x": 12, "y": 3}, + {"matrix": [3, 12], "x": 13, "y": 3}, + {"matrix": [3, 13], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} + ] } } } diff --git a/keyboards/yandrstudio/nz64/nz64.h b/keyboards/yandrstudio/nz64/nz64.h index 41b2a056c5d4..cd7f98f39a5a 100644 --- a/keyboards/yandrstudio/nz64/nz64.h +++ b/keyboards/yandrstudio/nz64/nz64.h @@ -17,20 +17,6 @@ #include "quantum.h" -#define LAYOUT( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \ - K400, K401, K402, K405, K409, K410, K411, K412, K413 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, K411, K412, K413 } \ -} - #ifdef RGB_MATRIX_ENABLE #define URGB_K KC_F24 #else diff --git a/keyboards/yandrstudio/tg67/info.json b/keyboards/yandrstudio/tg67/info.json index 0395d71ffd48..925d6c1d9493 100644 --- a/keyboards/yandrstudio/tg67/info.json +++ b/keyboards/yandrstudio/tg67/info.json @@ -21,353 +21,78 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "~", - "x": 0, - "y": 0 - }, - { - "label": "!", - "x": 1, - "y": 0 - }, - { - "label": "@", - "x": 2, - "y": 0 - }, - { - "label": "#", - "x": 3, - "y": 0 - }, - { - "label": "$", - "x": 4, - "y": 0 - }, - { - "label": "%", - "x": 5, - "y": 0 - }, - { - "label": "^", - "x": 6, - "y": 0 - }, - { - "label": "&", - "x": 7, - "y": 0 - }, - { - "label": "*", - "x": 8, - "y": 0 - }, - { - "label": "(", - "x": 9, - "y": 0 - }, - { - "label": ")", - "x": 10, - "y": 0 - }, - { - "label": "_", - "x": 11, - "y": 0 - }, - { - "label": "+", - "x": 12, - "y": 0 - }, - { - "label": "Backspace", - "x": 13, - "y": 0, - "w": 2 - }, - { - "label": "Home", - "x": 15, - "y": 0 - }, - { - "label": "Tab", - "x": 0, - "y": 1, - "w": 1.5 - }, - { - "label": "Q", - "x": 1.5, - "y": 1 - }, - { - "label": "W", - "x": 2.5, - "y": 1 - }, - { - "label": "E", - "x": 3.5, - "y": 1 - }, - { - "label": "R", - "x": 4.5, - "y": 1 - }, - { - "label": "T", - "x": 5.5, - "y": 1 - }, - { - "label": "Y", - "x": 6.5, - "y": 1 - }, - { - "label": "U", - "x": 7.5, - "y": 1 - }, - { - "label": "I", - "x": 8.5, - "y": 1 - }, - { - "label": "O", - "x": 9.5, - "y": 1 - }, - { - "label": "P", - "x": 10.5, - "y": 1 - }, - { - "label": "{", - "x": 11.5, - "y": 1 - }, - { - "label": "}", - "x": 12.5, - "y": 1 - }, - { - "label": "|", - "x": 13.5, - "y": 1, - "w": 1.5 - }, - { - "label": "End", - "x": 15, - "y": 1 - }, - { - "label": "Caps Lock", - "x": 0, - "y": 2, - "w": 1.75 - }, - { - "label": "A", - "x": 1.75, - "y": 2 - }, - { - "label": "S", - "x": 2.75, - "y": 2 - }, - { - "label": "D", - "x": 3.75, - "y": 2 - }, - { - "label": "F", - "x": 4.75, - "y": 2 - }, - { - "label": "G", - "x": 5.75, - "y": 2 - }, - { - "label": "H", - "x": 6.75, - "y": 2 - }, - { - "label": "J", - "x": 7.75, - "y": 2 - }, - { - "label": "K", - "x": 8.75, - "y": 2 - }, - { - "label": "L", - "x": 9.75, - "y": 2 - }, - { - "label": ":", - "x": 10.75, - "y": 2 - }, - { - "label": "\"", - "x": 11.75, - "y": 2 - }, - { - "label": "Enter", - "x": 12.75, - "y": 2, - "w": 2.25 - }, - { - "label": "PgUp", - "x": 15, - "y": 2 - }, - { - "label": "Shift", - "x": 0, - "y": 3, - "w": 2.25 - }, - { - "label": "Z", - "x": 2.25, - "y": 3 - }, - { - "label": "X", - "x": 3.25, - "y": 3 - }, - { - "label": "C", - "x": 4.25, - "y": 3 - }, - { - "label": "V", - "x": 5.25, - "y": 3 - }, - { - "label": "B", - "x": 6.25, - "y": 3 - }, - { - "label": "N", - "x": 7.25, - "y": 3 - }, - { - "label": "M", - "x": 8.25, - "y": 3 - }, - { - "label": "<", - "x": 9.25, - "y": 3 - }, - { - "label": ">", - "x": 10.25, - "y": 3 - }, - { - "label": "?", - "x": 11.25, - "y": 3 - }, - { - "label": "Shift", - "x": 12.25, - "y": 3, - "w": 1.75 - }, - { - "label": "\u2191", - "x": 14, - "y": 3 - }, - { - "label": "PgDn", - "x": 15, - "y": 3 - }, - { - "label": "Ctrl", - "x": 0, - "y": 4, - "w": 1.25 - }, - { - "label": "Win", - "x": 1.25, - "y": 4, - "w": 1.25 - }, - { - "label": "Alt", - "x": 2.5, - "y": 4, - "w": 1.25 - }, - { - "x": 3.75, - "y": 4, - "w": 6.25 - }, - { - "label": "Alt", - "x": 10, - "y": 4, - "w": 1.25 - }, - { - "label": "Fn", - "x": 11.25, - "y": 4, - "w": 1.25 - }, - { - "label": "\u2190", - "x": 13, - "y": 4 - }, - { - "label": "\u2193", - "x": 14, - "y": 4 - }, - { - "label": "\u2192", - "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} ] } } diff --git a/keyboards/yandrstudio/tg67/tg67.c b/keyboards/yandrstudio/tg67/tg67.c index b1f3907a22d9..5384778a685f 100644 --- a/keyboards/yandrstudio/tg67/tg67.c +++ b/keyboards/yandrstudio/tg67/tg67.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "tg67.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE diff --git a/keyboards/yandrstudio/tg67/tg67.h b/keyboards/yandrstudio/tg67/tg67.h deleted file mode 100644 index efb7d6805917..000000000000 --- a/keyboards/yandrstudio/tg67/tg67.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314, \ - K400, K401, K402, K405, K409, K410, K412, K413, K414 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 }, \ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 } \ -} - diff --git a/keyboards/yandrstudio/wave75/info.json b/keyboards/yandrstudio/wave75/info.json index 61bd8ab7f367..d055dc004861 100644 --- a/keyboards/yandrstudio/wave75/info.json +++ b/keyboards/yandrstudio/wave75/info.json @@ -14,419 +14,100 @@ "layouts": { "LAYOUT": { "layout": [ - { - "label": "0,0", - "x": 0, - "y": 0 - }, - { - "label": "0,1", - "x": 1.25, - "y": 0 - }, - { - "label": "0,2", - "x": 2.25, - "y": 0 - }, - { - "label": "0,3", - "x": 3.25, - "y": 0 - }, - { - "label": "0,4", - "x": 4.25, - "y": 0 - }, - { - "label": "0,5", - "x": 5.5, - "y": 0 - }, - { - "label": "0,6", - "x": 6.5, - "y": 0 - }, - { - "label": "0,7", - "x": 7.5, - "y": 0 - }, - { - "label": "0,8", - "x": 8.5, - "y": 0 - }, - { - "label": "0,9", - "x": 9.75, - "y": 0 - }, - { - "label": "0,10", - "x": 10.75, - "y": 0 - }, - { - "label": "0,11", - "x": 11.75, - "y": 0 - }, - { - "label": "0,12", - "x": 12.75, - "y": 0 - }, - { - "label": "0,13", - "x": 14, - "y": 0 - }, - { - "label": "0,14", - "x": 15.25, - "y": 0 - }, - { - "label": "1,0", - "x": 0, - "y": 1.25 - }, - { - "label": "1,1", - "x": 1, - "y": 1.25 - }, - { - "label": "1,2", - "x": 2, - "y": 1.25 - }, - { - "label": "1,3", - "x": 3, - "y": 1.25 - }, - { - "label": "1,4", - "x": 4, - "y": 1.25 - }, - { - "label": "1,5", - "x": 5, - "y": 1.25 - }, - { - "label": "1,6", - "x": 6, - "y": 1.25 - }, - { - "label": "1,7", - "x": 7, - "y": 1.25 - }, - { - "label": "1,8", - "x": 8, - "y": 1.25 - }, - { - "label": "1,9", - "x": 9, - "y": 1.25 - }, - { - "label": "1,10", - "x": 10, - "y": 1.25 - }, - { - "label": "1,11", - "x": 11, - "y": 1.25 - }, - { - "label": "1,12", - "x": 12, - "y": 1.25 - }, - { - "label": "1,13", - "x": 13, - "y": 1.25, - "w": 2 - }, - { - "label": "1,14", - "x": 15.25, - "y": 1.25 - }, - { - "label": "2,0", - "x": 0, - "y": 2.25, - "w": 1.5 - }, - { - "label": "2,1", - "x": 1.5, - "y": 2.25 - }, - { - "label": "2,2", - "x": 2.5, - "y": 2.25 - }, - { - "label": "2,3", - "x": 3.5, - "y": 2.25 - }, - { - "label": "2,4", - "x": 4.5, - "y": 2.25 - }, - { - "label": "2,5", - "x": 5.5, - "y": 2.25 - }, - { - "label": "2,6", - "x": 6.5, - "y": 2.25 - }, - { - "label": "2,7", - "x": 7.5, - "y": 2.25 - }, - { - "label": "2,8", - "x": 8.5, - "y": 2.25 - }, - { - "label": "2,9", - "x": 9.5, - "y": 2.25 - }, - { - "label": "2,10", - "x": 10.5, - "y": 2.25 - }, - { - "label": "2,11", - "x": 11.5, - "y": 2.25 - }, - { - "label": "2,12", - "x": 12.5, - "y": 2.25 - }, - { - "label": "2,13", - "x": 13.5, - "y": 2.25, - "w": 1.5 - }, - { - "label": "2,14", - "x": 15.25, - "y": 2.25 - }, - { - "label": "3,0", - "x": 0, - "y": 3.25, - "w": 1.75 - }, - { - "label": "3,1", - "x": 1.75, - "y": 3.25 - }, - { - "label": "3,2", - "x": 2.75, - "y": 3.25 - }, - { - "label": "3,3", - "x": 3.75, - "y": 3.25 - }, - { - "label": "3,4", - "x": 4.75, - "y": 3.25 - }, - { - "label": "3,5", - "x": 5.75, - "y": 3.25 - }, - { - "label": "3,6", - "x": 6.75, - "y": 3.25 - }, - { - "label": "3,7", - "x": 7.75, - "y": 3.25 - }, - { - "label": "3,8", - "x": 8.75, - "y": 3.25 - }, - { - "label": "3,9", - "x": 9.75, - "y": 3.25 - }, - { - "label": "3,10", - "x": 10.75, - "y": 3.25 - }, - { - "label": "3,11", - "x": 11.75, - "y": 3.25 - }, - { - "label": "3,12", - "x": 12.75, - "y": 3.25, - "w": 2.25 - }, - { - "label": "4,0", - "x": 0, - "y": 4.25, - "w": 2.25 - }, - { - "label": "4,1", - "x": 2.25, - "y": 4.25 - }, - { - "label": "4,2", - "x": 3.25, - "y": 4.25 - }, - { - "label": "4,3", - "x": 4.25, - "y": 4.25 - }, - { - "label": "4,4", - "x": 5.25, - "y": 4.25 - }, - { - "label": "4,5", - "x": 6.25, - "y": 4.25 - }, - { - "label": "4,6", - "x": 7.25, - "y": 4.25 - }, - { - "label": "4,7", - "x": 8.25, - "y": 4.25 - }, - { - "label": "4,8", - "x": 9.25, - "y": 4.25 - }, - { - "label": "4,9", - "x": 10.25, - "y": 4.25 - }, - { - "label": "4,10", - "x": 11.25, - "y": 4.25 - }, - { - "label": "4,11", - "x": 12.25, - "y": 4.25, - "w": 1.75 - }, - { - "label": "4,13", - "x": 14.25, - "y": 4.5 - }, - { - "label": "5,0", - "x": 0, - "y": 5.25, - "w": 1.25 - }, - { - "label": "5,1", - "x": 1.25, - "y": 5.25, - "w": 1.25 - }, - { - "label": "5,2", - "x": 2.5, - "y": 5.25, - "w": 1.25 - }, - { - "label": "5,6", - "x": 3.75, - "y": 5.25, - "w": 6.25 - }, - { - "label": "5,9", - "x": 10, - "y": 5.25, - "w": 1.5 - }, - { - "label": "5,10", - "x": 11.5, - "y": 5.25, - "w": 1.5 - }, - { - "label": "5,12", - "x": 13.25, - "y": 5.5 - }, - { - "label": "5,13", - "x": 14.25, - "y": 5.5 - }, - { - "label": "5,14", - "x": 15.25, - "y": 5.5 - } + {"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": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + + {"matrix": [0, 13], "x": 14, "y": 0}, + + {"matrix": [0, 14], "x": 15.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": [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": [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, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "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": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 11], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.5}, + + {"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.5}, + {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.5}, + {"matrix": [5, 13], "x": 14.25, "y": 5.5}, + {"matrix": [5, 14], "x": 15.25, "y": 5.5} ] } } diff --git a/keyboards/yandrstudio/wave75/wave75.h b/keyboards/yandrstudio/wave75/wave75.h deleted file mode 100644 index e3b2f19f4212..000000000000 --- a/keyboards/yandrstudio/wave75/wave75.h +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, \ - K500, K501, K502, K506, K509, K510, K512, K513, K514 \ - )\ - { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, KC_NO, KC_NO }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, KC_NO, K413, KC_NO }, \ - { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, KC_NO, KC_NO, K509, K510, KC_NO, K512, K513, K514 } \ -} diff --git a/keyboards/yandrstudio/yr80/info.json b/keyboards/yandrstudio/yr80/info.json index 6d15acd3be8f..7faaa482eff1 100644 --- a/keyboards/yandrstudio/yr80/info.json +++ b/keyboards/yandrstudio/yr80/info.json @@ -17,7 +17,110 @@ }, "layouts": { "LAYOUT": { - "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,1", "x":1.25, "y":0}, {"label":"0,2", "x":2.25, "y":0}, {"label":"0,3", "x":3.25, "y":0}, {"label":"0,4", "x":4.25, "y":0}, {"label":"0,5", "x":5.5, "y":0}, {"label":"0,6", "x":6.5, "y":0}, {"label":"0,7", "x":7.5, "y":0}, {"label":"0,8", "x":8.5, "y":0}, {"label":"0,9", "x":9.75, "y":0}, {"label":"0,10", "x":10.75, "y":0}, {"label":"0,11", "x":11.75, "y":0}, {"label":"0,12", "x":12.75, "y":0}, {"label":"0,13", "x":14, "y":0}, {"label":"0,14", "x":15.25, "y":0}, {"label":"0,15", "x":16.25, "y":0}, {"label":"0,16", "x":17.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,14", "x":15.25, "y":1.25}, {"label":"1,15", "x":16.25, "y":1.25}, {"label":"1,16", "x":17.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,14", "x":15.25, "y":2.25}, {"label":"2,15", "x":16.25, "y":2.25}, {"label":"2,16", "x":17.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":2.75}, {"label":"4,16", "x":16.25, "y":4.25}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,6", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,7", "x":10, "y":5.25, "w":1.25}, {"label":"5,8", "x":11.25, "y":5.25, "w":1.25}, {"label":"5,9", "x":12.5, "y":5.25, "w":1.25}, {"label":"5,10", "x":13.75, "y":5.25, "w":1.25}, {"label":"5,14", "x":15.25, "y":5.25}, {"label":"5,15", "x":16.25, "y":5.25}, {"label":"5,16", "x":17.25, "y":5.25}] + "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": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "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, 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, 16], "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, 7], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 8], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 9], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "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/yandrstudio/yr80/yr80.c b/keyboards/yandrstudio/yr80/yr80.c index 2752dc923067..ddb7e2a1b047 100644 --- a/keyboards/yandrstudio/yr80/yr80.c +++ b/keyboards/yandrstudio/yr80/yr80.c @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "yr80.h" +#include "quantum.h" #ifdef RGBLIGHT_ENABLE diff --git a/keyboards/yandrstudio/yr80/yr80.h b/keyboards/yandrstudio/yr80/yr80.h deleted file mode 100644 index 79cbfca91b6f..000000000000 --- a/keyboards/yandrstudio/yr80/yr80.h +++ /dev/null @@ -1,35 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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( \ - K000, K001, 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, K312, \ - K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K416, \ - K500, K501, K502, K506, K507, K508, K509, K510, K514, K515, K516 \ - )\ - { \ - { K000, K001, 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, K312, KC_NO, KC_NO, KC_NO, KC_NO }, \ - { K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO, KC_NO, KC_NO, K416 }, \ - { K500, K501, K502, KC_NO, KC_NO, KC_NO, K506, K507, K508, K509, K510, KC_NO, KC_NO, KC_NO, K514, K515, K516 } \ -} diff --git a/keyboards/yandrstudio/zhou65/info.json b/keyboards/yandrstudio/zhou65/info.json index 7a4754cf299f..cc020b9310eb 100644 --- a/keyboards/yandrstudio/zhou65/info.json +++ b/keyboards/yandrstudio/zhou65/info.json @@ -17,7 +17,80 @@ "bootloader": "stm32-dfu", "layouts": { "LAYOUT": { - "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, "w":2}, {"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, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"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}] + "layout": [ + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"matrix": [0, 14], "x": 15, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"matrix": [1, 14], "x": 15, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + {"matrix": [2, 14], "x": 15, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 1.75}, + {"matrix": [3, 13], "x": 14, "y": 3}, + {"matrix": [3, 14], "x": 15, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4}, + {"matrix": [4, 14], "x": 15, "y": 4} + ] } } } diff --git a/keyboards/yandrstudio/zhou65/zhou65.h b/keyboards/yandrstudio/zhou65/zhou65.h deleted file mode 100644 index 2f22710f469d..000000000000 --- a/keyboards/yandrstudio/zhou65/zhou65.h +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright 2021 JasonRen(biu) - * - * 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(\ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,\ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,\ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K213, K214,\ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K312, K313, K314,\ - K400, K401, K402, K405, K409, K410, K412, K413, K414\ -) {\ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 },\ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 },\ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, KC_NO, K213, K214 },\ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, KC_NO, K312, K313, K314 },\ - { K400, K401, K402, KC_NO, KC_NO, K405, KC_NO, KC_NO, KC_NO, K409, K410, KC_NO, K412, K413, K414 }\ -} diff --git a/keyboards/ydkb/just60/info.json b/keyboards/ydkb/just60/info.json index bea9152e0bbe..d61f09221a98 100644 --- a/keyboards/ydkb/just60/info.json +++ b/keyboards/ydkb/just60/info.json @@ -22,70 +22,74 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Esc/`", "x":0, "y":0}, - {"label":"1", "x":1, "y":0}, - {"label":"2", "x":2, "y":0}, - {"label":"3", "x":3, "y":0}, - {"label":"4", "x":4, "y":0}, - {"label":"5", "x":5, "y":0}, - {"label":"6", "x":6, "y":0}, - {"label":"7", "x":7, "y":0}, - {"label":"8", "x":8, "y":0}, - {"label":"9", "x":9, "y":0}, - {"label":"0", "x":10, "y":0}, - {"label":"-", "x":11, "y":0}, - {"label":"=", "x":12, "y":0}, - {"label":"Backspace", "x":13, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":6.5, "y":1}, - {"label":"U", "x":7.5, "y":1}, - {"label":"I", "x":8.5, "y":1}, - {"label":"O", "x":9.5, "y":1}, - {"label":"P", "x":10.5, "y":1}, - {"label":"[", "x":11.5, "y":1}, - {"label":"]", "x":12.5, "y":1}, - {"label":"\\", "x":13.5, "y":1, "w":1.5}, - {"label":"Fn", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":6.75, "y":2}, - {"label":"J", "x":7.75, "y":2}, - {"label":"K", "x":8.75, "y":2}, - {"label":"L", "x":9.75, "y":2}, - {"label":";", "x":10.75, "y":2}, - {"label":"'", "x":11.75, "y":2}, - {"label":"Enter", "x":12.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2.25}, - {"label":"Z", "x":2.25, "y":3}, - {"label":"X", "x":3.25, "y":3}, - {"label":"C", "x":4.25, "y":3}, - {"label":"V", "x":5.25, "y":3}, - {"label":"B", "x":6.25, "y":3}, - {"label":"N", "x":7.25, "y":3}, - {"label":"M", "x":8.25, "y":3}, - {"label":",", "x":9.25, "y":3}, - {"label":".", "x":10.25, "y":3}, - {"label":"/", "x":11.25, "y":3}, - {"label":"Shift", "x":12.25, "y":3, "w":2.75}, - {"label":"Ctrl", "x":0, "y":4, "w":1.75}, - {"label":"Alt", "x":1.75, "y":4, "w":1.25}, - {"label":"GUI", "x":3, "y":4, "w":1.25}, - {"label":"Fn/Space", "x":4.25, "y":4, "w":1.25}, - {"label":"Space", "x":5.5, "y":4, "w":3}, - {"label":"GUI", "x":8.5, "y":4, "w":1.25}, - {"label":"Alt", "x":9.75, "y":4, "w":1.25}, - {"label":"Left", "x":11, "y":4}, - {"label":"Down", "x":12, "y":4}, - {"label":"Up", "x":13, "y":4}, - {"label":"Right", "x":14, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [4, 8], "x": 13, "y": 0, "w": 2}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"matrix": [3, 1], "x": 2.25, "y": 3}, + {"matrix": [3, 2], "x": 3.25, "y": 3}, + {"matrix": [3, 3], "x": 4.25, "y": 3}, + {"matrix": [3, 4], "x": 5.25, "y": 3}, + {"matrix": [3, 5], "x": 6.25, "y": 3}, + {"matrix": [3, 6], "x": 7.25, "y": 3}, + {"matrix": [3, 7], "x": 8.25, "y": 3}, + {"matrix": [3, 8], "x": 9.25, "y": 3}, + {"matrix": [3, 9], "x": 10.25, "y": 3}, + {"matrix": [3, 10], "x": 11.25, "y": 3}, + {"matrix": [3, 12], "x": 12.25, "y": 3, "w": 2.75}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 5], "x": 5.5, "y": 4, "w": 3}, + {"matrix": [4, 7], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/ydkb/just60/just60.h b/keyboards/ydkb/just60/just60.h deleted file mode 100644 index 426324fe02cd..000000000000 --- a/keyboards/ydkb/just60/just60.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2019 Jianfei Wang - * - * 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" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K48 , \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D , \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D , \ - K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3C, \ - K40, K41, K42, K44, K45, K47, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D }, \ - { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, KC_NO, K3C, KC_NO }, \ - { K40, K41, K42, KC_NO, K44, K45, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D }, \ -} diff --git a/keyboards/ymdk/sp64/info.json b/keyboards/ymdk/sp64/info.json index 46f533b14d0f..95dee3f0a946 100644 --- a/keyboards/ymdk/sp64/info.json +++ b/keyboards/ymdk/sp64/info.json @@ -18,75 +18,84 @@ }, "processor": "atmega32a", "bootloader": "bootloadhid", - "layouts": { + "layouts": { "LAYOUT": { "layout": [ - {"label":"~", "x":0, "y":0}, - {"label":"!", "x":1, "y":0}, - {"label":"@", "x":2, "y":0}, - {"label":"#", "x":3, "y":0}, - {"label":"$", "x":4, "y":0}, - {"label":"%", "x":5, "y":0}, - {"label":"^", "x":6, "y":0}, - {"label":"&", "x":8, "y":0}, - {"label":"*", "x":9, "y":0}, - {"label":"(", "x":10, "y":0}, - {"label":")", "x":11, "y":0}, - {"label":"_", "x":12, "y":0}, - {"label":"+", "x":13, "y":0}, - {"label":"Backspace", "x":14, "y":0, "w":2}, - {"label":"Tab", "x":0, "y":1, "w":1.5}, - {"label":"Q", "x":1.5, "y":1}, - {"label":"W", "x":2.5, "y":1}, - {"label":"E", "x":3.5, "y":1}, - {"label":"R", "x":4.5, "y":1}, - {"label":"T", "x":5.5, "y":1}, - {"label":"Y", "x":7.5, "y":1}, - {"label":"U", "x":8.5, "y":1}, - {"label":"I", "x":9.5, "y":1}, - {"label":"O", "x":10.5, "y":1}, - {"label":"P", "x":11.5, "y":1}, - {"label":"{ ", "x":12.5, "y":1}, - {"label":"}", "x":13.5, "y":1}, - {"label":"|", "x":14.5, "y":1, "w":1.5}, - {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, - {"label":"A", "x":1.75, "y":2}, - {"label":"S", "x":2.75, "y":2}, - {"label":"D", "x":3.75, "y":2}, - {"label":"F", "x":4.75, "y":2}, - {"label":"G", "x":5.75, "y":2}, - {"label":"H", "x":7.75, "y":2}, - {"label":"J", "x":8.75, "y":2}, - {"label":"K", "x":9.75, "y":2}, - {"label":"L", "x":10.75, "y":2}, - {"label":":", "x":11.75, "y":2}, - {"label":"\"", "x":12.75, "y":2}, - {"label":"Enter", "x":13.75, "y":2, "w":2.25}, - {"label":"Shift", "x":0, "y":3, "w":2}, - {"label":"Z", "x":2, "y":3}, - {"label":"X", "x":3, "y":3}, - {"label":"C", "x":4, "y":3}, - {"label":"V", "x":5, "y":3}, - {"label":"B", "x":6, "y":3}, - {"label":"N", "x":8, "y":3}, - {"label":"M", "x":9, "y":3}, - {"label":"<", "x":10, "y":3}, - {"label":">", "x":11, "y":3}, - {"label":"?", "x":12, "y":3}, - {"label":"Shift", "x":13, "y":3}, - {"label":"Up", "x":14, "y":3}, - {"label":"F3", "x":15, "y":3}, - {"label":"Ctrl", "x":0, "y":4, "w":1.25}, - {"label":"Win", "x":1.25, "y":4}, - {"label":"Alt", "x":2.25, "y":4, "w":1.25}, - {"label":"Space", "x":3.5, "y":4, "w":2.25}, - {"label":"Fn", "x":5.75, "y":4}, - {"label":"Space", "x":7.75, "y":4, "w":2.75}, - {"label":"Alt", "x":10.5, "y":4, "w":1.25}, - {"label":"Win", "x":11.75, "y":4, "w":1.25}, - {"label":"Left", "x":13, "y":4}, - {"label":"Down", "x":14, "y":4}, - {"label":"Right", "x":15, "y":4} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [5, 1], "x": 1, "y": 0}, + {"matrix": [5, 2], "x": 2, "y": 0}, + {"matrix": [5, 3], "x": 3, "y": 0}, + {"matrix": [5, 4], "x": 4, "y": 0}, + {"matrix": [5, 5], "x": 5, "y": 0}, + {"matrix": [1, 5], "x": 6, "y": 0}, + + {"matrix": [4, 7], "x": 8, "y": 0}, + {"matrix": [4, 8], "x": 9, "y": 0}, + {"matrix": [4, 9], "x": 10, "y": 0}, + {"matrix": [4, 10], "x": 11, "y": 0}, + {"matrix": [4, 11], "x": 12, "y": 0}, + {"matrix": [4, 12], "x": 13, "y": 0}, + {"matrix": [4, 13], "x": 14, "y": 0, "w": 2}, + + {"matrix": [4, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [4, 1], "x": 1.5, "y": 1}, + {"matrix": [4, 2], "x": 2.5, "y": 1}, + {"matrix": [4, 3], "x": 3.5, "y": 1}, + {"matrix": [4, 4], "x": 4.5, "y": 1}, + {"matrix": [4, 5], "x": 5.5, "y": 1}, + + {"matrix": [5, 7], "x": 7.5, "y": 1}, + {"matrix": [3, 7], "x": 8.5, "y": 1}, + {"matrix": [3, 8], "x": 9.5, "y": 1}, + {"matrix": [3, 9], "x": 10.5, "y": 1}, + {"matrix": [3, 10], "x": 11.5, "y": 1}, + {"matrix": [3, 11], "x": 12.5, "y": 1}, + {"matrix": [3, 12], "x": 13.5, "y": 1}, + {"matrix": [3, 13], "x": 14.5, "y": 1, "w": 1.5}, + + {"matrix": [3, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 2}, + {"matrix": [3, 2], "x": 2.75, "y": 2}, + {"matrix": [3, 3], "x": 3.75, "y": 2}, + {"matrix": [3, 4], "x": 4.75, "y": 2}, + {"matrix": [3, 5], "x": 5.75, "y": 2}, + + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 12], "x": 12.75, "y": 2}, + {"matrix": [2, 13], "x": 13.75, "y": 2, "w": 2.25}, + + {"matrix": [2, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [2, 1], "x": 2, "y": 3}, + {"matrix": [2, 2], "x": 3, "y": 3}, + {"matrix": [2, 3], "x": 4, "y": 3}, + {"matrix": [2, 4], "x": 5, "y": 3}, + {"matrix": [2, 5], "x": 6, "y": 3}, + + {"matrix": [1, 7], "x": 8, "y": 3}, + {"matrix": [1, 8], "x": 9, "y": 3}, + {"matrix": [1, 9], "x": 10, "y": 3}, + {"matrix": [1, 10], "x": 11, "y": 3}, + {"matrix": [1, 11], "x": 12, "y": 3}, + {"matrix": [1, 12], "x": 13, "y": 3}, + {"matrix": [1, 13], "x": 14, "y": 3}, + {"matrix": [0, 13], "x": 15, "y": 3}, + + {"matrix": [1, 0], "x": 0, "y": 4, "w": 1.25}, + {"matrix": [1, 1], "x": 1.25, "y": 4}, + {"matrix": [1, 2], "x": 2.25, "y": 4, "w": 1.25}, + {"matrix": [1, 3], "x": 3.5, "y": 4, "w": 2.25}, + {"matrix": [1, 4], "x": 5.75, "y": 4}, + + {"matrix": [0, 7], "x": 7.75, "y": 4, "w": 2.75}, + {"matrix": [0, 8], "x": 10.5, "y": 4, "w": 1.25}, + {"matrix": [0, 9], "x": 11.75, "y": 4, "w": 1.25}, + {"matrix": [0, 10], "x": 13, "y": 4}, + {"matrix": [0, 11], "x": 14, "y": 4}, + {"matrix": [0, 12], "x": 15, "y": 4} ] } } diff --git a/keyboards/ymdk/sp64/sp64.h b/keyboards/ymdk/sp64/sp64.h index 63620f0c3ca1..afad36ee9a4d 100644 --- a/keyboards/ymdk/sp64/sp64.h +++ b/keyboards/ymdk/sp64/sp64.h @@ -40,45 +40,3 @@ extern i2c_status_t mcp23018_status; uint8_t init_mcp23018(void); #endif - -#define ___ KC_NO -#define XXX KC_NO - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - * - * LEFT HAND RIGHT HAND - * ┌-----┬-----┬-----┬-----┬-----┬-----┬-----┐ ┌-----┬-----┬-----┬-----┬-----┬-----┬----------┐ - * │ L00 │ L01 │ L02 │ L03 │ L04 │ L05 │ L06 │ │ R07 │ R08 │ R09 │ R0A │ R0B │ R0C │ R0D │ - * ├-----┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┘ ┌--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬--┴--┬-------┤ - * │ L10 │ L11 │ L12 │ L13 │ L14 │ L15 │ │ R16 │ R17 │ R18 │ R19 │ R1A │ R1B │ R1C │ R1D │ - * ├--------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐ └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴-------┤ - * │ L20 │ L21 │ L22 │ L23 │ L24 │ L25 │ │ R26 │ R27 │ R28 │ R29 │ R2A │ R2B │ R2C │ - * ├---------┴┬----┴┬----┴┬----┴┬----┴┬----┴┐ └┬----┴┬----┴┬----┴┬----┴┬----┴┬----┴┬-----┬-----┤ - * │ L30 │ L31 │ L32 │ L33 │ L34 │ L35 │ │ R36 │ R37 │ R38 │ R39 │ R3A │ R3B │ R3C │ R3D │ - * ├------┬---┴-┬---┴--┬--┴-----┴----┬┴----┬┘ ┌┴-----┴-----┴--┬--┴----┬┴-----┼-----┼-----┼-----┤ - * │ L40 │ L41 │ L42 │ L43 │ L45 │ │ R46 │ R48 │ R4A │ R4B │ R4C │ R4D │ - * └------┴-----┴------┴-------------┴-----┘ └---------------┴-------┴------┴-----┴-----┴-----┘ - */ -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, L06, R07, R08, R09, R0A, R0B, R0C, R0D, \ - L10, L11, L12, L13, L14, L15, R16, R17, R18, R19, R1A, R1B, R1C, R1D, \ - L20, L21, L22, L23, L24, L25, R26, R27, R28, R29, R2A, R2B, R2C, \ - L30, L31, L32, L33, L34, L35, R36, R37, R38, R39, R3A, R3B, R3C, R3D, \ - L40, L41, L42, L43, L45, R46, R48, R4A, R4B, R4C, R4D \ - ) \ - /* matrix positions */ \ - { \ - { ___, ___, ___, ___, ___, ___, ___, R46, R48, R4A, R4B, R4C, R4D, R3D }, \ - { L40, L41, L42, L43, L45, L06, ___, R36, R37, R38, R39, R3A, R3B, R3C }, \ - { L30, L31, L32, L33, L34, L35, ___, R26, R27, R28, R29, R2A, R2B, R2C }, \ - { L20, L21, L22, L23, L24, L25, ___, R17, R18, R19, R1A, R1B, R1C, R1D }, \ - { L10, L11, L12, L13, L14, L15, ___, R07, R08, R09, R0A, R0B, R0C, R0D }, \ - { L00, L01, L02, L03, L04, L05, ___, R16, ___, ___, ___, ___, ___, ___ } \ - } - diff --git a/keyboards/ymdk/ymd67/info.json b/keyboards/ymdk/ymd67/info.json index cc83eb82ac65..39801fe04e98 100644 --- a/keyboards/ymdk/ymd67/info.json +++ b/keyboards/ymdk/ymd67/info.json @@ -25,73 +25,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "Esc", "x": 0, "y": 0}, - {"label": "!", "x": 1, "y": 0}, - {"label": "@", "x": 2, "y": 0}, - {"label": "#", "x": 3, "y": 0}, - {"label": "$", "x": 4, "y": 0}, - {"label": "%", "x": 5, "y": 0}, - {"label": "^", "x": 6, "y": 0}, - {"label": "&", "x": 7, "y": 0}, - {"label": "*", "x": 8, "y": 0}, - {"label": "(", "x": 9, "y": 0}, - {"label": ")", "x": 10, "y": 0}, - {"label": "_", "x": 11, "y": 0}, - {"label": "+", "x": 12, "y": 0}, - {"label": "~", "x": 13, "y": 0}, - {"label": "Bs", "x": 14, "y": 0}, - {"label": "Tab", "x": 0, "y": 1, "w": 1.5}, - {"label": "Q", "x": 1.5, "y": 1}, - {"label": "W", "x": 2.5, "y": 1}, - {"label": "E", "x": 3.5, "y": 1}, - {"label": "R", "x": 4.5, "y": 1}, - {"label": "T", "x": 5.5, "y": 1}, - {"label": "Y", "x": 6.5, "y": 1}, - {"label": "U", "x": 7.5, "y": 1}, - {"label": "I", "x": 8.5, "y": 1}, - {"label": "O", "x": 9.5, "y": 1}, - {"label": "P", "x": 10.5, "y": 1}, - {"label": "{", "x": 11.5, "y": 1}, - {"label": "}", "x": 12.5, "y": 1}, - {"label": "|", "x": 13.5, "y": 1, "w": 1.5}, - {"label": "Caps Lock", "x": 0, "y": 2, "w": 1.75}, - {"label": "A", "x": 1.75, "y": 2}, - {"label": "S", "x": 2.75, "y": 2}, - {"label": "D", "x": 3.75, "y": 2}, - {"label": "F", "x": 4.75, "y": 2}, - {"label": "G", "x": 5.75, "y": 2}, - {"label": "H", "x": 6.75, "y": 2}, - {"label": "J", "x": 7.75, "y": 2}, - {"label": "K", "x": 8.75, "y": 2}, - {"label": "L", "x": 9.75, "y": 2}, - {"label": ":", "x": 10.75, "y": 2}, - {"label": "\"", "x": 11.75, "y": 2}, - {"label": "Enter", "x": 12.75, "y": 2, "w": 2.25}, - {"label": "Shift", "x": 0, "y": 3, "w": 2}, - {"label": "Z", "x": 2, "y": 3}, - {"label": "X", "x": 3, "y": 3}, - {"label": "C", "x": 4, "y": 3}, - {"label": "V", "x": 5, "y": 3}, - {"label": "B", "x": 6, "y": 3}, - {"label": "N", "x": 7, "y": 3}, - {"label": "M", "x": 8, "y": 3}, - {"label": "<", "x": 9, "y": 3}, - {"label": ">", "x": 10, "y": 3}, - {"label": "?", "x": 11, "y": 3}, - {"label": "Shift", "x": 12, "y": 3}, - {"label": "Up", "x": 13, "y": 3}, - {"label": "Del", "x": 14, "y": 3}, - {"label": "Ctrl", "x": 0, "y": 4, "w": 1.75}, - {"label": "Win", "x": 1.75, "y": 4, "w": 1.25}, - {"label": "Alt", "x": 3, "y": 4, "w": 1.25}, - {"x": 4.25, "y": 4, "w": 1.25}, - {"x": 5.5, "y": 4, "w": 3}, - {"label": "Alt", "x": 8.5, "y": 4, "w": 1.25}, - {"label": "Ctrl", "x": 9.75, "y": 4, "w": 1.25}, - {"x": 11, "y": 4}, - {"label": "Left", "x": 12, "y": 4}, - {"label": "Down", "x": 13, "y": 4}, - {"label": "Right", "x": 14, "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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"matrix": [1, 1], "x": 1.5, "y": 1}, + {"matrix": [1, 2], "x": 2.5, "y": 1}, + {"matrix": [1, 3], "x": 3.5, "y": 1}, + {"matrix": [1, 4], "x": 4.5, "y": 1}, + {"matrix": [1, 5], "x": 5.5, "y": 1}, + {"matrix": [1, 6], "x": 6.5, "y": 1}, + {"matrix": [1, 7], "x": 7.5, "y": 1}, + {"matrix": [1, 8], "x": 8.5, "y": 1}, + {"matrix": [1, 9], "x": 9.5, "y": 1}, + {"matrix": [1, 10], "x": 10.5, "y": 1}, + {"matrix": [1, 11], "x": 11.5, "y": 1}, + {"matrix": [1, 12], "x": 12.5, "y": 1}, + {"matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"matrix": [2, 1], "x": 1.75, "y": 2}, + {"matrix": [2, 2], "x": 2.75, "y": 2}, + {"matrix": [2, 3], "x": 3.75, "y": 2}, + {"matrix": [2, 4], "x": 4.75, "y": 2}, + {"matrix": [2, 5], "x": 5.75, "y": 2}, + {"matrix": [2, 6], "x": 6.75, "y": 2}, + {"matrix": [2, 7], "x": 7.75, "y": 2}, + {"matrix": [2, 8], "x": 8.75, "y": 2}, + {"matrix": [2, 9], "x": 9.75, "y": 2}, + {"matrix": [2, 10], "x": 10.75, "y": 2}, + {"matrix": [2, 11], "x": 11.75, "y": 2}, + {"matrix": [2, 13], "x": 12.75, "y": 2, "w": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3, "w": 2}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3}, + {"matrix": [3, 12], "x": 12, "y": 3}, + {"matrix": [3, 13], "x": 13, "y": 3}, + {"matrix": [3, 14], "x": 14, "y": 3}, + + {"matrix": [4, 0], "x": 0, "y": 4, "w": 1.75}, + {"matrix": [4, 1], "x": 1.75, "y": 4, "w": 1.25}, + {"matrix": [4, 2], "x": 3, "y": 4, "w": 1.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4, "w": 1.25}, + {"matrix": [4, 7], "x": 5.5, "y": 4, "w": 3}, + {"matrix": [4, 8], "x": 8.5, "y": 4, "w": 1.25}, + {"matrix": [4, 9], "x": 9.75, "y": 4, "w": 1.25}, + {"matrix": [4, 10], "x": 11, "y": 4}, + {"matrix": [4, 11], "x": 12, "y": 4}, + {"matrix": [4, 12], "x": 13, "y": 4}, + {"matrix": [4, 13], "x": 14, "y": 4} ] } } diff --git a/keyboards/ymdk/ymd67/ymd67.h b/keyboards/ymdk/ymd67/ymd67.h deleted file mode 100644 index 5e7d846694fe..000000000000 --- a/keyboards/ymdk/ymd67/ymd67.h +++ /dev/null @@ -1,17 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2D, \ - K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \ - K40, K41, K42, K43, K47, K48, K49, K4A, K4B, K4C, K4D \ -) { \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, KC_NO }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, KC_NO, K2D, KC_NO }, \ - { K30, KC_NO, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \ - { K40, K41, K42, K43, KC_NO, KC_NO, KC_NO, K47, K48, K49, K4A, K4B, K4C, K4D, KC_NO } \ -} diff --git a/keyboards/yosino58/rev1/info.json b/keyboards/yosino58/rev1/info.json index 0e8431cc8890..40ceef870552 100644 --- a/keyboards/yosino58/rev1/info.json +++ b/keyboards/yosino58/rev1/info.json @@ -24,11 +24,77 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":0.25}, {"x":3, "y":0}, {"x":4, "y":0.25}, {"x":5, "y":0.5}, {"x":10.75, "y":0.5}, {"x":11.75, "y":0.25}, {"x":12.75, "y":0}, {"x":13.75, "y":0.25}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":1.25}, {"x":3, "y":1}, {"x":4, "y":1.25}, {"x":5, "y":1.5}, {"x":10.75, "y":1.5}, {"x":11.75, "y":1.25}, {"x":12.75, "y":1}, {"x":13.75, "y":1.25}, {"x":14.75, "y":2}, {"x":15.75, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":2.25}, {"x":3, "y":2}, {"x":4, "y":2.25}, {"x":5, "y":2.5}, {"x":10.75, "y":2.5}, {"x":11.75, "y":2.25}, {"x":12.75, "y":2}, {"x":13.75, "y":2.25}, {"x":14.75, "y":3}, {"x":15.75, "y":3}, - {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":3.25}, {"x":3, "y":3}, {"x":4, "y":3.25}, {"x":5, "y":3.5}, {"x":6.5, "y":4.25}, {"x":7.5, "y":4.25, "h":2}, {"x":8.5, "y":4.25, "h":2}, {"x":9.5, "y":4.25}, {"x":10.75, "y":3.5}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3}, {"x":13.75, "y":3.25}, {"x":14.75, "y":4}, {"x":15.75, "y":4}, - {"x":3.75, "y":4.25}, {"x":4.75, "y":4.5}, {"x":6.5, "y":5.25}, {"x":9.5, "y":5.25}, {"x":11, "y":4.5}, {"x":12, "y":4.25} + {"matrix": [0, 0], "x": 0, "y": 1}, + {"matrix": [0, 1], "x": 1, "y": 1}, + {"matrix": [0, 2], "x": 2, "y": 0.25}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0.25}, + {"matrix": [0, 5], "x": 5, "y": 0.5}, + + {"matrix": [5, 5], "x": 10.75, "y": 0.5}, + {"matrix": [5, 4], "x": 11.75, "y": 0.25}, + {"matrix": [5, 3], "x": 12.75, "y": 0}, + {"matrix": [5, 2], "x": 13.75, "y": 0.25}, + {"matrix": [5, 1], "x": 14.75, "y": 1}, + {"matrix": [5, 0], "x": 15.75, "y": 1}, + + {"matrix": [1, 0], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + + {"matrix": [6, 5], "x": 10.75, "y": 1.5}, + {"matrix": [6, 4], "x": 11.75, "y": 1.25}, + {"matrix": [6, 3], "x": 12.75, "y": 1}, + {"matrix": [6, 2], "x": 13.75, "y": 1.25}, + {"matrix": [6, 1], "x": 14.75, "y": 2}, + {"matrix": [6, 0], "x": 15.75, "y": 2}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2.25}, + {"matrix": [2, 5], "x": 5, "y": 2.5}, + + {"matrix": [7, 5], "x": 10.75, "y": 2.5}, + {"matrix": [7, 4], "x": 11.75, "y": 2.25}, + {"matrix": [7, 3], "x": 12.75, "y": 2}, + {"matrix": [7, 2], "x": 13.75, "y": 2.25}, + {"matrix": [7, 1], "x": 14.75, "y": 3}, + {"matrix": [7, 0], "x": 15.75, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 3.25}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [3, 4], "x": 4, "y": 3.25}, + {"matrix": [3, 5], "x": 5, "y": 3.5}, + + {"matrix": [4, 4], "x": 6.5, "y": 4.25}, + {"matrix": [4, 5], "x": 7.5, "y": 4.25, "h": 2}, + + {"matrix": [9, 5], "x": 8.5, "y": 4.25, "h": 2}, + {"matrix": [9, 4], "x": 9.5, "y": 4.25}, + + {"matrix": [8, 5], "x": 10.75, "y": 3.5}, + {"matrix": [8, 4], "x": 11.75, "y": 3.25}, + {"matrix": [8, 3], "x": 12.75, "y": 3}, + {"matrix": [8, 2], "x": 13.75, "y": 3.25}, + {"matrix": [8, 1], "x": 14.75, "y": 4}, + {"matrix": [8, 0], "x": 15.75, "y": 4}, + + {"matrix": [4, 1], "x": 3.75, "y": 4.25}, + {"matrix": [4, 2], "x": 4.75, "y": 4.5}, + + {"matrix": [4, 3], "x": 6.5, "y": 5.25}, + + {"matrix": [9, 3], "x": 9.5, "y": 5.25}, + + {"matrix": [9, 2], "x": 11, "y": 4.5}, + {"matrix": [9, 1], "x": 12, "y": 4.25} ] } } diff --git a/keyboards/yosino58/rev1/rev1.h b/keyboards/yosino58/rev1/rev1.h deleted file mode 100644 index c643c9d729f5..000000000000 --- a/keyboards/yosino58/rev1/rev1.h +++ /dev/null @@ -1,23 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \ - L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \ - L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \ - L30, L31, L32, L33, L34, L35, LT4, LT5, RT5, RT4, R30, R31, R32, R33, R34, R35, \ - LT1, LT2, LT3, RT3, RT2, RT1 \ - ) \ - { \ - { L00, L01, L02, L03, L04, L05 }, \ - { L10, L11, L12, L13, L14, L15 }, \ - { L20, L21, L22, L23, L24, L25 }, \ - { L30, L31, L32, L33, L34, L35 }, \ - { KC_NO, LT1, LT2, LT3, LT4, LT5 }, \ - { R05, R04, R03, R02, R01, R00 }, \ - { R15, R14, R13, R12, R11, R10 }, \ - { R25, R24, R23, R22, R21, R20 }, \ - { R35, R34, R33, R32, R31, R30 }, \ - { KC_NO, RT1,RT2, RT3, RT4, RT5 }, \ - } diff --git a/keyboards/yushakobo/navpad/10/info.json b/keyboards/yushakobo/navpad/10/info.json index fc314aa10d81..2cd4bfe8fe5d 100644 --- a/keyboards/yushakobo/navpad/10/info.json +++ b/keyboards/yushakobo/navpad/10/info.json @@ -16,18 +16,5 @@ "pin": "D3" }, "processor": "atmega32u4", - "bootloader": "caterina", - "layouts": { - "LAYOUT": { - "layout": [ - {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "y": 0}, - {"x": 0, "y": 1},{"x": 1, "y": 1},{"x": 2, "y": 1},{"x": 3, "y": 1},{"x": 4, "y": 1},{"x": 5, "y": 1},{"x": 6, "y": 1}, - {"x": 0, "y": 2},{"x": 1, "y": 2},{"x": 2, "y": 2},{"x": 3, "y": 2},{"x": 4, "y": 2},{"x": 5, "y": 2},{"x": 6, "y": 2}, - {"x": 3, "y": 3},{"x": 4, "y": 3},{"x": 5, "y": 3},{"x": 6, "y": 3}, - {"x": 0, "y": 4},{"x": 1, "y": 4},{"x": 2, "y": 4},{"x": 3, "y": 4},{"x": 4, "y": 4},{"x": 5, "y": 4},{"x": 6, "y": 4}, - {"x": 0, "y": 5},{"x": 1, "y": 5},{"x": 2, "y": 5},{"x": 3, "y": 5},{"x": 4, "y": 5},{"x": 5, "y": 5},{"x": 6, "y": 5} - - ] - } - } + "bootloader": "caterina" } diff --git a/keyboards/yushakobo/navpad/10/rev0/info.json b/keyboards/yushakobo/navpad/10/rev0/info.json index 76b579338c31..afe4c6f0c0d8 100644 --- a/keyboards/yushakobo/navpad/10/rev0/info.json +++ b/keyboards/yushakobo/navpad/10/rev0/info.json @@ -6,5 +6,52 @@ "cols": ["F4", "F5", "F6", "B2", "B3", "B1", "F7"], "rows": ["D4", "C6", "D7", "E6", "B4", "D0"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [5, 2], "x": 3, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "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": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [1, 3], "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": [2, 3], "x": 3, "y": 3}, + {"matrix": [2, 4], "x": 4, "y": 3}, + {"matrix": [2, 5], "x": 5, "y": 3}, + {"matrix": [2, 6], "x": 6, "y": 3}, + + {"matrix": [3, 0], "x": 0, "y": 4}, + {"matrix": [3, 1], "x": 1, "y": 4}, + {"matrix": [3, 2], "x": 2, "y": 4}, + {"matrix": [3, 3], "x": 3, "y": 4}, + {"matrix": [3, 4], "x": 4, "y": 4}, + {"matrix": [3, 5], "x": 5, "y": 4}, + {"matrix": [3, 6], "x": 6, "y": 4}, + + {"matrix": [4, 0], "x": 0, "y": 5}, + {"matrix": [4, 1], "x": 1, "y": 5}, + {"matrix": [4, 2], "x": 2, "y": 5}, + {"matrix": [4, 3], "x": 3, "y": 5}, + {"matrix": [4, 4], "x": 4, "y": 5}, + {"matrix": [4, 5], "x": 5, "y": 5}, + {"matrix": [4, 6], "x": 6, "y": 5} + ] + } + } } diff --git a/keyboards/yushakobo/navpad/10/rev0/rev0.h b/keyboards/yushakobo/navpad/10/rev0/rev0.h index 7e2dbab46290..69eca3ef6779 100644 --- a/keyboards/yushakobo/navpad/10/rev0/rev0.h +++ b/keyboards/yushakobo/navpad/10/rev0/rev0.h @@ -19,28 +19,3 @@ #include "quantum.h" #include "navpad_prefs.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, k14, k15, k16, \ - k20, k21, k22, k23, k24, k25, k26, \ - k33, k34, k35, k36, \ - k40, k41, k42, k43, k44, k45, k46, \ - k50, k51, k52, k53, k54, k55, k56 \ - ) \ - {\ - { k00, k01, k02, k13, k14, k15, k16 }, \ - { k10, k11, k12, k23, k24, k25, k26 }, \ - { k20, k21, k22, k33, k34, k35, k36 }, \ - { k40, k41, k42, k43, k44, k45, k46 }, \ - { k50, k51, k52, k53, k54, k55, k56 }, \ - { KC_NO, KC_NO, k03, KC_NO, KC_NO, KC_NO, KC_NO } \ - } diff --git a/keyboards/yushakobo/navpad/10/rev1/info.json b/keyboards/yushakobo/navpad/10/rev1/info.json index 5bf5ce113580..bd20c0d0b479 100644 --- a/keyboards/yushakobo/navpad/10/rev1/info.json +++ b/keyboards/yushakobo/navpad/10/rev1/info.json @@ -6,5 +6,52 @@ "cols": ["F5", "F6", "B2", "B3", "B1", "F7"], "rows": ["D4", "C6", "D7", "E6", "B4", "F4"] }, - "diode_direction": "COL2ROW" + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [5, 1], "x": 3, "y": 0}, + + {"matrix": [5, 2], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [0, 2], "x": 3, "y": 1}, + {"matrix": [0, 3], "x": 4, "y": 1}, + {"matrix": [0, 4], "x": 5, "y": 1}, + {"matrix": [0, 5], "x": 6, "y": 1}, + + {"matrix": [5, 3], "x": 0, "y": 2}, + {"matrix": [2, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [1, 2], "x": 3, "y": 2}, + {"matrix": [1, 3], "x": 4, "y": 2}, + {"matrix": [1, 4], "x": 5, "y": 2}, + {"matrix": [1, 5], "x": 6, "y": 2}, + + {"matrix": [2, 2], "x": 3, "y": 3}, + {"matrix": [2, 3], "x": 4, "y": 3}, + {"matrix": [2, 4], "x": 5, "y": 3}, + {"matrix": [2, 5], "x": 6, "y": 3}, + + {"matrix": [5, 4], "x": 0, "y": 4}, + {"matrix": [3, 0], "x": 1, "y": 4}, + {"matrix": [3, 1], "x": 2, "y": 4}, + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [5, 5], "x": 0, "y": 5}, + {"matrix": [4, 0], "x": 1, "y": 5}, + {"matrix": [4, 1], "x": 2, "y": 5}, + {"matrix": [4, 2], "x": 3, "y": 5}, + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5} + ] + } + } } diff --git a/keyboards/yushakobo/navpad/10/rev1/rev1.h b/keyboards/yushakobo/navpad/10/rev1/rev1.h index b56b6f67cfca..69eca3ef6779 100644 --- a/keyboards/yushakobo/navpad/10/rev1/rev1.h +++ b/keyboards/yushakobo/navpad/10/rev1/rev1.h @@ -19,28 +19,3 @@ #include "quantum.h" #include "navpad_prefs.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, k14, k15, k16, \ - k20, k21, k22, k23, k24, k25, k26, \ - k33, k34, k35, k36, \ - k40, k41, k42, k43, k44, k45, k46, \ - k50, k51, k52, k53, k54, k55, k56 \ - ) \ - {\ - { k01, k02, k13, k14, k15, k16 }, \ - { k11, k12, k23, k24, k25, k26 }, \ - { k21, k22, k33, k34, k35, k36 }, \ - { k41, k42, k43, k44, k45, k46 }, \ - { k51, k52, k53, k54, k55, k56 }, \ - { k00, k03, k10, k20, k40, k50 } \ - } diff --git a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h b/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h deleted file mode 100644 index 53e32fd6e97e..000000000000 --- a/keyboards/yushakobo/navpad/10_helix_r/10_helix_r.h +++ /dev/null @@ -1,50 +0,0 @@ -/* Copyright 2021 yushakobo - * - * 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" -#include "navpad_prefs.h" - -/* This is a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - k00, k01, k02, k03, \ - k10, k11, k12, k13, k14, k15, k16, R10, R11, R12, R13, R14, R15,\ - k20, k21, k22, k23, k24, k25, k26, R20, R21, R22, R23, R24, R25,\ - k33, k34, k35, k36, R30, R31, R32, R33, R34, R35,\ - k40, k41, k42, k43, k44, k45, k46, R46, R40, R41, R42, R43, R44, R45,\ - k50, k51, k52, k53, k54, k55, k56, R56, R50, R51, R52, R53, R54, R55\ - ) \ - {\ - { k01, k02, k13, k14, k15, k16 }, \ - { k11, k12, k23, k24, k25, k26 }, \ - { k21, k22, k33, k34, k35, k36 }, \ - { k41, k42, k43, k44, k45, k46 }, \ - { k51, k52, k53, k54, k55, k56 }, \ - { k00, k03, k10, k20, k40, k50 }, \ - { R15, R14, R13, R12, R11, R10, KC_NO }, \ - { R25, R24, R23, R22, R21, R20, KC_NO }, \ - { R35, R34, R33, R32, R31, R30, KC_NO }, \ - { R45, R44, R43, R42, R41, R40, R46 }, \ - { R55, R54, R53, R52, R51, R50, R56 } \ - } diff --git a/keyboards/yushakobo/navpad/10_helix_r/info.json b/keyboards/yushakobo/navpad/10_helix_r/info.json index bb2a7669e033..7e0a3b76c200 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/info.json +++ b/keyboards/yushakobo/navpad/10_helix_r/info.json @@ -42,12 +42,84 @@ "layouts": { "LAYOUT": { "layout": [ - {"x": 0, "y": 0},{"x": 1, "y": 0},{"x": 2, "y": 0},{"x": 3, "y": 0}, - {"x": 0, "y": 1},{"x": 1, "y": 1},{"x": 2, "y": 1},{"x": 3, "y": 1},{"x": 4, "y": 1},{"x": 5, "y": 1},{"x": 6, "y": 1}, {"x": 8, "y": 1},{"x": 9, "y": 1},{"x": 10, "y": 1},{"x": 11, "y": 1},{"x": 12, "y": 1},{"x": 13, "y": 1}, - {"x": 0, "y": 2},{"x": 1, "y": 2},{"x": 2, "y": 2},{"x": 3, "y": 2},{"x": 4, "y": 2},{"x": 5, "y": 2},{"x": 6, "y": 2}, {"x": 8, "y": 2},{"x": 9, "y": 2},{"x": 10, "y": 2},{"x": 11, "y": 2},{"x": 12, "y": 2},{"x": 13, "y": 2}, - {"x": 3, "y": 3},{"x": 4, "y": 3},{"x": 5, "y": 3},{"x": 6, "y": 3}, {"x": 8, "y": 3},{"x": 9, "y": 3},{"x": 10, "y": 3},{"x": 11, "y": 3},{"x": 12, "y": 3},{"x": 13, "y": 3}, - {"x": 0, "y": 4},{"x": 1, "y": 4},{"x": 2, "y": 4},{"x": 3, "y": 4},{"x": 4, "y": 4},{"x": 5, "y": 4},{"x": 6, "y": 4},{"x": 7, "y": 4},{"x": 8, "y": 4},{"x": 9, "y": 4},{"x": 10, "y": 4},{"x": 11, "y": 4},{"x": 12, "y": 4},{"x": 13, "y": 4}, - {"x": 0, "y": 5},{"x": 1, "y": 5},{"x": 2, "y": 5},{"x": 3, "y": 5},{"x": 4, "y": 5},{"x": 5, "y": 5},{"x": 6, "y": 5},{"x": 7, "y": 5},{"x": 8, "y": 5},{"x": 9, "y": 5},{"x": 10, "y": 5},{"x": 11, "y": 5},{"x": 12, "y": 5},{"x": 13, "y": 5} + {"matrix": [5, 0], "x": 0, "y": 0}, + {"matrix": [0, 0], "x": 1, "y": 0}, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [5, 1], "x": 3, "y": 0}, + + {"matrix": [5, 2], "x": 0, "y": 1}, + {"matrix": [1, 0], "x": 1, "y": 1}, + {"matrix": [1, 1], "x": 2, "y": 1}, + {"matrix": [0, 2], "x": 3, "y": 1}, + {"matrix": [0, 3], "x": 4, "y": 1}, + {"matrix": [0, 4], "x": 5, "y": 1}, + {"matrix": [0, 5], "x": 6, "y": 1}, + + {"matrix": [6, 5], "x": 8, "y": 1}, + {"matrix": [6, 4], "x": 9, "y": 1}, + {"matrix": [6, 3], "x": 10, "y": 1}, + {"matrix": [6, 2], "x": 11, "y": 1}, + {"matrix": [6, 1], "x": 12, "y": 1}, + {"matrix": [6, 0], "x": 13, "y": 1}, + + {"matrix": [5, 3], "x": 0, "y": 2}, + {"matrix": [2, 0], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + {"matrix": [1, 2], "x": 3, "y": 2}, + {"matrix": [1, 3], "x": 4, "y": 2}, + {"matrix": [1, 4], "x": 5, "y": 2}, + {"matrix": [1, 5], "x": 6, "y": 2}, + + {"matrix": [7, 5], "x": 8, "y": 2}, + {"matrix": [7, 4], "x": 9, "y": 2}, + {"matrix": [7, 3], "x": 10, "y": 2}, + {"matrix": [7, 2], "x": 11, "y": 2}, + {"matrix": [7, 1], "x": 12, "y": 2}, + {"matrix": [7, 0], "x": 13, "y": 2}, + + {"matrix": [2, 2], "x": 3, "y": 3}, + {"matrix": [2, 3], "x": 4, "y": 3}, + {"matrix": [2, 4], "x": 5, "y": 3}, + {"matrix": [2, 5], "x": 6, "y": 3}, + + {"matrix": [8, 5], "x": 8, "y": 3}, + {"matrix": [8, 4], "x": 9, "y": 3}, + {"matrix": [8, 3], "x": 10, "y": 3}, + {"matrix": [8, 2], "x": 11, "y": 3}, + {"matrix": [8, 1], "x": 12, "y": 3}, + {"matrix": [8, 0], "x": 13, "y": 3}, + + {"matrix": [5, 4], "x": 0, "y": 4}, + {"matrix": [3, 0], "x": 1, "y": 4}, + {"matrix": [3, 1], "x": 2, "y": 4}, + {"matrix": [3, 2], "x": 3, "y": 4}, + {"matrix": [3, 3], "x": 4, "y": 4}, + {"matrix": [3, 4], "x": 5, "y": 4}, + {"matrix": [3, 5], "x": 6, "y": 4}, + + {"matrix": [9, 6], "x": 7, "y": 4}, + {"matrix": [9, 5], "x": 8, "y": 4}, + {"matrix": [9, 4], "x": 9, "y": 4}, + {"matrix": [9, 3], "x": 10, "y": 4}, + {"matrix": [9, 2], "x": 11, "y": 4}, + {"matrix": [9, 1], "x": 12, "y": 4}, + {"matrix": [9, 0], "x": 13, "y": 4}, + + {"matrix": [5, 5], "x": 0, "y": 5}, + {"matrix": [4, 0], "x": 1, "y": 5}, + {"matrix": [4, 1], "x": 2, "y": 5}, + {"matrix": [4, 2], "x": 3, "y": 5}, + {"matrix": [4, 3], "x": 4, "y": 5}, + {"matrix": [4, 4], "x": 5, "y": 5}, + {"matrix": [4, 5], "x": 6, "y": 5}, + + {"matrix": [10, 6], "x": 7, "y": 5}, + {"matrix": [10, 5], "x": 8, "y": 5}, + {"matrix": [10, 4], "x": 9, "y": 5}, + {"matrix": [10, 3], "x": 10, "y": 5}, + {"matrix": [10, 2], "x": 11, "y": 5}, + {"matrix": [10, 1], "x": 12, "y": 5}, + {"matrix": [10, 0], "x": 13, "y": 5} ] } } diff --git a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c index 58286f73cea4..011daf517e8c 100644 --- a/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c +++ b/keyboards/yushakobo/navpad/10_helix_r/keymaps/default/keymap.c @@ -15,6 +15,8 @@ */ #include QMK_KEYBOARD_H +#include "navpad_prefs.h" + const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] =LAYOUT ( KC_PSCR, KC_SCRL, KC_PAUS, KC_MUTE, diff --git a/keyboards/yynmt/kagamidget/info.json b/keyboards/yynmt/kagamidget/info.json index 368be6834b89..4165c966bf44 100644 --- a/keyboards/yynmt/kagamidget/info.json +++ b/keyboards/yynmt/kagamidget/info.json @@ -21,10 +21,57 @@ "layouts": { "LAYOUT": { "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":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, - {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, - {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3} + {"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": [0, 8], "x": 8, "y": 0}, + {"matrix": [0, 9], "x": 9, "y": 0}, + {"matrix": [0, 10], "x": 10, "y": 0}, + {"matrix": [0, 11], "x": 11, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [1, 4], "x": 4, "y": 1}, + {"matrix": [1, 5], "x": 5, "y": 1}, + {"matrix": [1, 6], "x": 6, "y": 1}, + {"matrix": [1, 7], "x": 7, "y": 1}, + {"matrix": [1, 8], "x": 8, "y": 1}, + {"matrix": [1, 9], "x": 9, "y": 1}, + {"matrix": [1, 10], "x": 10, "y": 1}, + {"matrix": [1, 11], "x": 11, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [2, 4], "x": 4, "y": 2}, + {"matrix": [2, 5], "x": 5, "y": 2}, + {"matrix": [2, 6], "x": 6, "y": 2}, + {"matrix": [2, 7], "x": 7, "y": 2}, + {"matrix": [2, 8], "x": 8, "y": 2}, + {"matrix": [2, 9], "x": 9, "y": 2}, + {"matrix": [2, 10], "x": 10, "y": 2}, + {"matrix": [2, 11], "x": 11, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "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, 8], "x": 8, "y": 3}, + {"matrix": [3, 9], "x": 9, "y": 3}, + {"matrix": [3, 10], "x": 10, "y": 3}, + {"matrix": [3, 11], "x": 11, "y": 3} ] } } diff --git a/keyboards/yynmt/kagamidget/kagamidget.h b/keyboards/yynmt/kagamidget/kagamidget.h deleted file mode 100644 index e0655a4e989d..000000000000 --- a/keyboards/yynmt/kagamidget/kagamidget.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright 2019 yynmt - * - * 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" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT( \ - K01, K05, K09, K13, K17, K21, K25, K29, K33, K37, K41, K45, \ - K02, K06, K10, K14, K18, K22, K26, K30, K34, K38, K42, K46, \ - K03, K07, K11, K15, K19, K23, K27, K31, K35, K39, K43, K47, \ - K04, K08, K12, K16, K20, K24, K28, K32, K36, K40, K44, K48 \ -) \ -{ \ - { K01, K05, K09, K13, K17, K21, K25, K29, K33, K37, K41, K45 }, \ - { K02, K06, K10, K14, K18, K22, K26, K30, K34, K38, K42, K46 }, \ - { K03, K07, K11, K15, K19, K23, K27, K31, K35, K39, K43, K47 }, \ - { K04, K08, K12, K16, K20, K24, K28, K32, K36, K40, K44, K48 }, \ -} diff --git a/users/vnmm/vnmm.h b/users/vnmm/vnmm.h deleted file mode 100644 index 03723c3debbd..000000000000 --- a/users/vnmm/vnmm.h +++ /dev/null @@ -1,21 +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 "keymap_user.h" -#ifdef RGB_MATRIX_ENABLE -# include "rgb_matrix_user.h" -#endif \ No newline at end of file