From 364c06d939134184838579d4e73880f8c2f83419 Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 5 Apr 2023 15:46:59 +1000 Subject: Move small macropad-ish layouts to data driven (#20341) --- keyboards/10bleoledhub/10bleoledhub.h | 30 --- keyboards/10bleoledhub/info.json | 23 +- keyboards/2key2crawl/2key2crawl.h | 12 - keyboards/2key2crawl/info.json | 23 +- keyboards/3keyecosystem/2key2/2key2.c | 2 +- keyboards/3keyecosystem/2key2/2key2.h | 33 --- keyboards/3keyecosystem/2key2/info.json | 4 +- keyboards/4by3/4by3.h | 70 ------ keyboards/4by3/info.json | 58 ++++- keyboards/9key/9key.h | 13 -- keyboards/9key/info.json | 14 +- keyboards/abstract/ellipse/rev1/info.json | 10 +- keyboards/abstract/ellipse/rev1/rev1.h | 36 --- keyboards/afternoonlabs/gust/rev1/info.json | 47 +--- keyboards/afternoonlabs/gust/rev1/rev1.h | 30 --- keyboards/aplyard/aplx6/info.json | 13 -- keyboards/aplyard/aplx6/rev1/info.json | 15 +- keyboards/aplyard/aplx6/rev1/rev1.h | 12 - keyboards/aplyard/aplx6/rev2/info.json | 15 +- keyboards/aplyard/aplx6/rev2/rev2.h | 28 --- keyboards/axolstudio/helpo/helpo.h | 39 ---- keyboards/axolstudio/helpo/info.json | 43 ++-- keyboards/biacco42/meishi/info.json | 8 +- keyboards/biacco42/meishi/meishi.h | 31 --- keyboards/biacco42/meishi2/info.json | 8 +- keyboards/biacco42/meishi2/meishi2.h | 34 --- keyboards/boston_meetup/boston_meetup.h | 16 -- keyboards/boston_meetup/info.json | 20 +- keyboards/bthlabs/geekpad/geekpad.h | 37 ---- keyboards/bthlabs/geekpad/info.json | 20 +- keyboards/capsunlocked/cu7/cu7.h | 36 --- keyboards/capsunlocked/cu7/info.json | 14 +- keyboards/catch22/catch22.h | 33 --- keyboards/catch22/info.json | 29 ++- keyboards/ckeys/thedora/info.json | 42 ++-- keyboards/ckeys/thedora/thedora.c | 2 +- keyboards/ckeys/thedora/thedora.h | 37 ---- keyboards/ckeys/washington/info.json | 16 +- keyboards/ckeys/washington/washington.h | 38 ---- keyboards/clawsome/bookerboard/bookerboard.h | 30 --- keyboards/clawsome/bookerboard/info.json | 27 ++- keyboards/clawsome/doodle/doodle.h | 27 --- keyboards/clawsome/doodle/info.json | 13 +- keyboards/clawsome/fightpad/fightpad.h | 26 --- keyboards/clawsome/fightpad/info.json | 27 ++- keyboards/clawsome/gamebuddy/v1_0/info.json | 56 ++--- keyboards/clawsome/gamebuddy/v1_0/v1_0.h | 32 --- keyboards/clawsome/gamebuddy/v1_m/info.json | 58 ++--- keyboards/clawsome/gamebuddy/v1_m/v1_m.h | 33 --- keyboards/clawsome/luggage_rack/info.json | 30 +-- keyboards/clawsome/luggage_rack/luggage_rack.h | 38 ---- keyboards/clawsome/sidekick/info.json | 58 ++--- keyboards/clawsome/sidekick/sidekick.h | 33 --- keyboards/contender/contender.h | 43 ---- keyboards/contender/info.json | 57 ++--- keyboards/converter/numeric_keypad_iie/info.json | 38 +++- .../numeric_keypad_iie/numeric_keypad_iie.h | 30 --- .../copenhagen_click/click_pad_v1/click_pad_v1.h | 28 --- keyboards/copenhagen_click/click_pad_v1/info.json | 4 +- keyboards/craftwalk/craftwalk.h | 38 ---- keyboards/craftwalk/info.json | 31 +-- keyboards/dailycraft/sandbox/rev1/info.json | 20 +- keyboards/dailycraft/sandbox/rev1/rev1.h | 35 --- keyboards/dailycraft/sandbox/rev2/info.json | 42 ++-- keyboards/dailycraft/sandbox/rev2/rev2.h | 37 ---- keyboards/dmqdesign/spin/info.json | 34 +-- keyboards/dmqdesign/spin/spin.h | 29 --- keyboards/doio/kb16/kb16.c | 2 +- keyboards/doio/kb16/kb16.h | 45 ---- keyboards/doio/kb16/rev1/info.json | 38 ++-- keyboards/doio/kb16/rev2/info.json | 38 ++-- keyboards/doio/kb30/info.json | 73 ++++--- keyboards/doio/kb30/kb30.c | 2 +- keyboards/doio/kb30/kb30.h | 45 ---- keyboards/donutcables/scrabblepad/info.json | 242 ++++++++++++++++++++- keyboards/donutcables/scrabblepad/scrabblepad.h | 53 ----- keyboards/doodboard/duckboard/duckboard.h | 33 --- keyboards/doodboard/duckboard/info.json | 38 ++-- keyboards/doodboard/duckboard_r2/duckboard_r2.h | 33 --- keyboards/doodboard/duckboard_r2/info.json | 44 ++-- keyboards/draytronics/daisy/daisy.h | 33 --- keyboards/draytronics/daisy/info.json | 20 +- keyboards/dumbpad/v0x/info.json | 24 +- keyboards/dumbpad/v0x/v0x.c | 2 +- keyboards/dumbpad/v0x/v0x.h | 30 --- keyboards/dumbpad/v0x_dualencoder/info.json | 23 +- .../dumbpad/v0x_dualencoder/v0x_dualencoder.c | 2 +- .../dumbpad/v0x_dualencoder/v0x_dualencoder.h | 30 --- keyboards/dumbpad/v0x_right/info.json | 24 +- keyboards/dumbpad/v0x_right/v0x_right.c | 2 +- keyboards/dumbpad/v0x_right/v0x_right.h | 30 --- keyboards/dumbpad/v1x/info.json | 24 +- keyboards/dumbpad/v1x/v1x.c | 2 +- keyboards/dumbpad/v1x/v1x.h | 30 --- keyboards/dumbpad/v1x_dualencoder/info.json | 24 +- .../dumbpad/v1x_dualencoder/v1x_dualencoder.c | 2 +- .../dumbpad/v1x_dualencoder/v1x_dualencoder.h | 30 --- keyboards/dumbpad/v1x_oled/info.json | 24 +- keyboards/dumbpad/v1x_oled/v1x_oled.c | 2 +- keyboards/dumbpad/v1x_oled/v1x_oled.h | 30 --- keyboards/dumbpad/v1x_right/info.json | 24 +- keyboards/dumbpad/v1x_right/v1x_right.c | 2 +- keyboards/dumbpad/v1x_right/v1x_right.h | 30 --- keyboards/dumbpad/v3x/info.json | 24 +- keyboards/dumbpad/v3x/v3x.c | 2 +- keyboards/dumbpad/v3x/v3x.h | 33 --- keyboards/earth_rover/earth_rover.h | 41 ---- keyboards/earth_rover/info.json | 28 +-- keyboards/flehrad/bigswitch/bigswitch.c | 2 +- keyboards/flehrad/bigswitch/bigswitch.h | 26 --- keyboards/flehrad/bigswitch/info.json | 4 +- keyboards/frooastboard/nano/info.json | 25 +-- keyboards/frooastboard/nano/nano.h | 27 --- keyboards/gboards/ergotaco/ergotaco.h | 20 -- keyboards/gboards/ergotaco/info.json | 24 +- keyboards/geekboards/tester/info.json | 16 +- keyboards/geekboards/tester/tester.c | 3 +- keyboards/geekboards/tester/tester.h | 10 - keyboards/grid600/press/info.json | 7 +- keyboards/grid600/press/press.h | 32 --- keyboards/handwired/2x5keypad/2x5keypad.h | 11 - keyboards/handwired/2x5keypad/info.json | 20 +- keyboards/handwired/6key/6key.c | 2 +- keyboards/handwired/6key/6key.h | 27 --- keyboards/handwired/6key/info.json | 9 +- keyboards/handwired/6macro/6macro.h | 35 --- keyboards/handwired/6macro/info.json | 10 +- keyboards/handwired/aplx2/aplx2.h | 25 --- keyboards/handwired/aplx2/info.json | 4 +- keyboards/handwired/arrow_pad/arrow_pad.h | 35 --- keyboards/handwired/arrow_pad/info.json | 78 +++---- .../handwired/arrow_pad/keymaps/pad_21/keymap.c | 13 ++ keyboards/handwired/bstk100/bstk100.h | 43 ---- keyboards/handwired/bstk100/info.json | 40 ++-- keyboards/handwired/ck4x4/ck4x4.h | 15 -- keyboards/handwired/ck4x4/info.json | 32 +-- .../handwired/frankie_macropad/frankie_macropad.h | 39 ---- keyboards/handwired/frankie_macropad/info.json | 20 +- keyboards/handwired/gamenum/gamenum.c | 2 +- keyboards/handwired/gamenum/gamenum.h | 19 -- keyboards/handwired/gamenum/info.json | 38 ++-- keyboards/handwired/leftynumpad/info.json | 50 +++-- keyboards/handwired/leftynumpad/leftynumpad.h | 42 ---- keyboards/handwired/lovelive9/info.json | 18 +- keyboards/handwired/lovelive9/lovelive9.h | 9 - keyboards/handwired/mechboards_micropad/info.json | 7 +- .../mechboards_micropad/mechboards_micropad.h | 33 --- keyboards/handwired/misterdeck/info.json | 24 +- keyboards/handwired/misterdeck/misterdeck.h | 30 --- keyboards/handwired/mutepad/info.json | 8 +- keyboards/handwired/mutepad/mutepad.h | 19 -- keyboards/handwired/nicekey/info.json | 2 +- keyboards/handwired/nicekey/nicekey.h | 9 - keyboards/handwired/novem/info.json | 20 +- keyboards/handwired/novem/novem.h | 31 --- keyboards/handwired/nozbe_macro/info.json | 8 +- keyboards/handwired/nozbe_macro/nozbe_macro.h | 25 --- keyboards/handwired/numpad20/info.json | 44 ++-- keyboards/handwired/numpad20/numpad20.h | 17 -- keyboards/handwired/obuwunkunubi/spaget/info.json | 54 +++-- keyboards/handwired/obuwunkunubi/spaget/spaget.h | 47 ---- keyboards/handwired/postageboard/info.json | 6 +- keyboards/handwired/postageboard/postageboard.h | 26 --- keyboards/handwired/snatchpad/info.json | 16 +- keyboards/handwired/snatchpad/snatchpad.c | 2 +- keyboards/handwired/snatchpad/snatchpad.h | 24 -- keyboards/handwired/splittest/info.json | 5 +- keyboards/handwired/splittest/splittest.h | 5 - keyboards/handwired/sticc14/info.json | 32 +-- keyboards/handwired/sticc14/sticc14.h | 40 ---- keyboards/handwired/tennie/info.json | 15 +- keyboards/handwired/tennie/tennie.c | 2 +- keyboards/handwired/tennie/tennie.h | 37 ---- keyboards/handwired/trackpoint/info.json | 6 +- keyboards/handwired/trackpoint/trackpoint.h | 10 - keyboards/hfdkb/ac001/ac001.c | 2 +- keyboards/hfdkb/ac001/ac001.h | 26 --- keyboards/hfdkb/ac001/info.json | 11 +- keyboards/hifumi/hifumi.h | 31 --- keyboards/hifumi/info.json | 10 +- keyboards/hineybush/h08_ocelot/h08_ocelot.h | 36 --- keyboards/hineybush/h08_ocelot/info.json | 12 +- keyboards/hub16/hub16.h | 42 ---- keyboards/hub16/info.json | 40 ++-- keyboards/illuminati/is0/info.json | 4 +- keyboards/illuminati/is0/is0.h | 33 --- keyboards/jadookb/jkb2/info.json | 5 +- keyboards/jadookb/jkb2/jkb2.h | 25 --- keyboards/jkdlab/binary_monkey/binary_monkey.h | 28 --- keyboards/jkdlab/binary_monkey/info.json | 7 +- keyboards/kakunpc/business_card/alpha/alpha.h | 35 --- keyboards/kakunpc/business_card/alpha/info.json | 13 +- keyboards/kakunpc/business_card/beta/beta.h | 37 ---- keyboards/kakunpc/business_card/beta/info.json | 14 +- keyboards/keebio/bamfk4/bamfk4.c | 2 +- keyboards/keebio/bamfk4/bamfk4.h | 12 - keyboards/keebio/bamfk4/info.json | 8 +- keyboards/keebio/bigswitchseat/bigswitchseat.h | 12 - keyboards/keebio/bigswitchseat/info.json | 4 +- keyboards/keebwerk/nano_slider/info.json | 18 +- keyboards/keebwerk/nano_slider/nano_slider.h | 36 --- keyboards/keebzdotnet/wazowski/info.json | 34 +-- keyboards/keebzdotnet/wazowski/wazowski.h | 38 ---- keyboards/keyhive/honeycomb/honeycomb.h | 13 -- keyboards/keyhive/honeycomb/info.json | 32 +-- keyboards/keyhive/navi10/info.json | 5 - keyboards/keyhive/navi10/rev0/info.json | 21 +- keyboards/keyhive/navi10/rev0/rev0.c | 2 +- keyboards/keyhive/navi10/rev0/rev0.h | 34 --- keyboards/keyhive/navi10/rev2/info.json | 21 +- keyboards/keyhive/navi10/rev2/rev2.c | 2 +- keyboards/keyhive/navi10/rev2/rev2.h | 34 --- keyboards/keyhive/navi10/rev3/info.json | 21 +- keyboards/keyhive/navi10/rev3/rev3.c | 2 +- keyboards/keyhive/navi10/rev3/rev3.h | 34 --- keyboards/keysofkings/twokey/info.json | 7 +- keyboards/keysofkings/twokey/twokey.h | 28 --- keyboards/kingly_keys/romac/info.json | 18 +- keyboards/kingly_keys/romac/romac.h | 16 -- keyboards/kingly_keys/romac_plus/info.json | 18 +- keyboards/kingly_keys/romac_plus/romac_plus.h | 16 -- keyboards/kingly_keys/smd_milk/info.json | 5 +- keyboards/kingly_keys/smd_milk/smd_milk.h | 26 --- keyboards/kingly_keys/soap/info.json | 12 +- keyboards/kingly_keys/soap/soap.h | 32 --- keyboards/kiwikeebs/macro/info.json | 16 +- keyboards/kiwikeebs/macro/macro.c | 17 -- keyboards/kiwikeebs/macro/macro.h | 35 --- keyboards/kiwikeebs/macro_v2/info.json | 15 +- keyboards/kiwikeebs/macro_v2/macro_v2.c | 17 -- keyboards/kiwikeebs/macro_v2/macro_v2.h | 35 --- keyboards/kmac_pad/info.json | 36 +-- keyboards/kmac_pad/kmac_pad.c | 2 +- keyboards/kmac_pad/kmac_pad.h | 37 ---- keyboards/knops/mini/info.json | 10 +- keyboards/knops/mini/mini.h | 29 --- keyboards/late9/rev1/info.json | 29 ++- keyboards/late9/rev1/rev1.c | 2 +- keyboards/late9/rev1/rev1.h | 59 ----- keyboards/latincompass/latinpad/info.json | 39 ++-- keyboards/latincompass/latinpad/latinpad.c | 2 +- keyboards/latincompass/latinpad/latinpad.h | 42 ---- keyboards/lazydesigners/cassette8/cassette8.h | 28 --- keyboards/lazydesigners/cassette8/info.json | 17 +- keyboards/lefty/info.json | 68 +++--- keyboards/lefty/lefty.c | 2 +- keyboards/lefty/lefty.h | 37 ---- keyboards/lizard_trick/tenkey_plusplus/info.json | 40 ++-- .../lizard_trick/tenkey_plusplus/tenkey_plusplus.h | 45 ---- keyboards/m10a/info.json | 20 +- keyboards/m10a/m10a.h | 36 --- keyboards/machine_industries/m4_a/info.json | 8 +- keyboards/machine_industries/m4_a/m4_a.h | 22 -- keyboards/makrosu/info.json | 15 +- keyboards/makrosu/makrosu.h | 20 -- keyboards/maple_computing/6ball/6ball.h | 10 - keyboards/maple_computing/6ball/info.json | 12 +- .../christmas_tree/christmas_tree.h | 14 -- keyboards/maple_computing/christmas_tree/info.json | 11 +- keyboards/maple_computing/ivy/rev1/info.json | 6 +- keyboards/maple_computing/ivy/rev1/rev1.h | 14 -- keyboards/maple_computing/launchpad/rev1/info.json | 16 +- keyboards/maple_computing/launchpad/rev1/rev1.h | 15 -- keyboards/maple_computing/the_ruler/info.json | 9 +- keyboards/maple_computing/the_ruler/the_ruler.h | 8 - keyboards/massdrop/thekey/info.json | 6 +- keyboards/massdrop/thekey/thekey.h | 27 --- keyboards/massdrop/thekey_v2/info.json | 6 +- keyboards/massdrop/thekey_v2/thekey_v2.h | 27 --- keyboards/maxr1998/pulse4k/info.json | 16 +- keyboards/maxr1998/pulse4k/pulse4k.h | 9 - keyboards/mechwild/murphpad/info.json | 43 +++- keyboards/mechwild/murphpad/murphpad.c | 2 +- keyboards/mechwild/murphpad/murphpad.h | 48 ---- keyboards/mechwild/puckbuddy/info.json | 35 +-- keyboards/mechwild/puckbuddy/puckbuddy.h | 23 -- keyboards/merge/iso_macro/info.json | 20 +- keyboards/merge/iso_macro/iso_macro.h | 29 --- keyboards/merge/uc1/info.json | 11 +- keyboards/merge/uc1/uc1.h | 27 --- keyboards/mexsistor/ludmila/info.json | 11 +- keyboards/mexsistor/ludmila/ludmila.h | 36 --- keyboards/millipad/info.json | 26 +-- keyboards/millipad/millipad.h | 35 --- keyboards/momokai/tap_duo/info.json | 11 +- keyboards/momokai/tap_duo/tap_duo.c | 2 +- keyboards/momokai/tap_duo/tap_duo.h | 26 --- keyboards/momokai/tap_trio/info.json | 13 +- keyboards/momokai/tap_trio/tap_trio.c | 2 +- keyboards/momokai/tap_trio/tap_trio.h | 26 --- keyboards/ncc1701kb/info.json | 20 +- keyboards/ncc1701kb/ncc1701kb.h | 14 -- keyboards/neopad/rev1/info.json | 9 +- keyboards/neopad/rev1/rev1.c | 2 +- keyboards/neopad/rev1/rev1.h | 26 --- keyboards/nightly_boards/n2/info.json | 5 +- keyboards/nightly_boards/n2/n2.h | 27 --- keyboards/nightly_boards/n9/info.json | 23 +- keyboards/nightly_boards/n9/n9.h | 29 --- keyboards/nightly_boards/octopad/info.json | 35 +-- keyboards/nightly_boards/octopad/octopad.h | 19 -- keyboards/nightly_boards/octopadplus/info.json | 24 +- keyboards/nightly_boards/octopadplus/octopadplus.h | 37 ---- keyboards/novelkeys/nk20/info.json | 28 ++- keyboards/novelkeys/nk20/nk20.c | 2 +- keyboards/novelkeys/nk20/nk20.h | 38 ---- keyboards/np12/info.json | 31 +-- keyboards/np12/np12.c | 17 -- keyboards/np12/np12.h | 31 --- keyboards/ocean/stealth/info.json | 6 +- keyboards/ocean/stealth/stealth.h | 25 --- keyboards/pabile/p18/info.json | 39 ++-- keyboards/pabile/p18/p18.h | 16 -- keyboards/palette1202/info.json | 28 +-- keyboards/palette1202/palette1202.c | 2 +- keyboards/palette1202/palette1202.h | 37 ---- keyboards/paprikman/albacore/albacore.c | 2 +- keyboards/paprikman/albacore/albacore.h | 36 --- keyboards/paprikman/albacore/info.json | 14 +- keyboards/pdxkbc/info.json | 11 +- keyboards/pdxkbc/pdxkbc.h | 37 ---- keyboards/pimentoso/paddino02/rev1/info.json | 20 +- keyboards/pimentoso/paddino02/rev1/rev1.h | 13 -- keyboards/pimentoso/paddino02/rev2/left/info.json | 20 +- keyboards/pimentoso/paddino02/rev2/left/left.h | 13 -- keyboards/pimentoso/paddino02/rev2/right/info.json | 20 +- keyboards/pimentoso/paddino02/rev2/right/right.h | 13 -- keyboards/pimentoso/touhoupad/info.json | 20 +- keyboards/pimentoso/touhoupad/touhoupad.h | 28 --- keyboards/psuieee/pluto12/info.json | 26 ++- keyboards/psuieee/pluto12/pluto12.h | 24 -- keyboards/puck/info.json | 27 ++- keyboards/puck/puck.h | 15 -- keyboards/qvex/lynepad/info.json | 16 +- keyboards/qvex/lynepad/lynepad.c | 2 +- keyboards/qvex/lynepad/lynepad.h | 37 ---- keyboards/rad/info.json | 58 ++--- keyboards/rad/rad.h | 29 --- keyboards/reviung/reviung5/info.json | 10 +- keyboards/reviung/reviung5/reviung5.h | 33 --- keyboards/rocketboard_16/info.json | 36 +-- keyboards/rocketboard_16/rocketboard_16.h | 19 -- keyboards/rotr/info.json | 6 +- keyboards/rotr/rotr.c | 1 - keyboards/rotr/rotr.h | 9 - keyboards/rubi/info.json | 41 ++-- keyboards/rubi/rubi.h | 39 ---- keyboards/s_ol/0xc_pad/0xc_pad.h | 12 - keyboards/s_ol/0xc_pad/info.json | 27 ++- keyboards/salicylic_acid3/nafuda/info.json | 14 +- keyboards/salicylic_acid3/nafuda/nafuda.h | 24 -- keyboards/sawnsprojects/satxri6key/info.json | 12 +- keyboards/sawnsprojects/satxri6key/satxri6key.c | 3 +- keyboards/sawnsprojects/satxri6key/satxri6key.h | 27 --- keyboards/sck/gtm/gtm.h | 12 - keyboards/sck/gtm/info.json | 23 +- keyboards/sck/neiso/info.json | 8 +- keyboards/sck/neiso/neiso.h | 34 --- keyboards/shiro/info.json | 34 +-- keyboards/shiro/shiro.h | 41 ---- keyboards/skippys_custom_pcs/roopad/info.json | 28 ++- keyboards/skippys_custom_pcs/roopad/roopad.h | 32 --- keyboards/soup10/info.json | 23 +- keyboards/soup10/soup10.h | 39 ---- keyboards/swiftrax/retropad/info.json | 10 +- keyboards/swiftrax/retropad/retropad.h | 31 --- keyboards/takashiski/namecard2x4/info.json | 12 +- keyboards/takashiski/namecard2x4/namecard2x4.h | 31 --- keyboards/tempo_turtle/bradpad/bradpad.h | 32 --- keyboards/tempo_turtle/bradpad/info.json | 27 ++- keyboards/tender/macrowo_pad/info.json | 27 ++- keyboards/tender/macrowo_pad/macrowo_pad.h | 27 --- keyboards/treasure/type9/info.json | 14 +- keyboards/treasure/type9/type9.h | 37 ---- keyboards/vagrant_10/info.json | 16 +- keyboards/vagrant_10/vagrant_10.h | 39 ---- keyboards/wilba_tech/rama_works_m10_b/info.json | 23 +- .../wilba_tech/rama_works_m10_b/rama_works_m10_b.h | 30 --- keyboards/wilba_tech/rama_works_m10_c/info.json | 16 +- .../wilba_tech/rama_works_m10_c/rama_works_m10_c.h | 15 -- keyboards/wilba_tech/rama_works_m6_a/info.json | 13 +- .../wilba_tech/rama_works_m6_a/rama_works_m6_a.h | 29 --- keyboards/wilba_tech/rama_works_m6_b/info.json | 13 +- .../wilba_tech/rama_works_m6_b/rama_works_m6_b.h | 28 --- keyboards/wilba_tech/wt8_a/info.json | 12 +- keyboards/wilba_tech/wt8_a/wt8_a.h | 27 --- keyboards/winry/winry25tc/info.json | 54 ++--- keyboards/winry/winry25tc/winry25tc.h | 33 --- keyboards/woodkeys/bigseries/1key/1key.c | 2 +- keyboards/woodkeys/bigseries/1key/1key.h | 26 --- keyboards/woodkeys/bigseries/1key/info.json | 2 +- keyboards/woodkeys/bigseries/2key/2key.c | 2 +- keyboards/woodkeys/bigseries/2key/2key.h | 26 --- keyboards/woodkeys/bigseries/2key/info.json | 4 +- keyboards/woodkeys/bigseries/3key/3key.c | 2 +- keyboards/woodkeys/bigseries/3key/3key.h | 26 --- keyboards/woodkeys/bigseries/3key/info.json | 6 +- keyboards/woodkeys/bigseries/4key/4key.h | 28 --- keyboards/woodkeys/bigseries/4key/info.json | 8 +- keyboards/work_louder/loop/info.json | 25 +-- keyboards/work_louder/loop/loop.h | 14 -- keyboards/work_louder/nano/info.json | 6 +- keyboards/work_louder/nano/nano.h | 14 -- keyboards/wuque/mammoth20x/info.json | 46 ++-- keyboards/wuque/mammoth20x/mammoth20x.c | 3 +- keyboards/wuque/mammoth20x/mammoth20x.h | 35 --- keyboards/xbows/numpad/info.json | 45 ++-- keyboards/xbows/numpad/numpad.c | 2 +- keyboards/xbows/numpad/numpad.h | 33 --- keyboards/yampad/info.json | 36 +-- keyboards/yampad/yampad.c | 2 +- keyboards/yampad/yampad.h | 57 ----- keyboards/yoichiro/lunakey_macro/info.json | 22 +- keyboards/yoichiro/lunakey_macro/lunakey_macro.h | 37 ---- keyboards/yushakobo/quick17/info.json | 23 +- keyboards/yushakobo/quick17/quick17.c | 2 +- keyboards/yushakobo/quick17/quick17.h | 38 ---- keyboards/yynmt/dozen0/dozen0.h | 34 --- keyboards/yynmt/dozen0/info.json | 15 +- keyboards/zfrontier/big_switch/big_switch.h | 34 --- keyboards/zfrontier/big_switch/info.json | 2 +- 421 files changed, 2788 insertions(+), 7128 deletions(-) delete mode 100644 keyboards/10bleoledhub/10bleoledhub.h delete mode 100644 keyboards/2key2crawl/2key2crawl.h delete mode 100644 keyboards/3keyecosystem/2key2/2key2.h delete mode 100644 keyboards/4by3/4by3.h delete mode 100644 keyboards/9key/9key.h delete mode 100644 keyboards/abstract/ellipse/rev1/rev1.h delete mode 100644 keyboards/afternoonlabs/gust/rev1/rev1.h delete mode 100644 keyboards/aplyard/aplx6/rev1/rev1.h delete mode 100644 keyboards/aplyard/aplx6/rev2/rev2.h delete mode 100644 keyboards/axolstudio/helpo/helpo.h delete mode 100644 keyboards/biacco42/meishi/meishi.h delete mode 100644 keyboards/biacco42/meishi2/meishi2.h delete mode 100644 keyboards/boston_meetup/boston_meetup.h delete mode 100644 keyboards/bthlabs/geekpad/geekpad.h delete mode 100644 keyboards/capsunlocked/cu7/cu7.h delete mode 100644 keyboards/catch22/catch22.h delete mode 100755 keyboards/ckeys/thedora/thedora.h delete mode 100644 keyboards/ckeys/washington/washington.h delete mode 100644 keyboards/clawsome/bookerboard/bookerboard.h delete mode 100644 keyboards/clawsome/doodle/doodle.h delete mode 100644 keyboards/clawsome/fightpad/fightpad.h delete mode 100644 keyboards/clawsome/gamebuddy/v1_0/v1_0.h delete mode 100644 keyboards/clawsome/gamebuddy/v1_m/v1_m.h delete mode 100644 keyboards/clawsome/luggage_rack/luggage_rack.h delete mode 100644 keyboards/clawsome/sidekick/sidekick.h delete mode 100644 keyboards/contender/contender.h delete mode 100644 keyboards/converter/numeric_keypad_iie/numeric_keypad_iie.h delete mode 100755 keyboards/copenhagen_click/click_pad_v1/click_pad_v1.h delete mode 100644 keyboards/craftwalk/craftwalk.h delete mode 100644 keyboards/dailycraft/sandbox/rev1/rev1.h delete mode 100644 keyboards/dailycraft/sandbox/rev2/rev2.h delete mode 100644 keyboards/dmqdesign/spin/spin.h delete mode 100644 keyboards/doio/kb16/kb16.h delete mode 100644 keyboards/doio/kb30/kb30.h delete mode 100644 keyboards/donutcables/scrabblepad/scrabblepad.h delete mode 100644 keyboards/doodboard/duckboard/duckboard.h delete mode 100644 keyboards/doodboard/duckboard_r2/duckboard_r2.h delete mode 100644 keyboards/draytronics/daisy/daisy.h delete mode 100644 keyboards/dumbpad/v0x/v0x.h delete mode 100644 keyboards/dumbpad/v0x_dualencoder/v0x_dualencoder.h delete mode 100644 keyboards/dumbpad/v0x_right/v0x_right.h delete mode 100644 keyboards/dumbpad/v1x/v1x.h delete mode 100644 keyboards/dumbpad/v1x_dualencoder/v1x_dualencoder.h delete mode 100644 keyboards/dumbpad/v1x_oled/v1x_oled.h delete mode 100644 keyboards/dumbpad/v1x_right/v1x_right.h delete mode 100644 keyboards/dumbpad/v3x/v3x.h delete mode 100644 keyboards/earth_rover/earth_rover.h delete mode 100644 keyboards/flehrad/bigswitch/bigswitch.h delete mode 100644 keyboards/frooastboard/nano/nano.h delete mode 100644 keyboards/geekboards/tester/tester.h delete mode 100644 keyboards/grid600/press/press.h delete mode 100644 keyboards/handwired/6key/6key.h delete mode 100644 keyboards/handwired/6macro/6macro.h delete mode 100644 keyboards/handwired/aplx2/aplx2.h delete mode 100644 keyboards/handwired/arrow_pad/arrow_pad.h delete mode 100644 keyboards/handwired/bstk100/bstk100.h delete mode 100644 keyboards/handwired/ck4x4/ck4x4.h delete mode 100644 keyboards/handwired/frankie_macropad/frankie_macropad.h delete mode 100644 keyboards/handwired/gamenum/gamenum.h delete mode 100644 keyboards/handwired/leftynumpad/leftynumpad.h delete mode 100644 keyboards/handwired/lovelive9/lovelive9.h delete mode 100644 keyboards/handwired/mechboards_micropad/mechboards_micropad.h delete mode 100644 keyboards/handwired/misterdeck/misterdeck.h delete mode 100644 keyboards/handwired/mutepad/mutepad.h delete mode 100644 keyboards/handwired/nicekey/nicekey.h delete mode 100644 keyboards/handwired/novem/novem.h delete mode 100644 keyboards/handwired/nozbe_macro/nozbe_macro.h delete mode 100644 keyboards/handwired/numpad20/numpad20.h delete mode 100644 keyboards/handwired/obuwunkunubi/spaget/spaget.h delete mode 100644 keyboards/handwired/postageboard/postageboard.h delete mode 100644 keyboards/handwired/snatchpad/snatchpad.h delete mode 100644 keyboards/handwired/splittest/splittest.h delete mode 100644 keyboards/handwired/sticc14/sticc14.h delete mode 100644 keyboards/handwired/tennie/tennie.h delete mode 100644 keyboards/handwired/trackpoint/trackpoint.h delete mode 100644 keyboards/hfdkb/ac001/ac001.h delete mode 100644 keyboards/hifumi/hifumi.h delete mode 100644 keyboards/hineybush/h08_ocelot/h08_ocelot.h delete mode 100755 keyboards/hub16/hub16.h delete mode 100644 keyboards/illuminati/is0/is0.h delete mode 100644 keyboards/jadookb/jkb2/jkb2.h delete mode 100644 keyboards/jkdlab/binary_monkey/binary_monkey.h delete mode 100644 keyboards/kakunpc/business_card/alpha/alpha.h delete mode 100644 keyboards/kakunpc/business_card/beta/beta.h delete mode 100644 keyboards/keebio/bamfk4/bamfk4.h delete mode 100644 keyboards/keebio/bigswitchseat/bigswitchseat.h delete mode 100644 keyboards/keebwerk/nano_slider/nano_slider.h delete mode 100644 keyboards/keebzdotnet/wazowski/wazowski.h delete mode 100644 keyboards/keyhive/navi10/rev0/rev0.h delete mode 100644 keyboards/keyhive/navi10/rev2/rev2.h delete mode 100644 keyboards/keyhive/navi10/rev3/rev3.h delete mode 100755 keyboards/keysofkings/twokey/twokey.h delete mode 100644 keyboards/kingly_keys/romac/romac.h delete mode 100644 keyboards/kingly_keys/romac_plus/romac_plus.h delete mode 100644 keyboards/kingly_keys/smd_milk/smd_milk.h delete mode 100644 keyboards/kingly_keys/soap/soap.h delete mode 100644 keyboards/kiwikeebs/macro/macro.c delete mode 100644 keyboards/kiwikeebs/macro/macro.h delete mode 100644 keyboards/kiwikeebs/macro_v2/macro_v2.c delete mode 100644 keyboards/kiwikeebs/macro_v2/macro_v2.h delete mode 100644 keyboards/kmac_pad/kmac_pad.h delete mode 100644 keyboards/knops/mini/mini.h delete mode 100644 keyboards/late9/rev1/rev1.h delete mode 100644 keyboards/latincompass/latinpad/latinpad.h delete mode 100755 keyboards/lazydesigners/cassette8/cassette8.h delete mode 100644 keyboards/lefty/lefty.h delete mode 100644 keyboards/lizard_trick/tenkey_plusplus/tenkey_plusplus.h delete mode 100644 keyboards/m10a/m10a.h delete mode 100644 keyboards/machine_industries/m4_a/m4_a.h delete mode 100644 keyboards/makrosu/makrosu.h delete mode 100644 keyboards/maple_computing/6ball/6ball.h delete mode 100644 keyboards/maple_computing/christmas_tree/christmas_tree.h delete mode 100644 keyboards/maple_computing/ivy/rev1/rev1.h delete mode 100644 keyboards/maple_computing/launchpad/rev1/rev1.h delete mode 100644 keyboards/maple_computing/the_ruler/the_ruler.h delete mode 100644 keyboards/massdrop/thekey/thekey.h delete mode 100644 keyboards/massdrop/thekey_v2/thekey_v2.h delete mode 100644 keyboards/mechwild/murphpad/murphpad.h delete mode 100644 keyboards/merge/iso_macro/iso_macro.h delete mode 100644 keyboards/merge/uc1/uc1.h delete mode 100644 keyboards/mexsistor/ludmila/ludmila.h delete mode 100644 keyboards/millipad/millipad.h delete mode 100644 keyboards/momokai/tap_duo/tap_duo.h delete mode 100644 keyboards/momokai/tap_trio/tap_trio.h delete mode 100644 keyboards/ncc1701kb/ncc1701kb.h delete mode 100755 keyboards/neopad/rev1/rev1.h delete mode 100644 keyboards/nightly_boards/n2/n2.h delete mode 100644 keyboards/nightly_boards/n9/n9.h delete mode 100644 keyboards/nightly_boards/octopadplus/octopadplus.h delete mode 100644 keyboards/novelkeys/nk20/nk20.h delete mode 100644 keyboards/np12/np12.c delete mode 100644 keyboards/np12/np12.h delete mode 100644 keyboards/ocean/stealth/stealth.h delete mode 100644 keyboards/pabile/p18/p18.h delete mode 100644 keyboards/palette1202/palette1202.h delete mode 100644 keyboards/paprikman/albacore/albacore.h delete mode 100644 keyboards/pdxkbc/pdxkbc.h delete mode 100755 keyboards/pimentoso/paddino02/rev1/rev1.h delete mode 100755 keyboards/pimentoso/paddino02/rev2/left/left.h delete mode 100755 keyboards/pimentoso/paddino02/rev2/right/right.h delete mode 100644 keyboards/pimentoso/touhoupad/touhoupad.h delete mode 100644 keyboards/psuieee/pluto12/pluto12.h delete mode 100644 keyboards/puck/puck.h delete mode 100644 keyboards/qvex/lynepad/lynepad.h delete mode 100644 keyboards/rad/rad.h delete mode 100644 keyboards/reviung/reviung5/reviung5.h delete mode 100644 keyboards/rocketboard_16/rocketboard_16.h delete mode 100644 keyboards/rotr/rotr.c delete mode 100644 keyboards/rotr/rotr.h delete mode 100644 keyboards/salicylic_acid3/nafuda/nafuda.h delete mode 100644 keyboards/sawnsprojects/satxri6key/satxri6key.h delete mode 100644 keyboards/sck/gtm/gtm.h delete mode 100644 keyboards/sck/neiso/neiso.h delete mode 100644 keyboards/shiro/shiro.h delete mode 100644 keyboards/skippys_custom_pcs/roopad/roopad.h delete mode 100644 keyboards/soup10/soup10.h delete mode 100644 keyboards/swiftrax/retropad/retropad.h delete mode 100644 keyboards/takashiski/namecard2x4/namecard2x4.h delete mode 100644 keyboards/tempo_turtle/bradpad/bradpad.h delete mode 100644 keyboards/tender/macrowo_pad/macrowo_pad.h delete mode 100644 keyboards/treasure/type9/type9.h delete mode 100755 keyboards/vagrant_10/vagrant_10.h delete mode 100644 keyboards/wilba_tech/rama_works_m10_b/rama_works_m10_b.h delete mode 100644 keyboards/wilba_tech/rama_works_m6_a/rama_works_m6_a.h delete mode 100644 keyboards/wilba_tech/rama_works_m6_b/rama_works_m6_b.h delete mode 100644 keyboards/wilba_tech/wt8_a/wt8_a.h delete mode 100644 keyboards/winry/winry25tc/winry25tc.h delete mode 100755 keyboards/woodkeys/bigseries/1key/1key.h delete mode 100755 keyboards/woodkeys/bigseries/2key/2key.h delete mode 100755 keyboards/woodkeys/bigseries/3key/3key.h delete mode 100755 keyboards/woodkeys/bigseries/4key/4key.h delete mode 100644 keyboards/wuque/mammoth20x/mammoth20x.h delete mode 100644 keyboards/xbows/numpad/numpad.h delete mode 100644 keyboards/yampad/yampad.h delete mode 100644 keyboards/yoichiro/lunakey_macro/lunakey_macro.h delete mode 100644 keyboards/yushakobo/quick17/quick17.h delete mode 100644 keyboards/yynmt/dozen0/dozen0.h delete mode 100644 keyboards/zfrontier/big_switch/big_switch.h (limited to 'keyboards') diff --git a/keyboards/10bleoledhub/10bleoledhub.h b/keyboards/10bleoledhub/10bleoledhub.h deleted file mode 100644 index ad73017e12..0000000000 --- a/keyboards/10bleoledhub/10bleoledhub.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2020 haierwangwei2005 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, K11, K12, \ - K20, K21, K22, \ - K30, K31, K32 \ -) { \ - { K00, KC_NO, KC_NO }, \ - { K10, K11, K12 }, \ - { K20, K21, K22 }, \ - { K30, K31, K32 } \ -} diff --git a/keyboards/10bleoledhub/info.json b/keyboards/10bleoledhub/info.json index 4f5cd9564a..f6db49b9e6 100644 --- a/keyboards/10bleoledhub/info.json +++ b/keyboards/10bleoledhub/info.json @@ -23,16 +23,19 @@ "layouts": { "LAYOUT": { "layout": [ - {"label":"Num Lock", "x":0, "y":0, "w":0.8, "h":0.8}, - {"label":"7", "x":0, "y":1}, - {"label":"8", "x":1, "y":1}, - {"label":"9", "x":2, "y":1}, - {"label":"4", "x":0, "y":2}, - {"label":"5", "x":1, "y":2}, - {"label":"6", "x":2, "y":2}, - {"label":"1", "x":0, "y":3}, - {"label":"2", "x":1, "y":3}, - {"label":"3", "x":2, "y":3} + {"matrix": [0, 0], "x": 0, "y": 0, "w": 0.8, "h": 0.8}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3} ] } } diff --git a/keyboards/2key2crawl/2key2crawl.h b/keyboards/2key2crawl/2key2crawl.h deleted file mode 100644 index 6e8ee64208..0000000000 --- a/keyboards/2key2crawl/2key2crawl.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - K00, K01, K02, K03, K15, \ - K10, K11, K12, K13, K14, K16 \ -) { \ - { K00, K01, K02, K03, KC_NO, KC_NO, KC_NO }, \ - { K10, K11, K12, K13, K14, K15, K16 }, \ -} - diff --git a/keyboards/2key2crawl/info.json b/keyboards/2key2crawl/info.json index 1421a7b1e0..e5f9dc2942 100644 --- a/keyboards/2key2crawl/info.json +++ b/keyboards/2key2crawl/info.json @@ -23,18 +23,19 @@ "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":"K15", "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": [1, 5], "x": 4, "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":"K16", "x":5.5, "y":0.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, 6], "x": 5.5, "y": 0.5} ] } } diff --git a/keyboards/3keyecosystem/2key2/2key2.c b/keyboards/3keyecosystem/2key2/2key2.c index 17e87b412e..11f4b8b217 100644 --- a/keyboards/3keyecosystem/2key2/2key2.c +++ b/keyboards/3keyecosystem/2key2/2key2.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 "2key2.h" +#include "quantum.h" // RGB Matrix configuration // based on https://docs.qmk.fm/#/feature_rgb_matrix?id=common-configuration diff --git a/keyboards/3keyecosystem/2key2/2key2.h b/keyboards/3keyecosystem/2key2/2key2.h deleted file mode 100644 index 05af99101a..0000000000 --- a/keyboards/3keyecosystem/2key2/2key2.h +++ /dev/null @@ -1,33 +0,0 @@ -/* -Copyright 2021 John Mueller - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -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 \ -) { \ - { k00, k01 } \ -} diff --git a/keyboards/3keyecosystem/2key2/info.json b/keyboards/3keyecosystem/2key2/info.json index 398a4d3439..acfb024da2 100644 --- a/keyboards/3keyecosystem/2key2/info.json +++ b/keyboards/3keyecosystem/2key2/info.json @@ -21,8 +21,8 @@ "layouts": { "LAYOUT": { "layout": [ - {"label": "k00", "x": 0, "y": 0}, - {"label": "k01", "x": 1, "y": 0} + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0} ] } } diff --git a/keyboards/4by3/4by3.h b/keyboards/4by3/4by3.h deleted file mode 100644 index b41628137a..0000000000 --- a/keyboards/4by3/4by3.h +++ /dev/null @@ -1,70 +0,0 @@ -#pragma once - -#include "quantum.h" - -/* LAYOUT_horizontal - * ┌───┐ - * │USB│ - * ├───┼───┬───┬───┐ - * │K00│K01│K02│K03│ - * ├───┼───┼───┼───┤ - * │K10│K11│K12│K13│ - * ├───┼───┼───┼───┤ - * │K20│K21│K22│K23│ - * └───┴───┴───┴───┘ - */ -#define LAYOUT_horizontal( \ - K00, K01, K02, K03, \ - K10, K11, K12, K13, \ - K20, K21, K22, K23 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 } \ -} - -/* LAYOUT_vertical_right - * ┌───┬───┬───┬───┐ - * │K00│K01│K03│USB│ - * ├───┼───┼───┬───┘ - * │K04│K05│K06│ - * ├───┼───┼───┤ - * │K07│K08│K09│ - * ├───┼───┼───┤ - * │K10│K11│K12│ - * └───┴───┴───┘ - */ -#define LAYOUT_vertical_right( \ - K20, K10, K00, \ - K21, K11, K01, \ - K22, K12, K02, \ - K23, K13, K03 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 } \ -} - -/* LAYOUT_vertical_left - * ┌───┬───┬───┐ - * │K00│K01│K03│ - * ├───┼───┼───┤ - * │K04│K05│K06│ - * ├───┼───┼───┤ - * │K07│K08│K09│ - * ┌───┼───┼───┼───┤ - * │USB│K10│K11│K12│ - * └───┴───┴───┴───┘ - */ -#define LAYOUT_vertical_left( \ - K03, K13, K23, \ - K02, K12, K22, \ - K01, K11, K21, \ - K00, K10, K20 \ -) { \ - { K00, K01, K02, K03 }, \ - { K10, K11, K12, K13 }, \ - { K20, K21, K22, K23 } \ -} - -#define LAYOUT LAYOUT_horizontal diff --git a/keyboards/4by3/info.json b/keyboards/4by3/info.json index ade503696c..5a64ffcd53 100644 --- a/keyboards/4by3/info.json +++ b/keyboards/4by3/info.json @@ -15,28 +15,64 @@ "diode_direction": "COL2ROW", "processor": "atmega32u4", "bootloader": "caterina", + "layout_aliases": { + "LAYOUT": "LAYOUT_horizontal" + }, "layouts": { "LAYOUT_horizontal": { "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": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, { "x": 3, "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": [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": [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} ] }, "LAYOUT_vertical_right": { "layout": [ - { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, - { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, - { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, - { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 } + {"matrix": [2, 0], "x": 0, "y": 0}, + {"matrix": [1, 0], "x": 1, "y": 0}, + {"matrix": [0, 0], "x": 2, "y": 0}, + + {"matrix": [2, 1], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [0, 1], "x": 2, "y": 1}, + + {"matrix": [2, 2], "x": 0, "y": 2}, + {"matrix": [1, 2], "x": 1, "y": 2}, + {"matrix": [0, 2], "x": 2, "y": 2}, + + {"matrix": [2, 3], "x": 0, "y": 3}, + {"matrix": [1, 3], "x": 1, "y": 3}, + {"matrix": [0, 3], "x": 2, "y": 3} ] }, "LAYOUT_vertical_left": { "layout": [ - { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, - { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, - { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, - { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 } + {"matrix": [0, 3], "x": 0, "y": 0}, + {"matrix": [1, 3], "x": 1, "y": 0}, + {"matrix": [2, 3], "x": 2, "y": 0}, + + {"matrix": [0, 2], "x": 0, "y": 1}, + {"matrix": [1, 2], "x": 1, "y": 1}, + {"matrix": [2, 2], "x": 2, "y": 1}, + + {"matrix": [0, 1], "x": 0, "y": 2}, + {"matrix": [1, 1], "x": 1, "y": 2}, + {"matrix": [2, 1], "x": 2, "y": 2}, + + {"matrix": [0, 0], "x": 0, "y": 3}, + {"matrix": [1, 0], "x": 1, "y": 3}, + {"matrix": [2, 0], "x": 2, "y": 3} ] } } diff --git a/keyboards/9key/9key.h b/keyboards/9key/9key.h deleted file mode 100644 index ad809da4b8..0000000000 --- a/keyboards/9key/9key.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT( \ - k00, k01, k02, \ - k10, k11, k12, \ - k20, k21, k22 \ -) { \ - { k00, k01, k02 }, \ - { k10, k11, k12 }, \ - { k20, k21, k22 } \ -} diff --git a/keyboards/9key/info.json b/keyboards/9key/info.json index e4109ef2aa..7d1538ee71 100644 --- a/keyboards/9key/info.json +++ b/keyboards/9key/info.json @@ -17,7 +17,19 @@ "bootloader": "caterina", "layouts": { "LAYOUT": { - "layout": [{"label":"k00", "x":0, "y":0}, {"label":"k01", "x":1, "y":0}, {"label":"k02", "x":2, "y":0}, {"label":"k10", "x":0, "y":1}, {"label":"k11", "x":1, "y":1}, {"label":"k12", "x":2, "y":1}, {"label":"k20", "x":0, "y":2}, {"label":"k21", "x":1, "y":2}, {"label":"k22", "x":2, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2} + ] } } } diff --git a/keyboards/abstract/ellipse/rev1/info.json b/keyboards/abstract/ellipse/rev1/info.json index 693faa86b5..bf986589f0 100644 --- a/keyboards/abstract/ellipse/rev1/info.json +++ b/keyboards/abstract/ellipse/rev1/info.json @@ -28,7 +28,15 @@ "bootloader": "atmel-dfu", "layouts": { "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":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": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25} + ] } } } diff --git a/keyboards/abstract/ellipse/rev1/rev1.h b/keyboards/abstract/ellipse/rev1/rev1.h deleted file mode 100644 index de8b9bacb6..0000000000 --- a/keyboards/abstract/ellipse/rev1/rev1.h +++ /dev/null @@ -1,36 +0,0 @@ -/* Copyright 2019 AbstractKB - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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, \ - K10, K11, K12 \ -) \ -{ \ - { K00, K01, K02 }, \ - { K10, K11, K12 }, \ -} - diff --git a/keyboards/afternoonlabs/gust/rev1/info.json b/keyboards/afternoonlabs/gust/rev1/info.json index e031108f51..4cfac9dc59 100644 --- a/keyboards/afternoonlabs/gust/rev1/info.json +++ b/keyboards/afternoonlabs/gust/rev1/info.json @@ -18,42 +18,17 @@ "layouts": { "LAYOUT": { "layout": [ - { - "x": 0, - "y": 0 - }, - { - "x": 1, - "y": 0 - }, - { - "x": 2, - "y": 0 - }, - { - "x": 0, - "y": 1 - }, - { - "x": 1, - "y": 1 - }, - { - "x": 2, - "y": 1 - }, - { - "x": 0, - "y": 3 - }, - { - "x": 1, - "y": 3 - }, - { - "x": 2, - "y": 3 - } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + + {"matrix": [2, 0], "x": 0, "y": 3}, + {"matrix": [2, 1], "x": 1, "y": 3}, + {"matrix": [2, 2], "x": 2, "y": 3} ] } } diff --git a/keyboards/afternoonlabs/gust/rev1/rev1.h b/keyboards/afternoonlabs/gust/rev1/rev1.h deleted file mode 100644 index 635a5877bb..0000000000 --- a/keyboards/afternoonlabs/gust/rev1/rev1.h +++ /dev/null @@ -1,30 +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( \ - M00, M01, M02, \ - M10, M11, M12, \ - M20, M21, M22 \ -) \ -{ \ - { M00, M01, M02 }, \ - { M10, M11, M12 }, \ - { M20, M21, M22 } \ -} diff --git a/keyboards/aplyard/aplx6/info.json b/keyboards/aplyard/aplx6/info.json index 0bd317c1a4..9f86182a33 100644 --- a/keyboards/aplyard/aplx6/info.json +++ b/keyboards/aplyard/aplx6/info.json @@ -5,18 +5,5 @@ "maintainer": "Aplyard", "usb": { "vid": "0xE0E0" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1} - ] - } } } diff --git a/keyboards/aplyard/aplx6/rev1/info.json b/keyboards/aplyard/aplx6/rev1/info.json index 167699150f..943624fb8f 100644 --- a/keyboards/aplyard/aplx6/rev1/info.json +++ b/keyboards/aplyard/aplx6/rev1/info.json @@ -9,5 +9,18 @@ }, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} + ] + } + } } diff --git a/keyboards/aplyard/aplx6/rev1/rev1.h b/keyboards/aplyard/aplx6/rev1/rev1.h deleted file mode 100644 index 6990d388e7..0000000000 --- a/keyboards/aplyard/aplx6/rev1/rev1.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#include "quantum.h" - -#define LAYOUT( \ - k000, k001, k002, \ - k100, k101, k102 \ -) \ -{ \ - { k000, k001, k002 }, \ - { k100, k101, k102 } \ -} - diff --git a/keyboards/aplyard/aplx6/rev2/info.json b/keyboards/aplyard/aplx6/rev2/info.json index 726dab814c..2dc54180eb 100644 --- a/keyboards/aplyard/aplx6/rev2/info.json +++ b/keyboards/aplyard/aplx6/rev2/info.json @@ -14,5 +14,18 @@ ] }, "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": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1} + ] + } + } } diff --git a/keyboards/aplyard/aplx6/rev2/rev2.h b/keyboards/aplyard/aplx6/rev2/rev2.h deleted file mode 100644 index 193c6cd51c..0000000000 --- a/keyboards/aplyard/aplx6/rev2/rev2.h +++ /dev/null @@ -1,28 +0,0 @@ - /* Copyright 2020 Aplyard - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You 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, \ - k100, k101, k102 \ -) \ -{ \ - { k000, k001, k002 }, \ - { k100, k101, k102 } \ -} - - diff --git a/keyboards/axolstudio/helpo/helpo.h b/keyboards/axolstudio/helpo/helpo.h deleted file mode 100644 index f6b0e07964..0000000000 --- a/keyboards/axolstudio/helpo/helpo.h +++ /dev/null @@ -1,39 +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( \ - k04, k03, k02, k01, k00, \ - k09, k08, k07, k06, k05, \ - k14, k13, k12, k11, k10, \ - k19, k18, k17, k16, k15 \ -) { \ - { k00, k01, k02, k03, k04, }, \ - { k05, k06, k07, k08, k09, }, \ - { k10, k11, k12, k13, k14, }, \ - { k15, k16, k17, k18, k19, } \ -} diff --git a/keyboards/axolstudio/helpo/info.json b/keyboards/axolstudio/helpo/info.json index c6d1d58f6c..cf74098bf5 100644 --- a/keyboards/axolstudio/helpo/info.json +++ b/keyboards/axolstudio/helpo/info.json @@ -18,26 +18,29 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3} + {"matrix": [0, 4], "x": 0, "y": 0}, + {"matrix": [0, 3], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 1], "x": 3, "y": 0}, + {"matrix": [0, 0], "x": 4, "y": 0}, + + {"matrix": [1, 4], "x": 0, "y": 1}, + {"matrix": [1, 3], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 1], "x": 3, "y": 1}, + {"matrix": [1, 0], "x": 4, "y": 1}, + + {"matrix": [2, 4], "x": 0, "y": 2}, + {"matrix": [2, 3], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 1], "x": 3, "y": 2}, + {"matrix": [2, 0], "x": 4, "y": 2}, + + {"matrix": [3, 4], "x": 0, "y": 3}, + {"matrix": [3, 3], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 1], "x": 3, "y": 3}, + {"matrix": [3, 0], "x": 4, "y": 3} ] } } diff --git a/keyboards/biacco42/meishi/info.json b/keyboards/biacco42/meishi/info.json index 73b8a74f2a..96e67d5078 100644 --- a/keyboards/biacco42/meishi/info.json +++ b/keyboards/biacco42/meishi/info.json @@ -18,10 +18,10 @@ "layouts": { "LAYOUT": { "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":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} ] } } diff --git a/keyboards/biacco42/meishi/meishi.h b/keyboards/biacco42/meishi/meishi.h deleted file mode 100644 index 61b9f628db..0000000000 --- a/keyboards/biacco42/meishi/meishi.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2019 Biacco42 - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * 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( \ - k00, k01, k02, k03\ -) \ -{ \ - { k00, k01, k02, k03 }\ -} - diff --git a/keyboards/biacco42/meishi2/info.json b/keyboards/biacco42/meishi2/info.json index ae5c28ddfc..fb88356968 100644 --- a/keyboards/biacco42/meishi2/info.json +++ b/keyboards/biacco42/meishi2/info.json @@ -18,10 +18,10 @@ "layouts": { "LAYOUT": { "layout": [ - { "x": 0, "y": 0 }, - { "x": 1, "y": 0 }, - { "x": 2, "y": 0 }, - { "x": 3, "y": 0 } + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [1, 0], "x": 2, "y": 0}, + {"matrix": [1, 1], "x": 3, "y": 0} ] } } diff --gi